summaryrefslogtreecommitdiff
path: root/src/mir_core
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-02 20:20:47 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-02 20:20:47 +0000
commit8712f0c3591941711f8407fc069a1fbd98efbd65 (patch)
treec75825bc3d05f543e622770c684e09113ddbeb79 /src/mir_core
parentad5dee8e7d01ea0cd2b96a7f46e1f6fc9692825a (diff)
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
Diffstat (limited to 'src/mir_core')
-rw-r--r--src/mir_core/langpack.cpp1
-rw-r--r--src/mir_core/miranda.cpp1
-rw-r--r--src/mir_core/miranda.h2
-rw-r--r--src/mir_core/modules.cpp4
-rw-r--r--src/mir_core/subclass.cpp5
5 files changed, 0 insertions, 13 deletions
diff --git a/src/mir_core/langpack.cpp b/src/mir_core/langpack.cpp
index a23e6311a6..885b6c7f9e 100644
--- a/src/mir_core/langpack.cpp
+++ b/src/mir_core/langpack.cpp
@@ -597,7 +597,6 @@ void UnloadLangPackModule()
int i;
for (i=0; i < lMuuids.getCount(); i++)
mir_free(lMuuids[i]);
- lMuuids.destroy();
LangPackEntry *p = langPack.entry;
for (i=0; i < langPack.entryCount; i++, p++) {
diff --git a/src/mir_core/miranda.cpp b/src/mir_core/miranda.cpp
index 4804665e45..639de6b0c1 100644
--- a/src/mir_core/miranda.cpp
+++ b/src/mir_core/miranda.cpp
@@ -102,7 +102,6 @@ MIR_CORE_DLL(void) UnloadCoreModule(void)
CloseHandle(hThreadQueueEmpty);
TlsFree(mir_tls);
- UninitSubclassing();
UninitProtocols();
DestroyModularEngine();
UninitLogs();
diff --git a/src/mir_core/miranda.h b/src/mir_core/miranda.h
index cc4be6ecae..122d9fe21d 100644
--- a/src/mir_core/miranda.h
+++ b/src/mir_core/miranda.h
@@ -93,8 +93,6 @@ HTREEITEM FindNamedTreeItemAtRoot(HWND hwndTree, const TCHAR *name);
/**** subclass.cpp *********************************************************************/
-void UninitSubclassing();
-
/**** threads.cpp **********************************************************************/
extern DWORD mir_tls;
diff --git a/src/mir_core/modules.cpp b/src/mir_core/modules.cpp
index 0352802dfe..6899a2dbf3 100644
--- a/src/mir_core/modules.cpp
+++ b/src/mir_core/modules.cpp
@@ -652,12 +652,8 @@ int InitialiseModularEngine(void)
void DestroyModularEngine(void)
{
DestroyHooks();
- hooks.destroy();
DeleteCriticalSection(&csHooks);
DestroyServices();
- services.destroy();
DeleteCriticalSection(&csServices);
-
- pluginListAddr.destroy();
}
diff --git a/src/mir_core/subclass.cpp b/src/mir_core/subclass.cpp
index 74d500aee2..ca5dc88d2b 100644
--- a/src/mir_core/subclass.cpp
+++ b/src/mir_core/subclass.cpp
@@ -33,11 +33,6 @@ struct MSubclassData
static LIST<MSubclassData> arSubclass(10, LIST<MSubclassData>::FTSortFunc(HandleKeySortT));
-void UninitSubclassing()
-{
- arSubclass.destroy();
-}
-
/////////////////////////////////////////////////////////////////////////////////////////
static LRESULT CALLBACK MSubclassWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)