From 55e72960be3926e041ac0baf00559ba46f59bba0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 29 Oct 2016 17:32:02 +0300 Subject: unneeded macros removed --- plugins/Dropbox/src/dropbox_options.cpp | 2 +- plugins/Dropbox/src/stdafx.h | 1 - plugins/FloatingContacts/src/fltcont.h | 1 - plugins/FloatingContacts/src/main.cpp | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) (limited to 'plugins') 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(); -- cgit v1.2.3