summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-07-18 14:11:28 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-07-18 14:11:28 +0000
commit4bc88d46fa9859615521f436511d4f102f20eb67 (patch)
tree3a6ee91b74be2a4f5e60520885aa601c74bc3fa7 /src/core
parent4f8f5427687792492ee49e06cafb9bd50cfc53d4 (diff)
databases are still static, but are controlled via classes
git-svn-id: http://svn.miranda-ng.org/main/trunk@1014 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
-rw-r--r--src/core/commonheaders.h1
-rw-r--r--src/core/miranda.h4
-rw-r--r--src/core/modules.cpp2
3 files changed, 7 insertions, 0 deletions
diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h
index 13287d770a..ae6790a974 100644
--- a/src/core/commonheaders.h
+++ b/src/core/commonheaders.h
@@ -61,6 +61,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_core.h>
#include <newpluginapi.h>
#include <m_database.h>
+#include <m_db_int.h>
#include <m_clc.h>
#include <m_clui.h>
#include <m_crypto.h>
diff --git a/src/core/miranda.h b/src/core/miranda.h
index 8c3a3b1d20..00eab4fcae 100644
--- a/src/core/miranda.h
+++ b/src/core/miranda.h
@@ -108,6 +108,10 @@ extern LPFN_FREEADDRINFO MyFreeaddrinfo;
extern LPFN_WSASTRINGTOADDRESSA MyWSAStringToAddress;
extern LPFN_WSAADDRESSTOSTRINGA MyWSAAddressToString;
+/**** database.cpp *********************************************************************/
+
+extern MIDatabase* currDb;
+
/**** fontService.cpp ******************************************************************/
void KillModuleFonts(int hLangpack);
diff --git a/src/core/modules.cpp b/src/core/modules.cpp
index 423bd3471a..e44114cf96 100644
--- a/src/core/modules.cpp
+++ b/src/core/modules.cpp
@@ -41,6 +41,7 @@ int LoadLangpackModule(void); // core: translation
int LoadProtocolsModule(void); // core: protocol manager
int LoadAccountsModule(void); // core: account manager
int LoadIgnoreModule(void); // protocol filter: ignore
+int LoadDbintfModule(void);
int LoadContactListModule(void);// ui: clist
int LoadOptionsModule(void); // ui: options dialog
@@ -89,6 +90,7 @@ int LoadDefaultModules(void)
if ( LoadUtilsModule()) return 1; //order not important for this, but no dependencies and no point in pluginising
if ( LoadIcoTabsModule()) return 1;
if ( LoadHeaderbarModule()) return 1;
+ if ( LoadDbintfModule()) return 1;
if ( LoadNewPluginsModuleInfos()) return 1;
// database is available here