From a15cd68f0412e1b211e746a2e4d5682e96f5a113 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Aug 2015 13:52:01 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14911 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WebView/src/main.cpp | 4 ++-- plugins/WebView/src/webview.cpp | 27 +++++++++++++-------------- plugins/WebView/src/webview_alerts.cpp | 2 +- plugins/WebView/src/webview_datawnd.cpp | 4 ++-- plugins/WebView/src/webview_opts.cpp | 2 +- plugins/WebView/src/webview_services.cpp | 16 ++++++++-------- 6 files changed, 27 insertions(+), 28 deletions(-) (limited to 'plugins/WebView') diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp index cb46486ffe..e0174d74a7 100644 --- a/plugins/WebView/src/main.cpp +++ b/plugins/WebView/src/main.cpp @@ -76,7 +76,7 @@ void ChangeContactStatus(int con_stat) } /*****************************************************************************/ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; @@ -85,7 +85,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /*****************************************************************************/ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfoEx; } diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp index 333e501c32..6eba2c8d56 100644 --- a/plugins/WebView/src/webview.cpp +++ b/plugins/WebView/src/webview.cpp @@ -70,7 +70,7 @@ void ChangeMenuItemCountdown() } /*****************************************************************************/ -static int CALLBACK EnumFontsProc(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *lpntme, int FontType, LPARAM lParam) +static int CALLBACK EnumFontsProc(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX*, int, LPARAM lParam) { if (!IsWindow((HWND) lParam)) return FALSE; @@ -113,7 +113,7 @@ void BGclrLoop() } /*****************************************************************************/ -void StartUpdate(void *dummy) +void StartUpdate(void*) { StartUpDelay = 1; Sleep(((db_get_dw(NULL, MODULENAME, START_DELAY_KEY, 0)) * SECOND)); @@ -125,7 +125,7 @@ void StartUpdate(void *dummy) } /*****************************************************************************/ -void ContactLoop(void *dummy) +void ContactLoop(void*) { if (StartUpDelay == 0) { for (MCONTACT hContact = db_find_first(MODULENAME); hContact != NULL; hContact = db_find_next(hContact, MODULENAME)) { @@ -138,7 +138,7 @@ void ContactLoop(void *dummy) } /*****************************************************************************/ -INT_PTR MarkAllReadMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR MarkAllReadMenuCommand(WPARAM, LPARAM) { ChangeContactStatus(1); return 0; @@ -164,7 +164,7 @@ void InitialiseGlobals(void) } /*****************************************************************************/ -int Doubleclick(WPARAM wParam, LPARAM lParam) +int Doubleclick(WPARAM wParam, LPARAM) { MCONTACT hContact = wParam; char *szProto = GetContactProto(hContact); @@ -222,7 +222,6 @@ int SendToRichEdit(HWND hWindow, char *truncated, COLORREF rgbText, COLORREF rgb DWORD italic = 0; DWORD underline = 0; - int len = GetWindowTextLength(GetDlgItem(hWindow, IDC_DATA)); SetDlgItemText(hWindow, IDC_DATA, _T("")); CHARFORMAT2 cfFM; @@ -291,7 +290,7 @@ void CALLBACK Countdownfunc(HWND, UINT, UINT_PTR, DWORD) /*****************************************************************************/ -static int OptInitialise(WPARAM wParam, LPARAM lParam) +static int OptInitialise(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; @@ -359,7 +358,7 @@ int ModulesLoaded(WPARAM, LPARAM) } /*****************************************************************************/ -INT_PTR DataWndMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR DataWndMenuCommand(WPARAM wParam, LPARAM) { MCONTACT hContact = wParam; HWND hwndDlg = WindowList_Find(hWindowList, hContact); @@ -395,14 +394,14 @@ INT_PTR DataWndMenuCommand(WPARAM wParam, LPARAM lParam) } /*****************************************************************************/ -INT_PTR UpdateAllMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR UpdateAllMenuCommand(WPARAM, LPARAM) { mir_forkthread(ContactLoop, NULL); return 0; } /*****************************************************************************/ -INT_PTR AutoUpdateMCmd(WPARAM wParam, LPARAM lParam) +INT_PTR AutoUpdateMCmd(WPARAM, LPARAM) { if (db_get_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 0)) db_set_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 0); @@ -422,7 +421,7 @@ INT_PTR AddContactMenuCommand(WPARAM, LPARAM) } /*****************************************************************************/ -int OnTopMenuCommand(WPARAM wParam, LPARAM lParam, MCONTACT singlecontact) +int OnTopMenuCommand(WPARAM, LPARAM, MCONTACT singlecontact) { int ontop = 0; int done = 0; @@ -443,7 +442,7 @@ int OnTopMenuCommand(WPARAM wParam, LPARAM lParam, MCONTACT singlecontact) } /*****************************************************************************/ -INT_PTR WebsiteMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR WebsiteMenuCommand(WPARAM wParam, LPARAM) { MCONTACT hContact = wParam; ptrT url(db_get_tsa(hContact, MODULENAME, "URL")); @@ -455,7 +454,7 @@ INT_PTR WebsiteMenuCommand(WPARAM wParam, LPARAM lParam) } /*****************************************************************************/ -int UpdateMenuCommand(WPARAM wParam, LPARAM lParam, MCONTACT singlecontact) +int UpdateMenuCommand(WPARAM, LPARAM, MCONTACT singlecontact) { mir_forkthread(GetData, (void*)singlecontact); return 0; @@ -499,7 +498,7 @@ INT_PTR CntAlertMenuCommand(WPARAM wParam, LPARAM) } /*****************************************************************************/ -INT_PTR CountdownMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR CountdownMenuCommand(WPARAM, LPARAM) { return 0; } diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp index 4d5cee7b71..20f5e3476a 100644 --- a/plugins/WebView/src/webview_alerts.cpp +++ b/plugins/WebView/src/webview_alerts.cpp @@ -765,7 +765,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn } /*****************************************************************************/ -int DataWndAlertCommand(WPARAM wParam, LPARAM lParam) +int DataWndAlertCommand(WPARAM wParam, LPARAM) { MCONTACT hContact = wParam; if ( WindowList_Find(hWindowList, hContact)) diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp index 09bcbd867d..78c8a99581 100644 --- a/plugins/WebView/src/webview_datawnd.cpp +++ b/plugins/WebView/src/webview_datawnd.cpp @@ -462,7 +462,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA /*****************************************************************************/ -int DataDialogResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL * urc) +int DataDialogResize(HWND, LPARAM, UTILRESIZECONTROL *urc) { switch (urc->wId) { case IDC_OPEN_URL: @@ -497,7 +497,7 @@ void SavewinSettings(void) } /*****************************************************************************/ -void ValidatePosition(HWND hwndDlg) +void ValidatePosition(HWND) { RECT r; SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0); diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp index 68626d4cb1..bc5bab421e 100644 --- a/plugins/WebView/src/webview_opts.cpp +++ b/plugins/WebView/src/webview_opts.cpp @@ -86,7 +86,7 @@ TCHAR* FixButtonText(TCHAR *url, size_t len) } /*****************************************************************************/ -static int CALLBACK EnumFontScriptsProc(ENUMLOGFONTEX * lpelfe, NEWTEXTMETRICEX * lpntme, int FontType, LPARAM lParam) +static int CALLBACK EnumFontScriptsProc(ENUMLOGFONTEX * lpelfe, NEWTEXTMETRICEX*, int, LPARAM lParam) { if (SendMessage((HWND) lParam, CB_FINDSTRINGEXACT, -1, (LPARAM) lpelfe->elfScript) == CB_ERR) { diff --git a/plugins/WebView/src/webview_services.cpp b/plugins/WebView/src/webview_services.cpp index 3bafe7c9b7..d47a621713 100644 --- a/plugins/WebView/src/webview_services.cpp +++ b/plugins/WebView/src/webview_services.cpp @@ -109,7 +109,7 @@ int DBSettingChanged(WPARAM wParam, LPARAM lParam) } /*****************************************************************************/ -int SiteDeleted(WPARAM wParam, LPARAM lParam) +int SiteDeleted(WPARAM wParam, LPARAM) { MCONTACT hContact = wParam; if (mir_strcmp(GetContactProto(hContact), MODULENAME)) @@ -159,7 +159,7 @@ INT_PTR OpenCacheDir(WPARAM, LPARAM) } /*****************************************************************************/ -INT_PTR PingWebsiteMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR PingWebsiteMenuCommand(WPARAM wParam, LPARAM) { FILE *pfile = fopen("psite.bat", "r"); if (pfile == NULL) { @@ -233,7 +233,7 @@ INT_PTR GetName(WPARAM wParam, LPARAM lParam) // SetStatus // ======================================================= -INT_PTR SetStatus(WPARAM wParam, LPARAM lParam) +INT_PTR SetStatus(WPARAM wParam, LPARAM) { int oldStatus = bpStatus; @@ -265,7 +265,7 @@ INT_PTR SetStatus(WPARAM wParam, LPARAM lParam) // GetStatus // ======================================================= -INT_PTR GetStatus(WPARAM wParam, LPARAM lParam) +INT_PTR GetStatus(WPARAM, LPARAM) { if (bpStatus == ID_STATUS_ONLINE) return ID_STATUS_ONLINE; @@ -284,7 +284,7 @@ INT_PTR GetStatus(WPARAM wParam, LPARAM lParam) // BPLoadIcon // ======================================================= -INT_PTR BPLoadIcon(WPARAM wParam, LPARAM lParam) +INT_PTR BPLoadIcon(WPARAM wParam, LPARAM) { UINT id; @@ -314,7 +314,7 @@ static void __cdecl BasicSearchTimerProc(void *pszNick) searchId = -1; } -INT_PTR BasicSearch(WPARAM wParam, LPARAM lParam) +INT_PTR BasicSearch(WPARAM, LPARAM lParam) { static TCHAR buf[300]; @@ -333,7 +333,7 @@ INT_PTR BasicSearch(WPARAM wParam, LPARAM lParam) } /*****************************************************************************/ -INT_PTR AddToList(WPARAM wParam, LPARAM lParam) +INT_PTR AddToList(WPARAM, LPARAM lParam) { PROTOSEARCHRESULT *psr = (PROTOSEARCHRESULT *) lParam; DBVARIANT dbv; @@ -460,7 +460,7 @@ INT_PTR GetInfo(WPARAM, LPARAM) } /*****************************************************************************/ -void AckFunc(void *dummy) +void AckFunc(void*) { for (MCONTACT hContact = db_find_first(MODULENAME); hContact != NULL; hContact = db_find_next(hContact, MODULENAME)) ProtoBroadcastAck(MODULENAME, hContact, ACKTYPE_GETINFO, ACKRESULT_SUCCESS, (HANDLE)1, 0); -- cgit v1.2.3