DATABASELINK::Unload method replaced with the virtual destructor of MDatabaseCommon

5 files changed, 10 insertions, 10 deletions

diff --git a/src/mir_app/src/database.cpp b/src/mir_app/src/database.cpp
index 1e02f0d009..b3f5f621e0 100644
--- a/src/mir_app/src/database.cpp
+++ b/src/mir_app/src/database.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"

 #include "profilemanager.h"

 

-MIDatabase *currDb = nullptr;

+MDatabaseCommon *currDb = nullptr;

 DATABASELINK *currDblink = nullptr;

 

 // contains the location of mirandaboot.ini

@@ -400,7 +400,7 @@ int tryOpenDatabase(const wchar_t *tszProfile)
 		}

 

 		// try to load database

-		MIDatabase *pDb = it->Load(tszProfile, FALSE);

+		MDatabaseCommon *pDb = it->Load(tszProfile, FALSE);

 		if (pDb == nullptr)

 			return EGROKPRF_CANTREAD;

 

@@ -423,7 +423,7 @@ static int tryCreateDatabase(const wchar_t *ptszProfile)
 		int err = p->makeDatabase(tszProfile);

 		if (err == ERROR_SUCCESS) {

 			g_bDbCreated = true;

-			MIDatabase *pDb = p->Load(tszProfile, FALSE);

+			MDatabaseCommon *pDb = p->Load(tszProfile, FALSE);

 			if (pDb == nullptr) // driver was found but smth went wrong

 				return EGROKPRF_CANTREAD;

 

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index fc95a820d8..ac28a88653 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -449,12 +449,12 @@ Skin_PlaySound @462
 Skin_PlaySoundFile @463

 Clist_SetStatusMode @464

 ??0CProtoIntDlgBase@@QAE@$$QAV0@@Z @465 NONAME

-??0MDatabaseCommon@@IAE@XZ @466 NONAME

+??0MDatabaseCommon@@QAE@XZ @466 NONAME

 ??0MDatabaseCommon@@QAE@ABV0@@Z @468 NONAME

 ??0MIDatabase@@QAE@$$QAU0@@Z @469 NONAME

 ??0MIDatabase@@QAE@ABU0@@Z @470 NONAME

 ??0MIDatabase@@QAE@XZ @471 NONAME

-??1MDatabaseCommon@@IAE@XZ @473 NONAME

+??1MDatabaseCommon@@UAE@XZ @472 NONAME

 ??4CProtoIntDlgBase@@QAEAAV0@$$QAV0@@Z @474 NONAME

 ??4MDatabaseCommon@@QAEAAV0@ABV0@@Z @476 NONAME

 ??4MIDatabase@@QAEAAU0@$$QAU0@@Z @477 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 45f671088e..6f4d79842a 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -449,12 +449,12 @@ Skin_PlaySound @462
 Skin_PlaySoundFile @463

 Clist_SetStatusMode @464

 ??0CProtoIntDlgBase@@QEAA@$$QEAV0@@Z @465 NONAME

-??0MDatabaseCommon@@IEAA@XZ @466 NONAME

+??0MDatabaseCommon@@QEAA@XZ @466 NONAME

 ??0MDatabaseCommon@@QEAA@AEBV0@@Z @468 NONAME

 ??0MIDatabase@@QEAA@$$QEAU0@@Z @469 NONAME

 ??0MIDatabase@@QEAA@AEBU0@@Z @470 NONAME

 ??0MIDatabase@@QEAA@XZ @471 NONAME

-??1MDatabaseCommon@@IEAA@XZ @473 NONAME

+??1MDatabaseCommon@@UEAA@XZ @472 NONAME

 ??4CProtoIntDlgBase@@QEAAAEAV0@$$QEAV0@@Z @474 NONAME

 ??4MDatabaseCommon@@QEAAAEAV0@AEBV0@@Z @476 NONAME

 ??4MIDatabase@@QEAAAEAU0@$$QEAU0@@Z @477 NONAME

diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h
index bb06f8ae02..5d54d49e57 100644
--- a/src/mir_app/src/miranda.h
+++ b/src/mir_app/src/miranda.h
@@ -54,8 +54,8 @@ extern struct CHAT_MANAGER chatApi;
 

 /**** database.cpp *********************************************************************/

 

-extern MIDatabase* currDb;

-extern DATABASELINK* currDblink;

+extern MDatabaseCommon *currDb;

+extern DATABASELINK *currDblink;

 extern LIST<DATABASELINK> arDbPlugins;

 

 int  InitIni(void);

diff --git a/src/mir_app/src/newplugins.cpp b/src/mir_app/src/newplugins.cpp
index 3dbd984dfa..6c8a59924e 100644
--- a/src/mir_app/src/newplugins.cpp
+++ b/src/mir_app/src/newplugins.cpp
@@ -866,7 +866,7 @@ void UnloadDatabase(void)
 {

 	if (currDb != nullptr) {

 		db_setCurrent(nullptr);

-		currDblink->Unload(currDb);

+		delete currDb;

 		currDb = nullptr;

 		currDblink = nullptr;

 	}