From f7001757a832e948645713a94739f66b07d5f2c1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Mar 2018 18:06:27 +0300 Subject: DATABASELINK::Unload method replaced with the virtual destructor of MDatabaseCommon --- include/m_db_int.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'include') 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 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 -- cgit v1.2.3