- muuids cosmetic fixes (patch from Basil)

git-svn-id: http://svn.miranda-ng.org/main/trunk@3321 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

9 files changed, 11 insertions, 23 deletions

diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp
index 64bfbe4356..cb79c9739f 100644
--- a/plugins/DbEditorPP/src/main.cpp
+++ b/plugins/DbEditorPP/src/main.cpp
@@ -1,7 +1,6 @@
 #include "headers.h"

 

-// {A8A417EF-07AA-4f37-869F-7BFD74886534}

-#define MIID_DBEDITOR {0xa8a417ef, 0x7aa, 0x4f37, { 0x86, 0x9f, 0x7b, 0xfd, 0x74, 0x88, 0x65, 0x34}}

+

 

 

 HINSTANCE hInst = NULL;

@@ -31,7 +30,7 @@ PLUGININFOEX pluginInfoEx={
 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	MIID_DBEDITOR

+	{0xa8a417ef, 0x7aa, 0x4f37, { 0x86, 0x9f, 0x7b, 0xfd, 0x74, 0x88, 0x65, 0x34}} // {A8A417EF-07AA-4f37-869F-7BFD74886534}

 };

 

 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

diff --git a/plugins/Dbx_tree/src/init.cpp b/plugins/Dbx_tree/src/init.cpp
index 348c678249..7f92bc7623 100644
--- a/plugins/Dbx_tree/src/init.cpp
+++ b/plugins/Dbx_tree/src/init.cpp
@@ -27,9 +27,7 @@ HINSTANCE  hInstance = NULL;
 int hLangpack;

 

 static const DWORD gMinMirVer = 0x00080000;

-// {28F45248-8C9C-4bee-9307-7BCF3E12BF99}

-static const MUUID gGUID =

-{ 0x28f45248, 0x8c9c, 0x4bee, { 0x93, 0x07, 0x7b, 0xcf, 0x3e, 0x12, 0xbf, 0x99 } };

+

 

 static PLUGININFOEX gPluginInfoEx = {

 	sizeof(PLUGININFOEX),

@@ -41,7 +39,7 @@ static PLUGININFOEX gPluginInfoEx = {
 	gCopyright,

 	"http://miranda-ng.org/",

 	UNICODE_AWARE,

-	gGUID

+	{ 0x28f45248, 0x8c9c, 0x4bee, { 0x93, 0x07, 0x7b, 0xcf, 0x3e, 0x12, 0xbf, 0x99 } } // {28F45248-8C9C-4bee-9307-7BCF3E12BF99}

 };

 

 extern "C" __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD MirandaVersion)

diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp
index 67116d8f83..20e55b2e83 100644
--- a/plugins/FloatingContacts/src/main.cpp
+++ b/plugins/FloatingContacts/src/main.cpp
@@ -143,8 +143,7 @@ static void InitOptions() {
 	fcOpt.bShowIdle				 =  TRUE;

 }

 

-// {53C715A8-EB01-4136-A73C-441868610074}

-#define MIID_FLTCONT  { 0x53c715a8, 0xeb01, 0x4136, { 0xa7, 0x3c, 0x44, 0x18, 0x68, 0x61, 0x0, 0x74 } }

+

 

 PLUGININFOEX pluginInfoEx  = {

 	sizeof(PLUGININFOEX),

@@ -156,7 +155,7 @@ PLUGININFOEX pluginInfoEx  = {
 		__COPYRIGHT,

 		__AUTHORWEB,

 		UNICODE_AWARE,

-		MIID_FLTCONT

+		{ 0x53c715a8, 0xeb01, 0x4136, { 0xa7, 0x3c, 0x44, 0x18, 0x68, 0x61, 0x0, 0x74 } } // {53C715A8-EB01-4136-A73C-441868610074}

 };

 

 _inline unsigned int MakeVer(int a, int b, int c, int d)

diff --git a/plugins/HistorySweeperLight/src/historysweeperlight.h b/plugins/HistorySweeperLight/src/historysweeperlight.h
index c7fbeaeb25..a1b67c464e 100644
--- a/plugins/HistorySweeperLight/src/historysweeperlight.h
+++ b/plugins/HistorySweeperLight/src/historysweeperlight.h
@@ -47,10 +47,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // Plugin name

 #define ModuleName "History Sweeper Light"

 

-// Plugin UUID for New plugin loader

-// req. 0.7.18+ core

-// {1D9BF74A-44A8-4b3f-A6E5-73069D3A8979}

-#define MIID_HISTORYSWEEPERLIGHT { 0x1d9bf74a, 0x44a8, 0x4b3f, { 0xa6, 0xe5, 0x73, 0x6, 0x9d, 0x3a, 0x89, 0x79 } }

 

 // main.c

 extern HINSTANCE hInst;

diff --git a/plugins/HistorySweeperLight/src/main.cpp b/plugins/HistorySweeperLight/src/main.cpp
index 64fcc8a4f3..59ee86b329 100644
--- a/plugins/HistorySweeperLight/src/main.cpp
+++ b/plugins/HistorySweeperLight/src/main.cpp
@@ -39,7 +39,7 @@ static PLUGININFOEX pluginInfoEx =
 	"© 2002-2003 Sergey V. Gershovich a.k.a. Jazzy$, 2006-2009 Boris Krasnovskiy, 2010, 2011 tico-tico",

 	"http://miranda-ng.org/",

 	UNICODE_AWARE,

-	MIID_HISTORYSWEEPERLIGHT

+	{ 0x1d9bf74a, 0x44a8, 0x4b3f, { 0xa6, 0xe5, 0x73, 0x6, 0x9d, 0x3a, 0x89, 0x79 } } // {1D9BF74A-44A8-4b3f-A6E5-73069D3A8979}

 };

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp
index 144dfaf27a..3cafe2dd30 100644
--- a/plugins/KeyboardNotify/src/main.cpp
+++ b/plugins/KeyboardNotify/src/main.cpp
@@ -275,7 +275,6 @@ BOOL bReminderDisabled = FALSE;
 char *szMetaProto = NULL;

 BYTE bMetaProtoEnabled = 0;

 

-#define MIID_KBDNOTIFY	{0x119d7288, 0x2050, 0x448d, { 0x99, 0x00, 0xd8, 0x6a, 0xc7, 0x04, 0x26, 0xbf }}

 

 PLUGININFOEX pluginInfo={

 	sizeof(PLUGININFOEX),

@@ -287,7 +286,7 @@ PLUGININFOEX pluginInfo={
 	"© 2002-2003 M.Öberg, 2004 Std, 2005-2008 TioDuke",

 	"http://miranda-ng.org/",

 	UNICODE_AWARE,		//doesn't replace anything built-in

-	MIID_KBDNOTIFY //{119D7288-2050-448d-9900-D86AC70426BF}

+	{0x119d7288, 0x2050, 0x448d, { 0x99, 0x00, 0xd8, 0x6a, 0xc7, 0x04, 0x26, 0xbf }} //{119D7288-2050-448d-9900-D86AC70426BF}

 };

 

 

diff --git a/plugins/MirOTR/MirOTR/src/dllmain.cpp b/plugins/MirOTR/MirOTR/src/dllmain.cpp
index ebba7331d7..ebee2b09b2 100644
--- a/plugins/MirOTR/MirOTR/src/dllmain.cpp
+++ b/plugins/MirOTR/MirOTR/src/dllmain.cpp
@@ -22,7 +22,7 @@ PLUGININFOEX pluginInfo={
 	LEGAL_COPYRIGHT_LONG,

 	HOMEPAGE,

 	UNICODE_AWARE,

-	MIID_OTRPLUGIN		// ANSI and Unicode have different IDs

+	{ 0x12d8faad, 0x78ab, 0x4e3c, { 0x98, 0x54, 0x32, 0xe, 0x9e, 0xa5, 0xcc, 0x9f } }	// {12D8FAAD-78AB-4e3c-9854-320E9EA5CC9F}

 };

 

 BOOL APIENTRY DllMain( HMODULE hModule,

diff --git a/plugins/MirOTR/MirOTR/src/stdafx.h b/plugins/MirOTR/MirOTR/src/stdafx.h
index ec471e83bd..ca30afadf0 100644
--- a/plugins/MirOTR/MirOTR/src/stdafx.h
+++ b/plugins/MirOTR/MirOTR/src/stdafx.h
@@ -74,8 +74,7 @@ extern "C" {
 // modified manual policy - so that users set to 'opportunistic' will automatically start OTR with users set to 'manual'

 #define OTRL_POLICY_MANUAL_MOD		(OTRL_POLICY_MANUAL | OTRL_POLICY_WHITESPACE_START_AKE | OTRL_POLICY_ERROR_START_AKE)

 

-// {12D8FAAD-78AB-4e3c-9854-320E9EA5CC9F}

-static const MUUID MIID_OTRPLUGIN = { 0x12d8faad, 0x78ab, 0x4e3c, { 0x98, 0x54, 0x32, 0xe, 0x9e, 0xa5, 0xcc, 0x9f } };

+

 

 #define MODULENAME "MirOTR"

 

diff --git a/plugins/Variables/src/main.cpp b/plugins/Variables/src/main.cpp
index 4ce441b1fe..e3abe97e8b 100644
--- a/plugins/Variables/src/main.cpp
+++ b/plugins/Variables/src/main.cpp
@@ -24,8 +24,6 @@ HINSTANCE hInst;
 DWORD g_mirandaVersion;

 int hLangpack = 0;

 

-// {59B0036E-5403-422e-883B-C9AAF425682B}

-#define MIID_VARIABLES { 0x59b0036e, 0x5403, 0x422e, { 0x88, 0x3b, 0xc9, 0xaa, 0xf4, 0x25, 0x68, 0x2b } }

 

 static HANDLE hExitHook, hModulesLoadedHook;

 

@@ -65,7 +63,7 @@ PLUGININFOEX pluginInfoEx = {
 	"© 2003-2008 P. Boon, Ricardo Pescuma, George Hazan",

 	"http://miranda-ng.org/",

 	UNICODE_AWARE,

-	MIID_VARIABLES

+	{ 0x59b0036e, 0x5403, 0x422e, { 0x88, 0x3b, 0xc9, 0xaa, 0xf4, 0x25, 0x68, 0x2b } } // {59B0036E-5403-422e-883B-C9AAF425682B}

 };

 

 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)