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/clist/clistmod.cpp | 1 - src/modules/clist/genmenu.cpp | 2 -- src/modules/clist/movetogroup.cpp | 5 +---- 3 files changed, 1 insertion(+), 7 deletions(-) (limited to 'src/modules/clist') diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp index a20ee87a0a..547fcc326d 100644 --- a/src/modules/clist/clistmod.cpp +++ b/src/modules/clist/clistmod.cpp @@ -541,6 +541,5 @@ void UnloadContactListModule() } ImageList_Destroy(hCListImages); UninitCListEvents(); - protoIconIndex.destroy(); DestroyHookableEvent(hContactDoubleClicked); } diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp index aa9430712c..07c40e5990 100644 --- a/src/modules/clist/genmenu.cpp +++ b/src/modules/clist/genmenu.cpp @@ -186,7 +186,6 @@ int MO_RemoveAllObjects() { for (int i=0; i < g_menus.getCount(); i++) delete g_menus[i]; - g_menus.destroy(); return 0; } @@ -590,7 +589,6 @@ void KillModuleMenus(int hLangpack) for (int k=0; k < param.arItems.getCount(); k++) MO_RemoveMenuItem((WPARAM)param.arItems[k], 0); - param.arItems.destroy(); } /////////////////////////////////////////////////////////////////////////////// diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp index b858013c78..b296a1c3a3 100644 --- a/src/modules/clist/movetogroup.cpp +++ b/src/modules/clist/movetogroup.cpp @@ -109,8 +109,7 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM) pos += 100000; // Separator - for (i=0; ; i++) - { + for (i=0; ; i++) { char intname[20]; _itoa(i, intname, 10); @@ -129,7 +128,6 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM) AddGroupItem(hMoveToGroupItem, groups[i].name, ++pos, groups[i].position, checked); } - groups.destroy(); return 0; } @@ -147,6 +145,5 @@ void MTG_OnmodulesLoad() int UnloadMoveToGroup(void) { - lphGroupsItems.destroy(); return 0; } -- cgit v1.2.3