summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/Discord/src/main.cpp2
-rw-r--r--protocols/FacebookRM/src/theme.cpp2
-rw-r--r--protocols/Gadu-Gadu/src/icolib.cpp2
-rw-r--r--protocols/IRCG/src/options.cpp2
-rw-r--r--protocols/IcqOscarJ/src/init.cpp2
-rw-r--r--protocols/JabberG/src/jabber_icolib.cpp8
-rw-r--r--protocols/MRA/src/MraIcons.cpp8
-rw-r--r--protocols/MSN/src/msn_opts.cpp2
-rw-r--r--protocols/MinecraftDynmap/src/dialogs.cpp10
-rw-r--r--protocols/Omegle/src/theme.cpp10
-rw-r--r--protocols/Sametime/src/sametime.cpp2
-rw-r--r--protocols/SkypeWeb/src/skype_icons.cpp28
-rw-r--r--protocols/SkypeWeb/src/skype_proto.h1
-rw-r--r--protocols/Tox/src/tox_icons.cpp14
-rw-r--r--protocols/Tox/src/tox_proto.h1
-rw-r--r--protocols/Twitter/src/theme.cpp8
-rw-r--r--protocols/VKontakte/src/misc.cpp2
17 files changed, 51 insertions, 53 deletions
diff --git a/protocols/Discord/src/main.cpp b/protocols/Discord/src/main.cpp
index b8678f8179..1076f3f503 100644
--- a/protocols/Discord/src/main.cpp
+++ b/protocols/Discord/src/main.cpp
@@ -64,7 +64,7 @@ extern "C" int __declspec(dllexport) Load(void)
g_hwndHeartbeat = CreateWindowEx(0, L"STATIC", nullptr, 0, 0, 0, 0, 0, nullptr, nullptr, nullptr, nullptr);
- Icon_Register(g_plugin.getInst(), "Discord", g_iconList, _countof(g_iconList));
+ g_plugin.registerIcon("Discord", g_iconList);
return 0;
}
diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index 1e857200d9..8766622708 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -54,7 +54,7 @@ static IconItem icons[] =
void InitIcons(void)
{
- Icon_Register(g_plugin.getInst(), "Protocols/Facebook", icons, _countof(icons), "Facebook");
+ g_plugin.registerIcon("Protocols/Facebook", icons, "Facebook");
}
HANDLE GetIconHandle(const char* name)
diff --git a/protocols/Gadu-Gadu/src/icolib.cpp b/protocols/Gadu-Gadu/src/icolib.cpp
index 93cd157edc..23189ef17c 100644
--- a/protocols/Gadu-Gadu/src/icolib.cpp
+++ b/protocols/Gadu-Gadu/src/icolib.cpp
@@ -43,7 +43,7 @@ extern IconItem iconList[] =
void gg_icolib_init()
{
- Icon_Register(g_plugin.getInst(), "Protocols/" GGDEF_PROTO, iconList, _countof(iconList), GGDEF_PROTO);
+ g_plugin.registerIcon("Protocols/" GGDEF_PROTO, iconList, GGDEF_PROTO);
}
HICON LoadIconEx(const char* name, bool big)
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index dc4a82a630..6f33f9b9d0 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -204,7 +204,7 @@ static IconItem iconList[] =
void InitIcons(void)
{
- Icon_Register(g_plugin.getInst(), "Protocols/IRC", iconList, _countof(iconList), "IRC");
+ g_plugin.registerIcon("Protocols/IRC", iconList, "IRC");
}
HICON LoadIconEx(int iconId, bool big)
diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index 81c973136a..bc84d3d8f5 100644
--- a/protocols/IcqOscarJ/src/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
@@ -94,7 +94,7 @@ extern "C" int __declspec(dllexport) Load(void)
hExtraXStatus = ExtraIcon_RegisterIcolib("xstatus", LPGEN("ICQ xStatus"), "icq_xstatus13");
- Icon_Register(g_plugin.getInst(), "ICQ", iconList, _countof(iconList));
+ g_plugin.registerIcon("ICQ", iconList);
g_MenuInit();
return 0;
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 05bb6107f4..62ed6e151e 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -522,10 +522,10 @@ static IconItem sharedIconList4[] =
void g_IconsInit()
{
- Icon_Register(g_plugin.getInst(), LPGEN("Protocols") "/" LPGEN("Jabber"), sharedIconList1, _countof(sharedIconList1), GLOBAL_SETTING_PREFIX);
- Icon_Register(g_plugin.getInst(), LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs"), sharedIconList2, _countof(sharedIconList2), GLOBAL_SETTING_PREFIX);
- Icon_Register(g_plugin.getInst(), LPGEN("Protocols") "/" LPGEN("Dialogs") "/" LPGEN("Discovery"), sharedIconList3, _countof(sharedIconList3), GLOBAL_SETTING_PREFIX);
- Icon_Register(g_plugin.getInst(), LPGEN("Protocols") "/" LPGEN("Dialogs") "/" LPGEN("Privacy"), sharedIconList4, _countof(sharedIconList4), GLOBAL_SETTING_PREFIX);
+ g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber"), sharedIconList1, GLOBAL_SETTING_PREFIX);
+ g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs"), sharedIconList2, GLOBAL_SETTING_PREFIX);
+ g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Dialogs") "/" LPGEN("Discovery"), sharedIconList3, GLOBAL_SETTING_PREFIX);
+ g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Dialogs") "/" LPGEN("Privacy"), sharedIconList4, GLOBAL_SETTING_PREFIX);
}
HANDLE g_GetIconHandle(int iconId)
diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp
index 4a82300695..7acdd7e366 100644
--- a/protocols/MRA/src/MraIcons.cpp
+++ b/protocols/MRA/src/MraIcons.cpp
@@ -76,10 +76,10 @@ HICON IconLibGetIconEx(HANDLE hIcon, DWORD dwFlags)
void IconsLoad()
{
- Icon_Register(g_plugin.getInst(), LPGEN("Protocols") "/" LPGEN("MRA"), gdiMainIcon, 1, "MRA_");
- Icon_Register(g_plugin.getInst(), LPGEN("Protocols") "/" LPGEN("MRA") "/" LPGEN("Main Menu"), gdiMenuItems, MAIN_MENU_ITEMS_COUNT, "MRA_");
- Icon_Register(g_plugin.getInst(), LPGEN("Protocols") "/" LPGEN("MRA") "/" LPGEN("Contact Menu"), gdiContactMenuItems, CONTACT_MENU_ITEMS_COUNT, "MRA_");
- Icon_Register(g_plugin.getInst(), LPGEN("Protocols") "/" LPGEN("MRA") "/" LPGEN("Extra status"), gdiExtraStatusIconsItems, ADV_ICON_MAX, "MRA_");
+ g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("MRA"), gdiMainIcon, "MRA_");
+ g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("MRA") "/" LPGEN("Main Menu"), gdiMenuItems, "MRA_");
+ g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("MRA") "/" LPGEN("Contact Menu"), gdiContactMenuItems, "MRA_");
+ g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("MRA") "/" LPGEN("Extra status"), gdiExtraStatusIconsItems, "MRA_");
g_hMainIcon = IconLibGetIcon(gdiMainIcon[0].hIcolib);
}
diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp
index 32b3c54cdc..8705bbf845 100644
--- a/protocols/MSN/src/msn_opts.cpp
+++ b/protocols/MSN/src/msn_opts.cpp
@@ -47,7 +47,7 @@ static IconItem iconList[] =
void MsnInitIcons(void)
{
- Icon_Register(g_plugin.getInst(), "Protocols/MSN", iconList, _countof(iconList), "MSN");
+ g_plugin.registerIcon("Protocols/MSN", iconList, "MSN");
}
HICON LoadIconEx(const char* name, bool big)
diff --git a/protocols/MinecraftDynmap/src/dialogs.cpp b/protocols/MinecraftDynmap/src/dialogs.cpp
index 6bedca6e8b..ebacd9aa60 100644
--- a/protocols/MinecraftDynmap/src/dialogs.cpp
+++ b/protocols/MinecraftDynmap/src/dialogs.cpp
@@ -24,19 +24,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Icons
-static IconItem icons[] = {
+static IconItem iconList[] = {
{ "proto", LPGEN("Protocol icon"), IDI_PROTO },
};
-static HANDLE hIconLibItem[_countof(icons)];
+static HANDLE hIconLibItem[_countof(iconList)];
void InitIcons(void) {
- Icon_Register(g_plugin.getInst(), "Protocols/MinecraftDynmap", icons, _countof(icons), "MinecraftDynmap");
+ g_plugin.registerIcon("Protocols/MinecraftDynmap", iconList, "MinecraftDynmap");
}
HANDLE GetIconHandle(const char* name) {
- for (size_t i = 0; i < _countof(icons); i++) {
- if (strcmp(icons[i].szName, name) == 0) {
+ for (size_t i = 0; i < _countof(iconList); i++) {
+ if (strcmp(iconList[i].szName, name) == 0) {
return hIconLibItem[i];
}
}
diff --git a/protocols/Omegle/src/theme.cpp b/protocols/Omegle/src/theme.cpp
index 72af5190f4..fe8e19ca49 100644
--- a/protocols/Omegle/src/theme.cpp
+++ b/protocols/Omegle/src/theme.cpp
@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdafx.h"
-static IconItem icons[] =
+static IconItem iconList[] =
{
{ LPGEN("Omegle Icon"), "omegle", IDI_OMEGLE },
{ LPGEN("Stranger is typing"), "typing_on", IDI_TYPING_ON },
@@ -31,14 +31,14 @@ static IconItem icons[] =
void InitIcons(void)
{
- Icon_Register(g_plugin.getInst(), "Protocols/Omegle", icons, _countof(icons), "Omegle");
+ g_plugin.registerIcon("Protocols/Omegle", iconList, "Omegle");
}
HANDLE GetIconHandle(const char* name)
{
- for (size_t i = 0; i < _countof(icons); i++)
- if (mir_strcmp(icons[i].szName, name) == 0)
- return icons[i].hIcolib;
+ for (auto &it : iconList)
+ if (mir_strcmp(it.szName, name) == 0)
+ return it.hIcolib;
return nullptr;
}
diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index d0214216c4..751bd183d0 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -83,7 +83,7 @@ static IconItem iconList[] =
void SametimeInitIcons(void)
{
- Icon_Register(g_plugin.getInst(), "Protocols/Sametime", iconList, _countof(iconList), "SAMETIME");
+ g_plugin.registerIcon("Protocols/Sametime", iconList, "SAMETIME");
}
HANDLE GetIconHandle(int iconId)
diff --git a/protocols/SkypeWeb/src/skype_icons.cpp b/protocols/SkypeWeb/src/skype_icons.cpp
index 7aba64a40a..a1a51f2d63 100644
--- a/protocols/SkypeWeb/src/skype_icons.cpp
+++ b/protocols/SkypeWeb/src/skype_icons.cpp
@@ -17,27 +17,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdafx.h"
-IconItemT CSkypeProto::Icons[] =
+static IconItem iconList[] =
{
- { LPGENW("Protocol icon"), "main", IDI_SKYPE },
- { LPGENW("Create new chat icon"), "conference", IDI_CONFERENCE },
- { LPGENW("Sync history icon"), "synchistory", IDI_SYNCHISTORY },
- { LPGENW("Block user icon"), "user_block", IDI_BLOCKUSER },
- { LPGENW("Unblock user icon"), "user_unblock", IDI_UNBLOCKUSER },
- { LPGENW("Incoming call icon"), "inc_call", IDI_CALL },
- { LPGENW("Notification icon"), "notify", IDI_NOTIFY },
- { LPGENW("Error icon"), "error", IDI_ERRORICON },
- { LPGENW("Action icon"), "me_action", IDI_ACTION_ME }
+ { LPGEN("Protocol icon"), "main", IDI_SKYPE },
+ { LPGEN("Create new chat icon"), "conference", IDI_CONFERENCE },
+ { LPGEN("Sync history icon"), "synchistory", IDI_SYNCHISTORY },
+ { LPGEN("Block user icon"), "user_block", IDI_BLOCKUSER },
+ { LPGEN("Unblock user icon"), "user_unblock", IDI_UNBLOCKUSER },
+ { LPGEN("Incoming call icon"), "inc_call", IDI_CALL },
+ { LPGEN("Notification icon"), "notify", IDI_NOTIFY },
+ { LPGEN("Error icon"), "error", IDI_ERRORICON },
+ { LPGEN("Action icon"), "me_action", IDI_ACTION_ME }
};
void CSkypeProto::InitIcons()
{
- Icon_RegisterT(g_plugin.getInst(), LPGENW("Protocols") L"/" _A2W(MODULE), Icons, _countof(Icons), MODULE);
+ g_plugin.registerIcon(LPGEN("Protocols") "/" MODULE, iconList, MODULE);
}
HICON CSkypeProto::GetIcon(int iconId)
{
- for (auto &it : Icons)
+ for (auto &it : iconList)
if (it.defIconID == iconId)
return IcoLib_GetIconByHandle(it.hIcolib);
return nullptr;
@@ -45,8 +45,8 @@ HICON CSkypeProto::GetIcon(int iconId)
HANDLE CSkypeProto::GetIconHandle(int iconId)
{
- for (auto &it : Icons)
+ for (auto &it : iconList)
if (it.defIconID == iconId)
return it.hIcolib;
return nullptr;
-} \ No newline at end of file
+}
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index bf704b4325..2950141d96 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -200,7 +200,6 @@ private:
}
// icons
- static IconItemT Icons[];
static HICON GetIcon(int iconId);
static HANDLE GetIconHandle(int iconId);
diff --git a/protocols/Tox/src/tox_icons.cpp b/protocols/Tox/src/tox_icons.cpp
index 762266799f..83c8f10f2b 100644
--- a/protocols/Tox/src/tox_icons.cpp
+++ b/protocols/Tox/src/tox_icons.cpp
@@ -1,20 +1,20 @@
#include "stdafx.h"
-IconItemT CToxProto::Icons[] =
+static IconItem iconList[] =
{
- { LPGENW("Protocol icon"), "main", IDI_TOX },
- { LPGENW("Action icon"), "main", IDI_ME },
- { LPGENW("Correction icon"), "edit", IDI_EDIT },
+ { LPGEN("Protocol icon"), "main", IDI_TOX },
+ { LPGEN("Action icon"), "main", IDI_ME },
+ { LPGEN("Correction icon"), "edit", IDI_EDIT },
};
void CToxProto::InitIcons()
{
- Icon_RegisterT(g_plugin.getInst(), LPGENW("Protocols") L"/" _A2W(MODULE), Icons, _countof(Icons), MODULE);
+ g_plugin.registerIcon(LPGEN("Protocols") "/" MODULE, iconList, MODULE);
}
HANDLE CToxProto::GetIconHandle(int iconId)
{
- for (auto &it : Icons)
+ for (auto &it : iconList)
if (it.defIconID == iconId)
return it.hIcolib;
return nullptr;
@@ -22,7 +22,7 @@ HANDLE CToxProto::GetIconHandle(int iconId)
HICON CToxProto::GetIcon(int iconId)
{
- for (auto &it : Icons)
+ for (auto &it : iconList)
if (it.defIconID == iconId)
return IcoLib_GetIconByHandle(it.hIcolib);
return nullptr;
diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index 9e1ce07d97..3a67298871 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -125,7 +125,6 @@ private:
void UninitNetlib();
// icons
- static IconItemT Icons[];
static HANDLE GetIconHandle(int iconId);
static HICON GetIcon(int iconId);
diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp
index e3b967caf3..d30633d1fb 100644
--- a/protocols/Twitter/src/theme.cpp
+++ b/protocols/Twitter/src/theme.cpp
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "theme.h"
#include "proto.h"
-static IconItem icons[] =
+static IconItem iconList[] =
{
{ LPGEN("Twitter Icon"), "twitter", IDI_TWITTER },
{ LPGEN("Tweet"), "tweet", IDI_TWITTER },
@@ -38,13 +38,13 @@ void TwitterInitSounds(void)
// TODO: uninit
void InitIcons(void)
{
- Icon_Register(g_plugin.getInst(), "Protocols/Twitter", icons, _countof(icons), "Twitter");
- icons[_countof(icons) - 1].hIcolib = Skin_GetIconHandle(SKINICON_EVENT_URL);
+ g_plugin.registerIcon("Protocols/Twitter", iconList, "Twitter");
+ iconList[_countof(iconList) - 1].hIcolib = Skin_GetIconHandle(SKINICON_EVENT_URL);
}
HANDLE GetIconHandle(const char *name)
{
- for (auto &it : icons)
+ for (auto &it : iconList)
if (mir_strcmp(it.szName, name) == 0)
return it.hIcolib;
diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 79e9066c07..43ff4a5c0d 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -79,7 +79,7 @@ static IconItem iconList[] =
void InitIcons()
{
- Icon_Register(g_plugin.getInst(), LPGEN("Protocols") "/" LPGEN("VKontakte"), iconList, _countof(iconList), "VKontakte");
+ g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("VKontakte"), iconList, "VKontakte");
}
HANDLE GetIconHandle(int iCommand)
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-04 01:01:50 +0000