defines moved to header, warnings fixes

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

2 files changed, 20 insertions, 21 deletions

diff --git a/plugins/RemovePersonalSettings/src/rps.cpp b/plugins/RemovePersonalSettings/src/rps.cpp
index 0ba20663f7..b24b089bb1 100644
--- a/plugins/RemovePersonalSettings/src/rps.cpp
+++ b/plugins/RemovePersonalSettings/src/rps.cpp
@@ -28,22 +28,6 @@ Based on work by nullbie
 

 #include "stdafx.h"

 

-#define MIID_REMOVEPERSONALSETTINGS { 0x5eaec989, 0x8ff, 0x4820, { 0xb8, 0x6c, 0x2b, 0x6e, 0xf0, 0x8e, 0x33, 0x73 } }

-

-#define INI_FILE_NAME  "RemovePersonalSettings.ini"

-

-#define PLUGINDISABLELIST "PluginDisable"

-

-#define METACONTACTS_PROTOCOL_NAME "MetaContacts"

-

-#define NOTICE_TEXT LPGEN("All your personal settings will be erased!\n\

-Make sure you are running this from a copy of your profile (and not over the original one).\n\

-Running this will erase files/folders under Miranda main folder.\n\n\

-Are you sure you want to remove all your personal settings?\n\n\

-(You cannot say that I don't told you about the risks :P)")

-

-#define MSGBOX_TITLE LPGEN("Remove Personal Settings")

-

 HINSTANCE hInst;

 char gIniFile[MAX_PATH];

 char gMirandaDir[MAX_PATH];

@@ -87,14 +71,14 @@ BOOL isMetaContact(MCONTACT hContact);
 

 

 

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

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD ,LPVOID )

 {

 	hInst=hinstDLL;

 	return TRUE;

 }

 

 

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

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

 {

 	return &pluginInfo;

 }

@@ -156,7 +140,7 @@ extern "C" int __declspec(dllexport) Unload(void)
 }

 

 

-INT_PTR RemoveAllService(WPARAM wParam,LPARAM lParam)

+INT_PTR RemoveAllService(WPARAM, LPARAM)

 {

 	if (gIniFile[0] == '\0') {

 		MessageBox(NULL, TranslateT("Configuration file could not be found!"), TranslateT(MSGBOX_TITLE), MB_OK | MB_ICONERROR);

@@ -226,7 +210,6 @@ void RemoveUsers()
 		MEVENT hDbEvent = db_event_first(0);

 

 		while(hDbEvent != NULL) {

-			int ret = db_event_delete(0, hDbEvent);

 			hDbEvent = db_event_first(0);

 		}

 

@@ -627,7 +610,7 @@ int EnumProc(const char *szName, LPARAM lParam)
 	return 0;

 }

 

-int ModuleEnumProc(const char *szName, DWORD ofsModuleName, LPARAM lParam)

+int ModuleEnumProc(const char *szName, DWORD, LPARAM lParam)

 {

 	return EnumProc(szName, lParam);

 }

diff --git a/plugins/RemovePersonalSettings/src/stdafx.h b/plugins/RemovePersonalSettings/src/stdafx.h
index 0756e17fc5..ed36365f1d 100644
--- a/plugins/RemovePersonalSettings/src/stdafx.h
+++ b/plugins/RemovePersonalSettings/src/stdafx.h
@@ -30,3 +30,19 @@
 #include <m_database.h>

 

 #include "version.h"

+

+#define MIID_REMOVEPERSONALSETTINGS { 0x5eaec989, 0x8ff, 0x4820, { 0xb8, 0x6c, 0x2b, 0x6e, 0xf0, 0x8e, 0x33, 0x73 } }

+

+#define INI_FILE_NAME  "RemovePersonalSettings.ini"

+

+#define PLUGINDISABLELIST "PluginDisable"

+

+#define METACONTACTS_PROTOCOL_NAME "MetaContacts"

+

+#define NOTICE_TEXT LPGEN("All your personal settings will be erased!\n\

+Make sure you are running this from a copy of your profile (and not over the original one).\n\

+Running this will erase files/folders under Miranda main folder.\n\n\

+Are you sure you want to remove all your personal settings?\n\n\

+(You cannot say that I don't told you about the risks :P)")

+

+#define MSGBOX_TITLE LPGEN("Remove Personal Settings")