From 95dccf315ba175eaf848fd6d85af6eb306a7482f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 1 Sep 2016 10:56:58 +0000 Subject: duplicate code removed git-svn-id: http://svn.miranda-ng.org/main/trunk@17235 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/init.cpp | 1 - plugins/Clist_modern/src/modern_clistmod.cpp | 2 -- plugins/Clist_modern/src/modern_commonprototypes.h | 2 -- plugins/Clist_modern/src/modern_contact.cpp | 8 -------- plugins/Clist_modern/src/modern_keyboard.cpp | 6 ------ 5 files changed, 19 deletions(-) (limited to 'plugins/Clist_modern') diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index 72b297c2bc..4e76e461f3 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -112,7 +112,6 @@ extern "C" __declspec(dllexport) int Unload(void) XPThemesUnloadModule(); UnloadAvatarOverlayIcon(); - UninitSkinHotKeys(); FreeRowCell(); EventArea_UnloadModule(); diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index bc23afacfe..d1786bb6a3 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -171,8 +171,6 @@ HRESULT CluiLoadModule() HookEvent(ME_DB_CONTACT_ADDED, ContactAdded); CreateServiceFunction(MS_CLIST_TOGGLEHIDEOFFLINE, ToggleHideOffline); - - CreateServiceFunction(MS_CLIST_TOGGLEGROUPS, ToggleGroups); CreateServiceFunction(MS_CLIST_TOGGLESOUNDS, ToggleSounds); CreateServiceFunction(MS_CLIST_SETUSEGROUPS, SetUseGroups); diff --git a/plugins/Clist_modern/src/modern_commonprototypes.h b/plugins/Clist_modern/src/modern_commonprototypes.h index b267c906b5..610778758a 100644 --- a/plugins/Clist_modern/src/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/modern_commonprototypes.h @@ -200,7 +200,6 @@ int RestoreAllContactData(ClcData *dat); //c int SkinSelector_DeleteMask(MODERNMASK *mm); //mod_skin_selector.c int StoreAllContactData(ClcData *dat); //cache_func.c INT_PTR ToggleHideOffline(WPARAM wParam, LPARAM lParam); //contact.c -INT_PTR ToggleGroups(WPARAM wParam, LPARAM lParam); //contact.c INT_PTR SetUseGroups(WPARAM wParam, LPARAM lParam); //contact.c INT_PTR ToggleSounds(WPARAM wParam, LPARAM lParam); //contact.c void ClcOptionsChanged(); //clc.c @@ -220,7 +219,6 @@ void SaveViewMode(const char *name, const wchar_t *szGroupFilter, const char *sz int ExtraImage_ExtraIDToColumnNum(int extra); int LoadSkinButtonModule(); -void UninitSkinHotKeys(); void GetDefaultFontSetting(int i, LOGFONTA *lf, COLORREF *colour); int CLUI_OnSkinLoad(WPARAM wParam, LPARAM lParam); HRESULT CluiLoadModule(); diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp index 6d6d5698e0..47ffcfc574 100644 --- a/plugins/Clist_modern/src/modern_contact.cpp +++ b/plugins/Clist_modern/src/modern_contact.cpp @@ -158,14 +158,6 @@ INT_PTR ToggleHideOffline(WPARAM, LPARAM) return pcli->pfnSetHideOffline(-1); } -INT_PTR ToggleGroups(WPARAM, LPARAM) -{ - db_set_b(NULL, "CList", "UseGroups", - (BYTE)!db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT)); - pcli->pfnLoadContactTree(); - return 0; -} - INT_PTR SetUseGroups(WPARAM wParam, LPARAM) { int newVal = !(GetWindowLongPtr(pcli->hwndContactTree, GWL_STYLE)&CLS_USEGROUPS); diff --git a/plugins/Clist_modern/src/modern_keyboard.cpp b/plugins/Clist_modern/src/modern_keyboard.cpp index 174efbed7f..77707dc3ec 100644 --- a/plugins/Clist_modern/src/modern_keyboard.cpp +++ b/plugins/Clist_modern/src/modern_keyboard.cpp @@ -66,11 +66,5 @@ int InitSkinHotKeys(void) shk.pwszSection = LPGENW("Main"); shk.pszService = MS_CLIST_TOGGLEHIDEOFFLINE; Hotkey_Register(&shk); - - return 0; } - -void UninitSkinHotKeys(void) -{ -} -- cgit v1.2.3