diff options
| -rw-r--r-- | plugins/Dropbox/src/dropbox_options.cpp | 2 | ||||
| -rw-r--r-- | plugins/Dropbox/src/stdafx.h | 1 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/fltcont.h | 1 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/main.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_icons.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/stdafx.h | 1 | ||||
| -rw-r--r-- | protocols/Steam/src/stdafx.h | 1 | ||||
| -rw-r--r-- | protocols/Steam/src/steam_proto.cpp | 2 | ||||
| -rw-r--r-- | protocols/Steam/src/steam_utils.cpp | 2 | ||||
| -rw-r--r-- | protocols/Tox/src/stdafx.h | 1 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_icons.cpp | 2 |
11 files changed, 6 insertions, 11 deletions
diff --git a/plugins/Dropbox/src/dropbox_options.cpp b/plugins/Dropbox/src/dropbox_options.cpp index fd60a14f3f..142a22b407 100644 --- a/plugins/Dropbox/src/dropbox_options.cpp +++ b/plugins/Dropbox/src/dropbox_options.cpp @@ -152,7 +152,7 @@ void CDropboxOptionsInterception::OnApply() int CDropbox::OnOptionsInitialized(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
- odp.szTitle.w = MODULEW;
+ odp.szTitle.w = _A2W(MODULE);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
odp.szGroup.w = LPGENW("Network");
diff --git a/plugins/Dropbox/src/stdafx.h b/plugins/Dropbox/src/stdafx.h index 56ebe56e24..21da021e56 100644 --- a/plugins/Dropbox/src/stdafx.h +++ b/plugins/Dropbox/src/stdafx.h @@ -65,7 +65,6 @@ public: };
#define MODULE "Dropbox"
-#define MODULEW L"Dropbox"
#include "dropbox_options.h"
#include "http_request.h"
diff --git a/plugins/FloatingContacts/src/fltcont.h b/plugins/FloatingContacts/src/fltcont.h index 691fc6101c..ca4919c2fc 100644 --- a/plugins/FloatingContacts/src/fltcont.h +++ b/plugins/FloatingContacts/src/fltcont.h @@ -58,7 +58,6 @@ enum //
#define MODULE "FloatingContacts"
-#define MODULEW L"FloatingContacts"
#define TOTOPTIME_P 1000
#define TOTOPTIME_MAX (15*(60000/TOTOPTIME_P))
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index 8927b18665..50d66b6e0f 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -910,7 +910,7 @@ extern "C" int __declspec(dllexport) Load() mir_getLP(&pluginInfoEx);
pcli = Clist_GetInterface();
- Icon_RegisterT(hInst, MODULEW, g_iconList, _countof(g_iconList));
+ Icon_RegisterT(hInst, _A2W(MODULE), g_iconList, _countof(g_iconList));
LoadMenus();
InitOptions();
diff --git a/protocols/SkypeWeb/src/skype_icons.cpp b/protocols/SkypeWeb/src/skype_icons.cpp index 18ab4ad130..b6c9a37e37 100644 --- a/protocols/SkypeWeb/src/skype_icons.cpp +++ b/protocols/SkypeWeb/src/skype_icons.cpp @@ -32,7 +32,7 @@ IconItemT CSkypeProto::Icons[] = void CSkypeProto::InitIcons()
{
- Icon_RegisterT(g_hInstance, LPGENW("Protocols") L"/" MODULEW, Icons, _countof(Icons), MODULE);
+ Icon_RegisterT(g_hInstance, LPGENW("Protocols") L"/" _A2W(MODULE), Icons, _countof(Icons), MODULE);
}
HICON CSkypeProto::GetIcon(int iconId)
diff --git a/protocols/SkypeWeb/src/stdafx.h b/protocols/SkypeWeb/src/stdafx.h index 005f61f945..4f33cf6d1a 100644 --- a/protocols/SkypeWeb/src/stdafx.h +++ b/protocols/SkypeWeb/src/stdafx.h @@ -191,7 +191,6 @@ public: #define MODULE "Skype"
-#define MODULEW L"Skype"
#define SKYPE_MAX_CONNECT_RETRIES 10
diff --git a/protocols/Steam/src/stdafx.h b/protocols/Steam/src/stdafx.h index 2ebe847089..44e3dfc893 100644 --- a/protocols/Steam/src/stdafx.h +++ b/protocols/Steam/src/stdafx.h @@ -41,7 +41,6 @@ #include "version.h"
#define MODULE "Steam"
-#define MODULEW L"Steam"
#define STEAM_API_TIMEOUT 30
#define STEAM_API_IDLEOUT_AWAY 600
diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp index 107c086f08..264be85961 100644 --- a/protocols/Steam/src/steam_proto.cpp +++ b/protocols/Steam/src/steam_proto.cpp @@ -18,7 +18,7 @@ CSteamProto::CSteamProto(const char* protoName, const wchar_t* userName) GetModuleFileName(g_hInstance, filePath, MAX_PATH); wchar_t sectionName[100]; - mir_snwprintf(sectionName, L"%s/%s", LPGENW("Protocols"), MODULEW); + mir_snwprintf(sectionName, L"%s/%s", LPGENW("Protocols"), _A2W(MODULE)); char settingName[100]; mir_snprintf(settingName, "%s_%s", MODULE, "main"); diff --git a/protocols/Steam/src/steam_utils.cpp b/protocols/Steam/src/steam_utils.cpp index 9a3633953f..6c70528787 100644 --- a/protocols/Steam/src/steam_utils.cpp +++ b/protocols/Steam/src/steam_utils.cpp @@ -181,7 +181,7 @@ void CSteamProto::ShowNotification(const wchar_t *caption, const wchar_t *messag void CSteamProto::ShowNotification(const wchar_t *message, int flags, MCONTACT hContact)
{
- ShowNotification(MODULEW, message, flags, hContact);
+ ShowNotification(_A2W(MODULE), message, flags, hContact);
}
INT_PTR __cdecl CSteamProto::OnGetEventTextChatStates(WPARAM pEvent, LPARAM datatype)
diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h index e4f9c6987b..6b2c083543 100644 --- a/protocols/Tox/src/stdafx.h +++ b/protocols/Tox/src/stdafx.h @@ -69,7 +69,6 @@ struct CToxProto; extern HINSTANCE g_hInstance;
#define MODULE "Tox"
-#define MODULEW L"Tox"
#define TOX_ERROR -1
diff --git a/protocols/Tox/src/tox_icons.cpp b/protocols/Tox/src/tox_icons.cpp index 083bf078c2..0faaf9a295 100644 --- a/protocols/Tox/src/tox_icons.cpp +++ b/protocols/Tox/src/tox_icons.cpp @@ -11,7 +11,7 @@ IconItemT CToxProto::Icons[] = void CToxProto::InitIcons()
{
- Icon_RegisterT(g_hInstance, LPGENW("Protocols") L"/" MODULEW, Icons, _countof(Icons), MODULE);
+ Icon_RegisterT(g_hInstance, LPGENW("Protocols") L"/" _A2W(MODULE), Icons, _countof(Icons), MODULE);
}
HANDLE CToxProto::GetIconHandle(int iconId)
|