From 37a022d37e79dbe9892f376ef7c3b6b8878c4aff Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 18 May 2018 20:40:44 +0300 Subject: hLangpack variable began migration inside CMPluginBase it remains existing for now, but as reference to g_plugin.m_hLang --- protocols/Discord/src/main.cpp | 2 +- protocols/Dummy/src/main.cpp | 2 +- protocols/EmLanProto/src/amdproto.cpp | 2 +- protocols/FacebookRM/src/main.cpp | 2 +- protocols/Gadu-Gadu/src/gg.cpp | 2 +- protocols/ICQCorp/src/corp.cpp | 2 +- protocols/IRCG/src/main.cpp | 2 +- protocols/IcqOscarJ/src/init.cpp | 2 +- protocols/JabberG/src/jabber.cpp | 2 +- protocols/MRA/src/Mra.cpp | 2 +- protocols/MSN/src/msn.cpp | 2 +- protocols/MinecraftDynmap/src/main.cpp | 2 +- protocols/Omegle/src/main.cpp | 2 +- protocols/Sametime/src/sametime.cpp | 2 +- protocols/SkypeWeb/src/main.cpp | 2 +- protocols/Steam/src/main.cpp | 2 +- protocols/Tox/src/main.cpp | 2 +- protocols/Twitter/src/main.cpp | 2 +- protocols/VKontakte/src/main.cpp | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) (limited to 'protocols') diff --git a/protocols/Discord/src/main.cpp b/protocols/Discord/src/main.cpp index 1d9c337cfc..b8678f8179 100644 --- a/protocols/Discord/src/main.cpp +++ b/protocols/Discord/src/main.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . #include "stdafx.h" CHAT_MANAGER *pci; -int hLangpack = 0; +int &hLangpack(g_plugin.m_hLang); HWND g_hwndHeartbeat; PLUGININFOEX pluginInfo = { diff --git a/protocols/Dummy/src/main.cpp b/protocols/Dummy/src/main.cpp index c6d09c558d..960fd7380b 100644 --- a/protocols/Dummy/src/main.cpp +++ b/protocols/Dummy/src/main.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . #include "stdafx.h" #include "version.h" -int hLangpack; +int &hLangpack(g_plugin.m_hLang); CLIST_INTERFACE *pcli; PLUGININFOEX pluginInfo = diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp index 0cf4329081..43f2bc2c23 100644 --- a/protocols/EmLanProto/src/amdproto.cpp +++ b/protocols/EmLanProto/src/amdproto.cpp @@ -9,7 +9,7 @@ CMPlugin g_plugin; CMLan* g_lan = nullptr; -int hLangpack; +int &hLangpack(g_plugin.m_hLang); bool g_InitOptions = false; #ifdef VERBOSE diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp index fb4d363bca..19c1c54331 100644 --- a/protocols/FacebookRM/src/main.cpp +++ b/protocols/FacebookRM/src/main.cpp @@ -22,7 +22,7 @@ along with this program. If not, see . #include "stdafx.h" -int hLangpack; +int &hLangpack(g_plugin.m_hLang); std::string g_strUserAgent; DWORD g_mirandaVersion; diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index f718313224..f62f56c3be 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -40,7 +40,7 @@ PLUGININFOEX pluginInfo = { // Other variables SSL_API sslApi; CLIST_INTERFACE *pcli; -int hLangpack; +int &hLangpack(g_plugin.m_hLang); static unsigned long crc_table[256]; diff --git a/protocols/ICQCorp/src/corp.cpp b/protocols/ICQCorp/src/corp.cpp index 35292633dc..e71c55b57b 100644 --- a/protocols/ICQCorp/src/corp.cpp +++ b/protocols/ICQCorp/src/corp.cpp @@ -21,7 +21,7 @@ /////////////////////////////////////////////////////////////////////////////// -int hLangpack; +int &hLangpack(g_plugin.m_hLang); char protoName[64]; CMPlugin g_plugin; HNETLIBUSER hNetlibUser; diff --git a/protocols/IRCG/src/main.cpp b/protocols/IRCG/src/main.cpp index 95e23fafa6..4d22b5dbad 100644 --- a/protocols/IRCG/src/main.cpp +++ b/protocols/IRCG/src/main.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. CHAT_MANAGER *pci; CLIST_INTERFACE *pcli; -int hLangpack; +int &hLangpack(g_plugin.m_hLang); static int CompareServers( const SERVER_INFO* p1, const SERVER_INFO* p2 ) { diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp index 8413b762cc..81c973136a 100644 --- a/protocols/IcqOscarJ/src/init.cpp +++ b/protocols/IcqOscarJ/src/init.cpp @@ -28,7 +28,7 @@ #include "m_extraicons.h" #include "m_icolib.h" -int hLangpack; +int &hLangpack(g_plugin.m_hLang); BOOL bPopupService = FALSE; diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index 670e03d1b8..341f5092f0 100755 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. HMODULE hMsftedit; -int hLangpack; +int &hLangpack(g_plugin.m_hLang); unsigned int g_nTempFileId; CHAT_MANAGER *pci; diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp index 8c9c139e3b..7fb4b0ed55 100644 --- a/protocols/MRA/src/Mra.cpp +++ b/protocols/MRA/src/Mra.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -int hLangpack; +int &hLangpack(g_plugin.m_hLang); CLIST_INTERFACE *pcli; HMODULE g_hDLLXStatusIcons; diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp index 5f3a7f58be..ac39b01399 100644 --- a/protocols/MSN/src/msn.cpp +++ b/protocols/MSN/src/msn.cpp @@ -25,7 +25,7 @@ along with this program. If not, see . #include "version.h" CLIST_INTERFACE *pcli; -int hLangpack; +int &hLangpack(g_plugin.m_hLang); ///////////////////////////////////////////////////////////////////////////////////////// // Initialization routines diff --git a/protocols/MinecraftDynmap/src/main.cpp b/protocols/MinecraftDynmap/src/main.cpp index 8261f02e37..c50d2766c6 100644 --- a/protocols/MinecraftDynmap/src/main.cpp +++ b/protocols/MinecraftDynmap/src/main.cpp @@ -23,7 +23,7 @@ along with this program. If not, see . #include "stdafx.h" CLIST_INTERFACE* pcli; -int hLangpack; +int &hLangpack(g_plugin.m_hLang); std::string g_strUserAgent; DWORD g_mirandaVersion; diff --git a/protocols/Omegle/src/main.cpp b/protocols/Omegle/src/main.cpp index d2d0559529..3dcb03603c 100644 --- a/protocols/Omegle/src/main.cpp +++ b/protocols/Omegle/src/main.cpp @@ -25,7 +25,7 @@ along with this program. If not, see . // TODO: Make following as "globals" structure? CLIST_INTERFACE* pcli; -int hLangpack; +int &hLangpack(g_plugin.m_hLang); std::string g_strUserAgent; DWORD g_mirandaVersion; diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp index 27e0d2e08e..d0214216c4 100644 --- a/protocols/Sametime/src/sametime.cpp +++ b/protocols/Sametime/src/sametime.cpp @@ -4,7 +4,7 @@ // plugin stuff -int hLangpack; +int &hLangpack(g_plugin.m_hLang); PLUGININFOEX pluginInfo = { diff --git a/protocols/SkypeWeb/src/main.cpp b/protocols/SkypeWeb/src/main.cpp index d606d7d593..1ff515f2b4 100644 --- a/protocols/SkypeWeb/src/main.cpp +++ b/protocols/SkypeWeb/src/main.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . #include "stdafx.h" -int hLangpack; +int &hLangpack(g_plugin.m_hLang); CLIST_INTERFACE *pcli; char g_szMirVer[100]; HANDLE g_hCallEvent; diff --git a/protocols/Steam/src/main.cpp b/protocols/Steam/src/main.cpp index 94a6915805..cbe75d5100 100644 --- a/protocols/Steam/src/main.cpp +++ b/protocols/Steam/src/main.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -int hLangpack; +int &hLangpack(g_plugin.m_hLang); HANDLE hExtraXStatus; diff --git a/protocols/Tox/src/main.cpp b/protocols/Tox/src/main.cpp index e38e972025..593d598485 100644 --- a/protocols/Tox/src/main.cpp +++ b/protocols/Tox/src/main.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -int hLangpack; +int &hLangpack(g_plugin.m_hLang); CHAT_MANAGER *pci; CLIST_INTERFACE *pcli; HANDLE hProfileFolderPath; diff --git a/protocols/Twitter/src/main.cpp b/protocols/Twitter/src/main.cpp index 655cb2e4c7..afe7e21ae7 100644 --- a/protocols/Twitter/src/main.cpp +++ b/protocols/Twitter/src/main.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . CLIST_INTERFACE *pcli; -int hLangpack = 0; +int &hLangpack(g_plugin.m_hLang); PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), diff --git a/protocols/VKontakte/src/main.cpp b/protocols/VKontakte/src/main.cpp index bb64d07bc5..3861ba254d 100644 --- a/protocols/VKontakte/src/main.cpp +++ b/protocols/VKontakte/src/main.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . #include "stdafx.h" #include "version.h" -int hLangpack; +int &hLangpack(g_plugin.m_hLang); CLIST_INTERFACE *pcli; PLUGININFOEX pluginInfo = -- cgit v1.2.3