From 73e40c0b5ceedc93c111530c71bc5dc798390bcb Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 29 Jan 2013 08:32:31 +0000 Subject: - muuid standardization (patch from Basil) git-svn-id: http://svn.miranda-ng.org/main/trunk@3332 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Console/src/init.cpp | 3 ++- plugins/Console/src/version.h | 1 - plugins/NewXstatusNotify/src/common.h | 1 - plugins/NewXstatusNotify/src/main.cpp | 2 +- plugins/NotesAndReminders/src/globals.h | 3 +-- plugins/NotesAndReminders/src/main.cpp | 2 +- plugins/OpenFolder/src/openFolder.cpp | 2 +- plugins/OpenFolder/src/openFolder.h | 1 - plugins/Popup/src/config.cpp | 2 +- plugins/Popup/src/version.h | 1 - plugins/Restart/src/restart.cpp | 2 +- plugins/StatusPlugins/AdvancedAutoAway/main.cpp | 4 +--- plugins/StatusPlugins/KeepStatus/main.cpp | 4 +--- plugins/StatusPlugins/StartupStatus/main.cpp | 4 +--- plugins/StatusPlugins/StartupStatus/startupstatus.cpp | 2 -- plugins/StopSpamPlus/src/stopspam.cpp | 4 +--- plugins/TipperYM/src/common.h | 2 -- plugins/TipperYM/src/tipper.cpp | 2 +- plugins/TooltipNotify/src/main.cpp | 5 +---- plugins/TrafficCounter/src/TrafficCounter.c | 4 +--- plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj | 4 ++-- plugins/TranslitSwitcher/src/TranslitSwitcher.cpp | 2 +- plugins/TranslitSwitcher/src/TranslitSwitcher.h | 2 -- plugins/UserGuide/src/commonheaders.h | 2 -- plugins/UserGuide/src/main.cpp | 3 ++- plugins/ZeroNotification/src/main.cpp | 2 +- plugins/ZeroNotification/src/version.h | 1 - plugins/mTextControl/src/main.cpp | 3 ++- plugins/mTextControl/src/version.h | 3 +-- protocols/GTalkExt/src/GTalkExt.cpp | 3 +-- protocols/Xfire/src/main.cpp | 5 ++--- 31 files changed, 27 insertions(+), 54 deletions(-) diff --git a/plugins/Console/src/init.cpp b/plugins/Console/src/init.cpp index 593b7790f3..179f1990d3 100644 --- a/plugins/Console/src/init.cpp +++ b/plugins/Console/src/init.cpp @@ -37,7 +37,8 @@ PLUGININFOEX pluginInfoEx={ __PLUGIN_RIGHTS, __PLUGIN_URL, UNICODE_AWARE, - MIID_CONSOLE + { 0x23d4f302, 0xd513, 0x45b7, { 0x90, 0x27, 0x44, 0x5f, 0x29, 0x55, 0x73, 0x11 }} // {23D4F302-D513-45b7-9027-445F29557311} + }; BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) diff --git a/plugins/Console/src/version.h b/plugins/Console/src/version.h index ef78958def..7cde649cc9 100644 --- a/plugins/Console/src/version.h +++ b/plugins/Console/src/version.h @@ -35,7 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __PLUGIN_FILE "Console.dll" #define __PLUGIN_SHORTNAME "Console" -#define MIID_CONSOLE { 0x23d4f302, 0xd513, 0x45b7, { 0x90, 0x27, 0x44, 0x5f, 0x29, 0x55, 0x73, 0x11 }} // {23D4F302-D513-45b7-9027-445F29557311} #define __PLUGIN_NAME __PLUGIN_SHORTNAME #define __PLUGIN_URL "http://miranda-ng.org/" diff --git a/plugins/NewXstatusNotify/src/common.h b/plugins/NewXstatusNotify/src/common.h index b5976c8c4c..dd739eff71 100644 --- a/plugins/NewXstatusNotify/src/common.h +++ b/plugins/NewXstatusNotify/src/common.h @@ -74,7 +74,6 @@ #include "m_toptoolbar.h" #include "resource.h" -#define MIID_NXSN { 0xebf19652, 0xe434, 0x4d79, { 0x98, 0x97, 0x91, 0xa0, 0xff, 0x22, 0x6f, 0x51 } } #define MODULE "NewStatusNotify" diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index 2399f5d0bc..74532987a7 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -51,7 +51,7 @@ PLUGININFOEX pluginInfoEx = { "© 2001-2004 Luca Santarelli, 2005-2007 Vasilich, 2007-2011 yaho", "http://miranda-ng.org/", UNICODE_AWARE, - MIID_NXSN + { 0xebf19652, 0xe434, 0x4d79, { 0x98, 0x97, 0x91, 0xa0, 0xff, 0x22, 0x6f, 0x51 } } }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) diff --git a/plugins/NotesAndReminders/src/globals.h b/plugins/NotesAndReminders/src/globals.h index 83fd2ce3ae..c6dfc1bba6 100644 --- a/plugins/NotesAndReminders/src/globals.h +++ b/plugins/NotesAndReminders/src/globals.h @@ -26,8 +26,7 @@ #include "miscutils.h" #include "resource.h" -// {842A6668-F9DA-4968-BFD7-D2BD9DF848EE} -#define MIID_NNR {0x842a6668, 0xf9da, 0x4968, {0xbf, 0xd7, 0xd2, 0xbd, 0x9d, 0xf8, 0x48, 0xee}} + #define MODULENAME "StickyNotes" #define SECTIONNAME "Notes & Reminders" diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index c203039f00..a099178f7d 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -27,7 +27,7 @@ static PLUGININFOEX pluginInfo = "(C) 2003,2005 Joe Kucera, Lubomir Ivanov", "http://d00mer.freeshell.org/miranda/", UNICODE_AWARE, - MIID_NNR + {0x842a6668, 0xf9da, 0x4968, {0xbf, 0xd7, 0xd2, 0xbd, 0x9d, 0xf8, 0x48, 0xee}} // {842A6668-F9DA-4968-BFD7-D2BD9DF848EE} }; diff --git a/plugins/OpenFolder/src/openFolder.cpp b/plugins/OpenFolder/src/openFolder.cpp index 98673b4c06..cb80d357dc 100644 --- a/plugins/OpenFolder/src/openFolder.cpp +++ b/plugins/OpenFolder/src/openFolder.cpp @@ -15,7 +15,7 @@ PLUGININFOEX pluginInfoEx = "© 2008 jarvis, © 2004 Kreisquadratur", "http://miranda-ng.org/", UNICODE_AWARE, //not transient - MIID_OPENFOLDER // {10896143-7249-4b36-A408-6501A6B6035A} + { 0x10896143, 0x7249, 0x4b36, { 0xa4, 0x8, 0x65, 0x1, 0xa6, 0xb6, 0x3, 0x5a } } // {10896143-7249-4b36-A408-6501A6B6035A} }; static IconItem icon = { LPGEN("Open Folder"), "open", IDI_FOLDER }; diff --git a/plugins/OpenFolder/src/openFolder.h b/plugins/OpenFolder/src/openFolder.h index 7f51889d77..ad5d7222e7 100644 --- a/plugins/OpenFolder/src/openFolder.h +++ b/plugins/OpenFolder/src/openFolder.h @@ -17,6 +17,5 @@ #define OPENFOLDER_VERSION PLUGIN_MAKE_VERSION( 1, 1, 0, 0 ) #define OPENFOLDER_DESCRIPTION "Adds a menu/toobar item which opens the main Miranda NG folder." -#define MIID_OPENFOLDER { 0x10896143, 0x7249, 0x4b36, { 0xa4, 0x8, 0x65, 0x1, 0xa6, 0xb6, 0x3, 0x5a } } //#define OPENFOLDER_DB_MODULENAME "openFolder" #define OPENFOLDER_MODULE_NAME "openfolder" diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp index 839871e8c2..450c2367a3 100644 --- a/plugins/Popup/src/config.cpp +++ b/plugins/Popup/src/config.cpp @@ -59,7 +59,7 @@ PLUGININFOEX pluginInfoEx = POPUP_COPYRIGHT, POPUP_WEBPAGE, UNICODE_AWARE, - POPUP_UUID + {0x26a9125d, 0x7863, 0x4e01, {0xaf, 0xe, 0xd1, 0x4e, 0xf9, 0x5c, 0x50, 0x54}} }; diff --git a/plugins/Popup/src/version.h b/plugins/Popup/src/version.h index 51a08fa97d..64a7771ea6 100644 --- a/plugins/Popup/src/version.h +++ b/plugins/Popup/src/version.h @@ -56,6 +56,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define POPUP_EMAIL "mp-king@web.de" #define POPUP_COPYRIGHT "�2002 Luca Santarelli, �2004-2007 Victor Pavlychko, �2010 MPK, Merlin_de" #define POPUP_WEBPAGE "http://miranda-ng.org/" - #define POPUP_UUID {0x26a9125d, 0x7863, 0x4e01, {0xaf, 0xe, 0xd1, 0x4e, 0xf9, 0x5c, 0x50, 0x54}} #define POPUP_PID 0x12a3fdbdecd273ee67dbc4d6d00e9268 diff --git a/plugins/Restart/src/restart.cpp b/plugins/Restart/src/restart.cpp index cd323a5d50..7cd3002eb0 100644 --- a/plugins/Restart/src/restart.cpp +++ b/plugins/Restart/src/restart.cpp @@ -24,7 +24,7 @@ PLUGININFOEX pluginInfo={ "© 2008 - 2012 -=J-Scar=-", "http://miranda-ng.org", UNICODE_AWARE, - 0x61bedf3a, 0xcc2, 0x41a3, { 0xb9, 0x80, 0xbb, 0x93, 0x93, 0x36, 0x89, 0x35 } // {61BEDF3A-0CC2-41a3-B980-BB9393368935} + {0x61bedf3a, 0xcc2, 0x41a3, { 0xb9, 0x80, 0xbb, 0x93, 0x93, 0x36, 0x89, 0x35 }} // {61BEDF3A-0CC2-41a3-B980-BB9393368935} }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) diff --git a/plugins/StatusPlugins/AdvancedAutoAway/main.cpp b/plugins/StatusPlugins/AdvancedAutoAway/main.cpp index 5a560dee73..a08f18af0c 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/main.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/main.cpp @@ -24,8 +24,6 @@ #include "advancedautoaway.h" #include "../resource.h" -// {F0FDF73A-753D-499d-8DBA-336DB79CDD41} -#define MIID_ADVAUTOAWAY { 0xf0fdf73a, 0x753d, 0x499d, { 0x8d, 0xba, 0x33, 0x6d, 0xb7, 0x9c, 0xdd, 0x41 } } HINSTANCE hInst, hCore = NULL; CLIST_INTERFACE *pcli; @@ -61,7 +59,7 @@ PLUGININFOEX pluginInfoEx={ __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - MIID_ADVAUTOAWAY + { 0xf0fdf73a, 0x753d, 0x499d, { 0x8d, 0xba, 0x33, 0x6d, 0xb7, 0x9c, 0xdd, 0x41 } } // {F0FDF73A-753D-499d-8DBA-336DB79CDD41} }; extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) diff --git a/plugins/StatusPlugins/KeepStatus/main.cpp b/plugins/StatusPlugins/KeepStatus/main.cpp index 972b144d5f..10cdc9a5df 100644 --- a/plugins/StatusPlugins/KeepStatus/main.cpp +++ b/plugins/StatusPlugins/KeepStatus/main.cpp @@ -45,8 +45,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) ///////////////////////////////////////////////////////////////////////////////////////// // returns plugin's extended information -// {A5BB1B7A-B7CD-4cbb-A7DB-CEB4EB71DA49} -#define MIID_KEEPSTATUS { 0xa5bb1b7a, 0xb7cd, 0x4cbb, { 0xa7, 0xdb, 0xce, 0xb4, 0xeb, 0x71, 0xda, 0x49 } } PLUGININFOEX pluginInfoEx={ sizeof(PLUGININFOEX), @@ -58,7 +56,7 @@ PLUGININFOEX pluginInfoEx={ __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - MIID_KEEPSTATUS + { 0xa5bb1b7a, 0xb7cd, 0x4cbb, { 0xa7, 0xdb, 0xce, 0xb4, 0xeb, 0x71, 0xda, 0x49 } } // {A5BB1B7A-B7CD-4cbb-A7DB-CEB4EB71DA49} }; extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) diff --git a/plugins/StatusPlugins/StartupStatus/main.cpp b/plugins/StatusPlugins/StartupStatus/main.cpp index fc74bb2a05..e259aaf13a 100644 --- a/plugins/StatusPlugins/StartupStatus/main.cpp +++ b/plugins/StatusPlugins/StartupStatus/main.cpp @@ -19,8 +19,6 @@ #include "../commonstatus.h" #include "startupstatus.h" -// {4B733944-5A70-4b52-AB2D-68B1EF38FFE8} -#define MIID_STARTUPSTATUS { 0x4b733944, 0x5a70, 0x4b52, { 0xab, 0x2d, 0x68, 0xb1, 0xef, 0x38, 0xff, 0xe8 } } static HANDLE hCSModuleLoadedHook, @@ -57,7 +55,7 @@ PLUGININFOEX pluginInfoEx={ __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - MIID_STARTUPSTATUS + { 0x4b733944, 0x5a70, 0x4b52, { 0xab, 0x2d, 0x68, 0xb1, 0xef, 0x38, 0xff, 0xe8 } } // {4B733944-5A70-4b52-AB2D-68B1EF38FFE8} }; extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp index 9724f7e467..50848c30bc 100644 --- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp +++ b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp @@ -19,8 +19,6 @@ #include "../commonstatus.h" #include "startupstatus.h" -// {4B733944-5A70-4b52-AB2D-68B1EF38FFE8} -#define MIID_STARTUPSTATUS { 0x4b733944, 0x5a70, 0x4b52, { 0xab, 0x2d, 0x68, 0xb1, 0xef, 0x38, 0xff, 0xe8 } } static UINT_PTR setStatusTimerId = 0; diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp index 57dfa560ef..fdbb859a2a 100644 --- a/plugins/StopSpamPlus/src/stopspam.cpp +++ b/plugins/StopSpamPlus/src/stopspam.cpp @@ -6,8 +6,6 @@ int hLangpack; ///////////////////////////////////////////////////////////////////////////////////////// // returns plugin's extended information -// {553811EE-DEB6-48b8-8902-A8A00C1FD679} -#define MIID_STOPSPAM { 0x553811ee, 0xdeb6, 0x48b8, { 0x89, 0x2, 0xa8, 0xa0, 0xc, 0x1f, 0xd6, 0x79 } } PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), @@ -19,7 +17,7 @@ PLUGININFOEX pluginInfoEx = { __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - MIID_STOPSPAM + { 0x553811ee, 0xdeb6, 0x48b8, { 0x89, 0x2, 0xa8, 0xa0, 0xc, 0x1f, 0xd6, 0x79 } } // {553811EE-DEB6-48b8-8902-A8A00C1FD679} }; diff --git a/plugins/TipperYM/src/common.h b/plugins/TipperYM/src/common.h index d66c1bd221..bbecc49386 100644 --- a/plugins/TipperYM/src/common.h +++ b/plugins/TipperYM/src/common.h @@ -88,8 +88,6 @@ Boston, MA 02111-1307, USA. #include "m_variables.h" #include "m_smileyadd.h" -// {8392DF1D-9090-4f8e-9DF6-2FE058EDD800} -#define MIID_TIPPER { 0x8392df1d, 0x9090, 0x4f8e, { 0x9d, 0xf6, 0x2f, 0xe0, 0x58, 0xed, 0xd8, 0x00 } } #define MODULE "Tipper" #define MODULE_ITEMS "Tipper_Items" diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp index 9af1b64b20..33895c7035 100644 --- a/plugins/TipperYM/src/tipper.cpp +++ b/plugins/TipperYM/src/tipper.cpp @@ -58,7 +58,7 @@ PLUGININFOEX pluginInfoEx = "© 2005-2007 Scott Ellis, 2007-2011 Jan Holub", "http://miranda-ng.org/", UNICODE_AWARE, //doesn't replace anything built-in - MIID_TIPPER + { 0x8392df1d, 0x9090, 0x4f8e, { 0x9d, 0xf6, 0x2f, 0xe0, 0x58, 0xed, 0xd8, 0x00 } } // {8392DF1D-9090-4f8e-9DF6-2FE058EDD800} }; extern "C" bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) diff --git a/plugins/TooltipNotify/src/main.cpp b/plugins/TooltipNotify/src/main.cpp index 36d5aa80ef..6a250e8bef 100644 --- a/plugins/TooltipNotify/src/main.cpp +++ b/plugins/TooltipNotify/src/main.cpp @@ -6,9 +6,6 @@ #include "version.h" #include "TooltipNotify.h" -// {5906A545-F31A-4726-B48F-03A09F060318} -static const MUUID MIID_TOOLTIPNOTIFY_UNICODE = -{ 0x5906a545, 0xf31a, 0x4726, { 0xb4, 0x8f, 0x3, 0xa0, 0x9f, 0x6, 0x3, 0x18 } }; // {03CD82B6-0BB5-4f26-8EB4-06CD8ECD36FF} static const MUUID MIID_TOOLTIPNOTIFY = @@ -77,7 +74,7 @@ static PLUGININFOEX sPluginInfo = "© 2004-2008 Gneedah software", "http://miranda-ng.org/", UNICODE_AWARE, //doesn't replace anything built-in - MIID_TOOLTIPNOTIFY_UNICODE + { 0x5906a545, 0xf31a, 0x4726, { 0xb4, 0x8f, 0x3, 0xa0, 0x9f, 0x6, 0x3, 0x18 } } // {5906A545-F31A-4726-B48F-03A09F060318} }; extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) diff --git a/plugins/TrafficCounter/src/TrafficCounter.c b/plugins/TrafficCounter/src/TrafficCounter.c index f6756f0ab0..a423804e64 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.c +++ b/plugins/TrafficCounter/src/TrafficCounter.c @@ -94,8 +94,6 @@ COLORREF KeyColor; // Âíóòðåííèå ôóíêöèè ìîäóëÿ. void Traffic_AddMainMenuItem(void); -// {82181510-5DFA-49d7-B469-33871E2AE8B5} -#define MIID_TRAFFICCOUNTER {0x82181510, 0x5dfa, 0x49d7, { 0xb4, 0x69, 0x33, 0x87, 0x1e, 0x2a, 0xe8, 0xb5}} PLUGININFOEX pluginInfoEx = { @@ -108,7 +106,7 @@ PLUGININFOEX pluginInfoEx = "© 2002-2006 Ghost, © 2007-2012 Mironych", "", UNICODE_AWARE, - MIID_TRAFFICCOUNTER + {0x82181510, 0x5dfa, 0x49d7, { 0xb4, 0x69, 0x33, 0x87, 0x1e, 0x2a, 0xe8, 0xb5}} // {82181510-5DFA-49d7-B469-33871E2AE8B5} }; __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) diff --git a/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj b/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj index 39e68b220b..ac6c39209d 100644 --- a/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj +++ b/plugins/TranslitSwitcher/TranslitSwitcher_10.vcxproj @@ -121,7 +121,7 @@ OnlyExplicitInline Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true false true @@ -150,7 +150,7 @@ OnlyExplicitInline Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true false true diff --git a/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp b/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp index 8ba312f41e..8278e0d522 100644 --- a/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp +++ b/plugins/TranslitSwitcher/src/TranslitSwitcher.cpp @@ -33,7 +33,7 @@ PLUGININFOEX pluginInfoEx = { __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - MIID_TS + { 0x286947d, 0x3140, 0x4222, { 0xb5, 0xad, 0x2c, 0x92, 0x31, 0x5e, 0x1c, 0x1e } } // {0286947D-3140-4222-B5AD-2C92315E1C1E} }; static IconItem iconList[] = diff --git a/plugins/TranslitSwitcher/src/TranslitSwitcher.h b/plugins/TranslitSwitcher/src/TranslitSwitcher.h index f8f99f0bb3..e3c84eb0cb 100644 --- a/plugins/TranslitSwitcher/src/TranslitSwitcher.h +++ b/plugins/TranslitSwitcher/src/TranslitSwitcher.h @@ -54,7 +54,5 @@ VOID TranslitLayout(BOOL); VOID InvertCase(BOOL); int OnButtonPressed(WPARAM wParam, LPARAM lParam); -// {0286947D-3140-4222-B5AD-2C92315E1C1E} -#define MIID_TS { 0x286947d, 0x3140, 0x4222, { 0xb5, 0xad, 0x2c, 0x92, 0x31, 0x5e, 0x1c, 0x1e } } #endif diff --git a/plugins/UserGuide/src/commonheaders.h b/plugins/UserGuide/src/commonheaders.h index 498dbb5b13..cf71412494 100644 --- a/plugins/UserGuide/src/commonheaders.h +++ b/plugins/UserGuide/src/commonheaders.h @@ -10,5 +10,3 @@ #include #include #include - -#define MIID_USERGUIDE {0x297ec1e7, 0x41b7, 0x41f9, { 0xbb, 0x91, 0xef, 0xa9, 0x50, 0x28, 0xf1, 0x6c }} //297ec1e7-41b7-41f9-bb91-efa95028f16c diff --git a/plugins/UserGuide/src/main.cpp b/plugins/UserGuide/src/main.cpp index c11494cf38..1e99ce017f 100644 --- a/plugins/UserGuide/src/main.cpp +++ b/plugins/UserGuide/src/main.cpp @@ -15,7 +15,8 @@ PLUGININFOEX pluginInfo={ "© 2009 Mikhail Yuriev", "http://miranda-ng.org/", UNICODE_AWARE, - MIID_USERGUIDE + {0x297ec1e7, 0x41b7, 0x41f9, { 0xbb, 0x91, 0xef, 0xa9, 0x50, 0x28, 0xf1, 0x6c }} //297ec1e7-41b7-41f9-bb91-efa95028f16c + }; static INT_PTR ShowGuideFile(WPARAM wParam,LPARAM lParam) diff --git a/plugins/ZeroNotification/src/main.cpp b/plugins/ZeroNotification/src/main.cpp index 02866e38f0..eb07012ceb 100644 --- a/plugins/ZeroNotification/src/main.cpp +++ b/plugins/ZeroNotification/src/main.cpp @@ -46,7 +46,7 @@ PLUGININFOEX pluginInfoEx = { COPYRIGHT, "http://miranda-ng.org/", UNICODE_AWARE, - UID + { 0x47d489d3, 0x310d, 0x4ef6, { 0xbd, 0x5, 0x69, 0x9f, 0xff, 0xd5, 0xa4, 0xaa } } // {47D489D3-310D-4ef6-BD05-699FFFD5A4AA} }; extern "C" __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD mirandaVersion) diff --git a/plugins/ZeroNotification/src/version.h b/plugins/ZeroNotification/src/version.h index a334eec318..68f785f562 100644 --- a/plugins/ZeroNotification/src/version.h +++ b/plugins/ZeroNotification/src/version.h @@ -8,6 +8,5 @@ #define DESCRIPTION "Adds options to automatically disable notifications when a protocol is in a certain status." #define AUTHOR "bidyut (<0.0.0.5), Maat" #define COPYRIGHT "© 2005 bidyut, © 2009 Maat" - // {47D489D3-310D-4ef6-BD05-699FFFD5A4AA} #define UID { 0x47d489d3, 0x310d, 0x4ef6, { 0xbd, 0x5, 0x69, 0x9f, 0xff, 0xd5, 0xa4, 0xaa } } diff --git a/plugins/mTextControl/src/main.cpp b/plugins/mTextControl/src/main.cpp index 6d4cfec7e1..ce41c4bf61 100644 --- a/plugins/mTextControl/src/main.cpp +++ b/plugins/mTextControl/src/main.cpp @@ -38,7 +38,8 @@ PLUGININFOEX pluginInfoEx = MTEXT_COPYRIGHT, MTEXT_WEBPAGE, UNICODE_AWARE, - MTEXT_UUID + {0x69b9443b, 0xdc58, 0x4876, { 0xad, 0x39, 0xe3, 0xf4, 0x18, 0xa1, 0x33, 0xc5 } } //{69B9443B-DC58-4876-AD39-E3F418A133C5} + }; extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) diff --git a/plugins/mTextControl/src/version.h b/plugins/mTextControl/src/version.h index 26b0010050..8f433dde0b 100644 --- a/plugins/mTextControl/src/version.h +++ b/plugins/mTextControl/src/version.h @@ -53,5 +53,4 @@ Last change by : $Author$ #define MTEXT_EMAIL "" #define MTEXT_COPYRIGHT "©2005-2006 Victor Pavlychko, ©2010 Merlin_de" #define MTEXT_WEBPAGE "http://miranda-ng.org/" - #define MTEXT_UUID {0x69b9443b, 0xdc58, 0x4876, { 0xad, 0x39, 0xe3, 0xf4, 0x18, 0xa1, 0x33, 0xc5 } } - //{69B9443B-DC58-4876-AD39-E3F418A133C5} + diff --git a/protocols/GTalkExt/src/GTalkExt.cpp b/protocols/GTalkExt/src/GTalkExt.cpp index 7b37e43eb3..e40df25053 100644 --- a/protocols/GTalkExt/src/GTalkExt.cpp +++ b/protocols/GTalkExt/src/GTalkExt.cpp @@ -31,7 +31,6 @@ int hLangpack; -#define MIID_PLUGINIFACE {0x08B86253, 0xEC6E, 0x4d09, { 0xB7, 0xA9, 0x64, 0xAC, 0xDF, 0x06, 0x27, 0xB8 }} PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), @@ -43,7 +42,7 @@ PLUGININFOEX pluginInfo={ COPYRIGHT_STRING, "http://miranda-ng.org/", UNICODE_AWARE, //doesn't replace anything built-in - MIID_PLUGINIFACE //{08B86253-EC6E-4d09-B7A9-64ACDF0627B8} + {0x08B86253, 0xEC6E, 0x4d09, { 0xB7, 0xA9, 0x64, 0xAC, 0xDF, 0x06, 0x27, 0xB8 }} //{08B86253-EC6E-4d09-B7A9-64ACDF0627B8} }; extern DWORD g_mirandaVersion; diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index e4f4000c1f..29c35c6d69 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -137,9 +137,8 @@ PLUGININFOEX pluginInfoEx={ "dufte@justmail.de", "(c) 2012 Xfirelib by Herbert Poul, Xfire Miranda protocol plugin by dufte", "http://miranda-ng.org", - 0, - // {9B8E1735-970D-4ce0-930C-A561956BDCA2} - { 0x9b8e1735, 0x970d, 0x4ce0, { 0x93, 0xc, 0xa5, 0x61, 0x95, 0x6b, 0xdc, 0xa2 } } + UNICODE_AWARE, + { 0x9b8e1735, 0x970d, 0x4ce0, { 0x93, 0xc, 0xa5, 0x61, 0x95, 0x6b, 0xdc, 0xa2 } } // {9B8E1735-970D-4ce0-930C-A561956BDCA2} }; static IconItem icon = { LPGEN("Protocol icon"), "XFIRE_main", IDI_TM }; -- cgit v1.2.3