summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-03-21 18:06:27 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-03-21 18:09:19 +0300
commitf7001757a832e948645713a94739f66b07d5f2c1 (patch)
tree8accc928f2eadf5940a336f9be639b3f27e921a6 /include
parent6119b7865f7890d9bfc627d35d8e1262c2690e9c (diff)
DATABASELINK::Unload method replaced with the virtual destructor of MDatabaseCommon
Diffstat (limited to 'include')
-rw-r--r--include/m_db_int.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/include/m_db_int.h b/include/m_db_int.h
index 0a6aa6ddb5..fa3bf15c43 100644
--- a/include/m_db_int.h
+++ b/include/m_db_int.h
@@ -139,14 +139,14 @@ protected:
LIST<char> m_lResidentSettings;
protected:
- MDatabaseCommon();
- ~MDatabaseCommon();
-
int CheckProto(DBCachedContact *cc, const char *proto);
STDMETHOD_(BOOL, GetContactSettingWorker)(MCONTACT contactID, LPCSTR szModule, LPCSTR szSetting, DBVARIANT *dbv, int isStatic) PURE;
public:
+ MDatabaseCommon();
+ virtual ~MDatabaseCommon();
+
STDMETHODIMP_(BOOL) DeleteModule(MCONTACT contactID, LPCSTR szModule);
STDMETHODIMP_(MCONTACT) FindFirstContact(const char *szProto = nullptr);
@@ -240,14 +240,7 @@ struct DATABASELINK
which is a PLUGINLINK structure
Returns: 0 on success, nonzero on failure
*/
- MIDatabase* (*Load)(const wchar_t *profile, BOOL bReadOnly);
-
- /*
- Affect: The database plugin should shutdown, unloading things from the core and freeing internal structures
- Returns: 0 on success, nonzero on failure
- Note: Unload() might be called even if Load(void) was never called, wasLoaded is set to 1 if Load(void) was ever called.
- */
- int (*Unload)(MIDatabase*);
+ MDatabaseCommon* (*Load)(const wchar_t *profile, BOOL bReadOnly);
/*
Returns a pointer to the database checker or NULL if a database doesn't support checking