From 8712f0c3591941711f8407fc069a1fbd98efbd65 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 2 Jan 2014 20:20:47 +0000 Subject: added destructor LIST::~LIST, that calls destroy() automatically. thus manual call of destroy() might be removed from: - class destructors; - Unload() plugin's functions (for global data); - local (auto) variables in functions finalizations git-svn-id: http://svn.miranda-ng.org/main/trunk@7467 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/database/dbintf.cpp | 5 ----- src/modules/database/dbutils.cpp | 3 --- src/modules/database/mdatabasecache.cpp | 3 --- 3 files changed, 11 deletions(-) (limited to 'src/modules/database') diff --git a/src/modules/database/dbintf.cpp b/src/modules/database/dbintf.cpp index 72afdb4866..35a0557362 100644 --- a/src/modules/database/dbintf.cpp +++ b/src/modules/database/dbintf.cpp @@ -166,8 +166,3 @@ int LoadDbintfModule() CreateServiceFunction(MS_DB_DESTROY_INSTANCE, srvDestroyInstance); return 0; } - -void UnloadDbintfModule() -{ - arDbPlugins.destroy(); -} diff --git a/src/modules/database/dbutils.cpp b/src/modules/database/dbutils.cpp index 302d7fdd65..f57ce37446 100644 --- a/src/modules/database/dbutils.cpp +++ b/src/modules/database/dbutils.cpp @@ -274,7 +274,6 @@ static INT_PTR DbDeleteModule(WPARAM, LPARAM lParam) db_unset(NULL, (char*)lParam, vars[i]); mir_free(vars[i]); } - vars.destroy(); return 0; } @@ -366,6 +365,4 @@ void UnloadEventsModule() mir_free(p->iconService); mir_free(p); } - - eventTypes.destroy(); } diff --git a/src/modules/database/mdatabasecache.cpp b/src/modules/database/mdatabasecache.cpp index 6a8a58c1f4..f6c13e0cda 100644 --- a/src/modules/database/mdatabasecache.cpp +++ b/src/modules/database/mdatabasecache.cpp @@ -45,9 +45,6 @@ MDatabaseCache::MDatabaseCache() : MDatabaseCache::~MDatabaseCache() { - m_lContacts.destroy(); - m_lSettings.destroy(); - m_lGlobalSettings.destroy(); HeapDestroy(m_hCacheHeap); DeleteCriticalSection(&m_cs); } -- cgit v1.2.3