more warning fixes

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

4 files changed, 16 insertions, 18 deletions

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index 7a6ce50aae..66e0e89785 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -42,13 +42,13 @@ PLUGININFOEX pluginInfo = {
 	{0xb68a8906, 0x748b, 0x435d, {0x93, 0xe, 0x21, 0xcc, 0x6e, 0x8f, 0x3b, 0x3f}}

 };

 

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

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

 {

 	g_hInstance = hinstDLL;

 	return TRUE;

 }

 

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

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

 {

 	return &pluginInfo;

 }

@@ -82,7 +82,7 @@ static VOID NTAPI ShowContactMenu(ULONG_PTR wParam)
 }

 

 

-void Popup_DoAction(HWND hWnd, BYTE Action, PLUGIN_DATA *pdata)

+void Popup_DoAction(HWND hWnd, BYTE Action, PLUGIN_DATA*)

 {

 	MCONTACT hContact = (MCONTACT)CallService(MS_POPUP_GETCONTACT, (WPARAM)hWnd, 0);

 	switch (Action) {

@@ -266,13 +266,13 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR srvTogglePopups(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvTogglePopups(WPARAM, LPARAM)

 {

 	g_PopupOptPage.SetDBValueCopy(IDC_POPUPOPTDLG_POPUPNOTIFY, !g_PopupOptPage.GetDBValueCopy(IDC_POPUPOPTDLG_POPUPNOTIFY));

 	return 0;

 }

 

-static int PrebuildMainMenu(WPARAM wParam, LPARAM lParam)

+static int PrebuildMainMenu(WPARAM, LPARAM)

 {

 	// we have to use ME_CLIST_PREBUILDMAINMENU instead of updating menu items only on settings change, because "popup_enabled" and "popup_disabled" icons are not always available yet in ModulesLoaded

 	if (bPopupExists) {

@@ -284,7 +284,7 @@ static int PrebuildMainMenu(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-INT_PTR CALLBACK CCNErrorDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK CCNErrorDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM)

 {

 	switch (uMsg) {

 	case WM_INITDIALOG:

@@ -304,7 +304,7 @@ INT_PTR CALLBACK CCNErrorDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 	return 0;

 }

 

-static int ModuleLoad(WPARAM wParam, LPARAM lParam)

+static int ModuleLoad(WPARAM, LPARAM)

 {

 	bPopupExists = ServiceExists(MS_POPUP_ADDPOPUPT);

 	bFingerprintExists = ServiceExists(MS_FP_SAMECLIENTST) && ServiceExists(MS_FP_GETCLIENTICONT);

@@ -312,7 +312,7 @@ static int ModuleLoad(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-int MirandaLoaded(WPARAM wParam, LPARAM lParam)

+int MirandaLoaded(WPARAM, LPARAM)

 {

 	ModuleLoad(0, 0);

 	COptPage PopupOptPage(g_PopupOptPage);

diff --git a/plugins/ClientChangeNotify/src/CommonLibs/Options.cpp b/plugins/ClientChangeNotify/src/CommonLibs/Options.cpp
index 1d703be59e..f83c9265b3 100644
--- a/plugins/ClientChangeNotify/src/CommonLibs/Options.cpp
+++ b/plugins/ClientChangeNotify/src/CommonLibs/Options.cpp
@@ -147,7 +147,7 @@ COptPage& COptPage::operator = (const COptPage& Page)
 }

 

 

-int COptItem::GetIntDBVal(CString &sModule, int bSigned, CString *sDBSettingPrefix)

+int COptItem::GetIntDBVal(CString &sModule, int bSigned, CString*)

 { // default procedure for reading value from DB; used only for integral types

 	if (sDBSetting != NULL)

 	{

@@ -161,7 +161,7 @@ int COptItem::GetIntDBVal(CString &sModule, int bSigned, CString *sDBSettingPref
 	return GetDefValue();

 }

 

-void COptItem::SetIntDBVal(CString &sModule, int Value, CString *sDBSettingPrefix)

+void COptItem::SetIntDBVal(CString &sModule, int Value, CString*)

 { // default procedure for writing value to the DB; used only for integral types

 	if (sDBSetting != NULL && !ReadOnly)

 	{

diff --git a/plugins/ClientChangeNotify/src/CommonLibs/Options.h b/plugins/ClientChangeNotify/src/CommonLibs/Options.h
index 07ed3dca28..5d429b8a8a 100644
--- a/plugins/ClientChangeNotify/src/CommonLibs/Options.h
+++ b/plugins/ClientChangeNotify/src/CommonLibs/Options.h
@@ -33,20 +33,18 @@ public:
 	COptItem() {}

 	COptItem(int DlgItemID, char *szDBSetting, int nValueSize, int lParam = 0, bool ReadOnly = false):

 		DlgItemID(DlgItemID), nValueSize(nValueSize), sDBSetting(szDBSetting), lParam(lParam), Enabled(true), ReadOnly(ReadOnly), Modified(false) {}

-/*	COptItem(const COptItem &Item): DlgItemID(Item.DlgItemID), nValueSize(Item.nValueSize),

-		sDBSetting(Item.szDBSetting), lParam(Item.lParam), Enabled(Item.Enabled) {};*/

 	virtual ~COptItem() {}

 

-	virtual void DBToMem(CString &sModule, CString *sDBSettingPrefix = NULL) {Modified = false;}

-	virtual void MemToDB(CString &sModule, CString *sDBSettingPrefix = NULL) {Modified = false;}

-	virtual void WndToMem(HWND hWnd) {}

+	virtual void DBToMem(CString&, CString* = NULL) { Modified = false; }

+	virtual void MemToDB(CString&, CString* = NULL) { Modified = false; }

+	virtual void WndToMem(HWND) {}

 	virtual void MemToWnd(HWND hWnd) {EnableWindow(GetDlgItem(hWnd, DlgItemID), Enabled);}

 	void DBToMemToWnd(CString &sModule, HWND hWnd, CString *sDBSettingPrefix = NULL) {DBToMem(sModule, sDBSettingPrefix); MemToWnd(hWnd);}

 	void WndToMemToDB(HWND hWnd, CString &sModule, CString *sDBSettingPrefix = NULL) {WndToMem(hWnd); MemToDB(sModule, sDBSettingPrefix);}

 	virtual void CleanDBSettings(CString &sModule, CString *sDBSettingPrefix = NULL) {db_unset(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting);}; // TODO: also set Value to DefValue?

 

-	virtual void SetValue(int Value) {Modified = true;}

-	virtual void SetDefValue(int DefValue) {}

+	virtual void SetValue(int) {Modified = true;}

+	virtual void SetDefValue(int) {}

 	virtual int GetValue() {return 0;}

 	virtual int GetDefValue() {return 0;}

 	int GetDBValue(CString &sModule, CString *sDBSettingPrefix = NULL) {DBToMem(sModule, sDBSettingPrefix); return GetValue();}

diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp
index 1d08a2851d..6d9d4f5e8f 100644
--- a/plugins/ClientChangeNotify/src/OptDlg.cpp
+++ b/plugins/ClientChangeNotify/src/OptDlg.cpp
@@ -166,7 +166,7 @@ INT_PTR CALLBACK PopupOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 	return 0;

 }

 

-int OptionsDlgInit(WPARAM wParam, LPARAM lParam)

+int OptionsDlgInit(WPARAM wParam, LPARAM)

 {

 	if (bPopupExists) {

 		OPTIONSDIALOGPAGE optDi = { sizeof(optDi) };