From 6cbc80198df3a18724e667743f8068eb60e23b88 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 12 Apr 2019 22:17:02 +0300 Subject: wiping custom icolib functions: all another plugins --- protocols/Tox/src/tox_icons.cpp | 16 ---------------- protocols/Tox/src/tox_messages.cpp | 2 +- protocols/Tox/src/tox_proto.h | 4 ---- 3 files changed, 1 insertion(+), 21 deletions(-) (limited to 'protocols/Tox/src') diff --git a/protocols/Tox/src/tox_icons.cpp b/protocols/Tox/src/tox_icons.cpp index 83c8f10f2b..50d11f5303 100644 --- a/protocols/Tox/src/tox_icons.cpp +++ b/protocols/Tox/src/tox_icons.cpp @@ -11,19 +11,3 @@ void CToxProto::InitIcons() { g_plugin.registerIcon(LPGEN("Protocols") "/" MODULE, iconList, MODULE); } - -HANDLE CToxProto::GetIconHandle(int iconId) -{ - for (auto &it : iconList) - if (it.defIconID == iconId) - return it.hIcolib; - return nullptr; -} - -HICON CToxProto::GetIcon(int iconId) -{ - for (auto &it : iconList) - if (it.defIconID == iconId) - return IcoLib_GetIconByHandle(it.hIcolib); - return nullptr; -} diff --git a/protocols/Tox/src/tox_messages.cpp b/protocols/Tox/src/tox_messages.cpp index ef75bfaf38..cd327a7146 100644 --- a/protocols/Tox/src/tox_messages.cpp +++ b/protocols/Tox/src/tox_messages.cpp @@ -18,7 +18,7 @@ INT_PTR CToxProto::EventGetIcon(WPARAM wParam, LPARAM lParam) switch (dbei->eventType) { case DB_EVENT_ACTION: - icon = GetIcon(IDI_ME); + icon = g_plugin.getIcon(IDI_ME); break; default: diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h index bcd95434c0..62ecf196e8 100644 --- a/protocols/Tox/src/tox_proto.h +++ b/protocols/Tox/src/tox_proto.h @@ -122,10 +122,6 @@ private: // netlib void InitNetlib(); - // icons - static HANDLE GetIconHandle(int iconId); - static HICON GetIcon(int iconId); - // menus static HGENMENU ContactMenuItems[CMI_MAX]; int __cdecl OnPrebuildContactMenu(WPARAM hContact, LPARAM); -- cgit v1.2.3