From 4b7e30d64fef3ce4809e3cb16bfa04a3c2269f0f Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Mon, 14 Dec 2015 22:53:36 +0000 Subject: ICQCorp: -minor cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@15864 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/ICQCorp/src/corp.cpp | 4 +-- protocols/ICQCorp/src/event.cpp | 4 +-- protocols/ICQCorp/src/options.cpp | 11 ++++----- protocols/ICQCorp/src/protocol.cpp | 4 +-- protocols/ICQCorp/src/services.cpp | 50 +++++++++++++++++++------------------- protocols/ICQCorp/src/transfer.cpp | 4 +-- protocols/ICQCorp/src/user.cpp | 6 ++--- 7 files changed, 41 insertions(+), 42 deletions(-) (limited to 'protocols/ICQCorp/src') diff --git a/protocols/ICQCorp/src/corp.cpp b/protocols/ICQCorp/src/corp.cpp index e7652f349c..70dbea0cb8 100644 --- a/protocols/ICQCorp/src/corp.cpp +++ b/protocols/ICQCorp/src/corp.cpp @@ -40,7 +40,7 @@ PLUGININFOEX pluginInfo = /////////////////////////////////////////////////////////////////////////////// -BOOL APIENTRY DllMain(HINSTANCE hModule, DWORD reason, LPVOID lpReserved) +BOOL APIENTRY DllMain(HINSTANCE hModule, DWORD reason, LPVOID) { hInstance = hModule; if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls(hModule); @@ -80,7 +80,7 @@ extern "C" __declspec(dllexport) int Load() /////////////////////////////////////////////////////////////////////////////// -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD Version) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } diff --git a/protocols/ICQCorp/src/event.cpp b/protocols/ICQCorp/src/event.cpp index 69f2ac85db..44a0a2bf56 100644 --- a/protocols/ICQCorp/src/event.cpp +++ b/protocols/ICQCorp/src/event.cpp @@ -23,7 +23,7 @@ std::vector icqEvents; /////////////////////////////////////////////////////////////////////////////// -void WINAPI eventTimerProc(HWND hWnd, UINT Msg, UINT_PTR hTimer, DWORD Time) +static void WINAPI eventTimerProc(HWND, UINT, UINT_PTR hTimer, DWORD) { unsigned int i; @@ -73,7 +73,7 @@ bool ICQEvent::start() // send the packet if (!socket->sendPacket(*packet)) return false; - if (cmd != ICQ_CMDxTCP_START) hTimer = SetTimer(NULL, 0, MAX_WAIT_ACK, (TIMERPROC)eventTimerProc); + if (cmd != ICQ_CMDxTCP_START) hTimer = SetTimer(NULL, 0, MAX_WAIT_ACK, eventTimerProc); return true; } diff --git a/protocols/ICQCorp/src/options.cpp b/protocols/ICQCorp/src/options.cpp index a5d88b2b8b..cb0b7e31e0 100644 --- a/protocols/ICQCorp/src/options.cpp +++ b/protocols/ICQCorp/src/options.cpp @@ -21,7 +21,7 @@ /////////////////////////////////////////////////////////////////////////////// -static BOOL CALLBACK icqOptionsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK icqOptionsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { DBVARIANT dbv; char str[128]; @@ -69,18 +69,17 @@ static BOOL CALLBACK icqOptionsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA /////////////////////////////////////////////////////////////////////////////// -int icqOptionsInitialise(WPARAM wParam, LPARAM lParam) +int icqOptionsInitialise(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -800000000; - odp.pszTitle = Translate(protoName); - odp.pfnDlgProc = (DLGPROC)icqOptionsDlgProc; + odp.pszTitle = protoName; + odp.pfnDlgProc = icqOptionsDlgProc; odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT_ICQCORP); odp.hInstance = hInstance; - odp.pszGroup = Translate("Network"); + odp.pszGroup = LPGEN("Network"); odp.flags = ODPF_BOLDGROUPS; -// odp.nIDBottomSimpleControl = IDC_STICQGROUP; Options_AddPage(wParam, &odp); return 0; diff --git a/protocols/ICQCorp/src/protocol.cpp b/protocols/ICQCorp/src/protocol.cpp index 759d1e7ffc..2ff22d3a41 100644 --- a/protocols/ICQCorp/src/protocol.cpp +++ b/protocols/ICQCorp/src/protocol.cpp @@ -143,7 +143,7 @@ LRESULT WINAPI messageWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -void WINAPI pingTimerProc(HWND hWnd, UINT Msg, UINT_PTR hTimer, DWORD Time) +void WINAPI pingTimerProc(HWND, UINT, UINT_PTR, DWORD) { icq.ping(); } @@ -230,7 +230,7 @@ bool ICQ::logon(unsigned short logonStatus) udpSocket.openConnection(); } - if (pingTimer == NULL) pingTimer = SetTimer(NULL, 0, PING_FREQUENCY, (TIMERPROC)pingTimerProc); + if (pingTimer == NULL) pingTimer = SetTimer(NULL, 0, PING_FREQUENCY, pingTimerProc); updateContactList(); diff --git a/protocols/ICQCorp/src/services.cpp b/protocols/ICQCorp/src/services.cpp index 9cbea15a26..6d19332f6f 100644 --- a/protocols/ICQCorp/src/services.cpp +++ b/protocols/ICQCorp/src/services.cpp @@ -21,7 +21,7 @@ /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqGetCaps(WPARAM wParam, LPARAM lParam) +static INT_PTR icqGetCaps(WPARAM wParam, LPARAM) { switch (wParam) { case PFLAGNUM_1: @@ -52,7 +52,7 @@ static INT_PTR icqGetName(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqLoadIcon(WPARAM wParam, LPARAM lParam) +static INT_PTR icqLoadIcon(WPARAM wParam, LPARAM) { int id; @@ -65,7 +65,7 @@ static INT_PTR icqLoadIcon(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqSetStatus(WPARAM wParam, LPARAM lParam) +static INT_PTR icqSetStatus(WPARAM wParam, LPARAM) { unsigned short desiredStatus = (unsigned short)wParam; @@ -88,28 +88,28 @@ static INT_PTR icqSetStatus(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqGetStatus(WPARAM wParam, LPARAM lParam) +static INT_PTR icqGetStatus(WPARAM, LPARAM) { return icq.statusVal; } /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqAuthAllow(WPARAM wParam, LPARAM lParam) +static INT_PTR icqAuthAllow(WPARAM, LPARAM) { return 0; } /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqAuthDeny(WPARAM wParam, LPARAM lParam) +static INT_PTR icqAuthDeny(WPARAM, LPARAM) { return 0; } /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqBasicSearch(WPARAM wParam, LPARAM lParam) +static INT_PTR icqBasicSearch(WPARAM, LPARAM lParam) { T("[ ] basic search\n"); icq.startSearch(0, 0, (char*)lParam, 0); @@ -118,7 +118,7 @@ static INT_PTR icqBasicSearch(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqSearchByEmail(WPARAM wParam, LPARAM lParam) +static INT_PTR icqSearchByEmail(WPARAM, LPARAM lParam) { T("[ ] search by e-mail\n"); icq.startSearch(4, 0, (char*)lParam, 0); @@ -127,7 +127,7 @@ static INT_PTR icqSearchByEmail(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqSearchByName(WPARAM wParam, LPARAM lParam) +static INT_PTR icqSearchByName(WPARAM, LPARAM lParam) { PROTOSEARCHBYNAME *psbn = (PROTOSEARCHBYNAME*)lParam; @@ -150,7 +150,7 @@ static INT_PTR icqAddToList(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqGetInfo(WPARAM wParam, LPARAM lParam) +static INT_PTR icqGetInfo(WPARAM, LPARAM lParam) { CCSDATA *ccs = (CCSDATA *)lParam; ICQUser *u; @@ -166,7 +166,7 @@ static INT_PTR icqGetInfo(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqSendMessage(WPARAM wParam, LPARAM lParam) +static INT_PTR icqSendMessage(WPARAM, LPARAM lParam) { CCSDATA *ccs = (CCSDATA *)lParam; ICQUser *u; @@ -184,7 +184,7 @@ static INT_PTR icqSendMessage(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqRecvMessage(WPARAM wParam, LPARAM lParam) +static INT_PTR icqRecvMessage(WPARAM, LPARAM lParam) { DBEVENTINFO dbei; CCSDATA *ccs = (CCSDATA*)lParam; @@ -207,7 +207,7 @@ static INT_PTR icqRecvMessage(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqSendUrl(WPARAM wParam, LPARAM lParam) +static INT_PTR icqSendUrl(WPARAM, LPARAM lParam) { CCSDATA *ccs = (CCSDATA *)lParam; ICQUser *u; @@ -225,7 +225,7 @@ static INT_PTR icqSendUrl(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqRecvUrl(WPARAM wParam, LPARAM lParam) +static INT_PTR icqRecvUrl(WPARAM, LPARAM lParam) { DBEVENTINFO dbei; CCSDATA *ccs = (CCSDATA*)lParam; @@ -250,7 +250,7 @@ static INT_PTR icqRecvUrl(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqSetAwayMsg(WPARAM wParam, LPARAM lParam) +static INT_PTR icqSetAwayMsg(WPARAM, LPARAM lParam) { T("[ ] set away msg\n"); @@ -265,7 +265,7 @@ static INT_PTR icqSetAwayMsg(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqGetAwayMsg(WPARAM wParam, LPARAM lParam) +static INT_PTR icqGetAwayMsg(WPARAM, LPARAM lParam) { CCSDATA *ccs = (CCSDATA *)lParam; ICQUser *u; @@ -282,7 +282,7 @@ static INT_PTR icqGetAwayMsg(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqRecvAwayMsg(WPARAM wParam, LPARAM lParam) +static INT_PTR icqRecvAwayMsg(WPARAM, LPARAM lParam) { CCSDATA *ccs = (CCSDATA *)lParam; PROTORECVEVENT *pre = (PROTORECVEVENT *)ccs->lParam; @@ -295,7 +295,7 @@ static INT_PTR icqRecvAwayMsg(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqSendFile(WPARAM wParam, LPARAM lParam) +static INT_PTR icqSendFile(WPARAM, LPARAM lParam) { CCSDATA *ccs = (CCSDATA *)lParam; char **files = (char **)ccs->lParam; @@ -335,7 +335,7 @@ static INT_PTR icqSendFile(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqFileAllow(WPARAM wParam, LPARAM lParam) +static INT_PTR icqFileAllow(WPARAM, LPARAM lParam) { CCSDATA *ccs = (CCSDATA *)lParam; ICQTransfer *t = (ICQTransfer *)ccs->wParam; @@ -354,7 +354,7 @@ static INT_PTR icqFileAllow(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqFileDeny(WPARAM wParam, LPARAM lParam) +static INT_PTR icqFileDeny(WPARAM, LPARAM lParam) { CCSDATA *ccs = (CCSDATA *)lParam; ICQTransfer *t = (ICQTransfer *)ccs->wParam; @@ -381,7 +381,7 @@ static INT_PTR icqFileDeny(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqFileCancel(WPARAM wParam, LPARAM lParam) +static INT_PTR icqFileCancel(WPARAM, LPARAM lParam) { CCSDATA *ccs = (CCSDATA *)lParam; ICQTransfer *t = (ICQTransfer *)ccs->wParam; @@ -408,7 +408,7 @@ static INT_PTR icqFileCancel(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqRecvFile(WPARAM wParam, LPARAM lParam) +static INT_PTR icqRecvFile(WPARAM, LPARAM lParam) { DBEVENTINFO dbei; CCSDATA *ccs = (CCSDATA *)lParam; @@ -450,7 +450,7 @@ static INT_PTR icqFileResume(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static INT_PTR icqSetApparentMode(WPARAM wParam, LPARAM lParam) +static INT_PTR icqSetApparentMode(WPARAM, LPARAM) { /* CCSDATA *ccs = (CCSDATA *)lParam; @@ -478,7 +478,7 @@ static INT_PTR icqSetApparentMode(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static int icqContactDeleted(WPARAM wParam, LPARAM lParam) +static int icqContactDeleted(WPARAM wParam, LPARAM) { ICQUser *u; @@ -490,7 +490,7 @@ static int icqContactDeleted(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static int icqModulesLoaded(WPARAM wParam, LPARAM lParam) +static int icqModulesLoaded(WPARAM, LPARAM) { HookEvent(ME_USERINFO_INITIALISE, icqUserInfoInitialise); return 0; diff --git a/protocols/ICQCorp/src/transfer.cpp b/protocols/ICQCorp/src/transfer.cpp index 32058cc1f9..4f1f039dfa 100644 --- a/protocols/ICQCorp/src/transfer.cpp +++ b/protocols/ICQCorp/src/transfer.cpp @@ -23,7 +23,7 @@ std::vector icqTransfers; /////////////////////////////////////////////////////////////////////////////// -void WINAPI transferTimerProc(HWND hWnd, UINT Msg, UINT_PTR hTimer, DWORD Time) +void WINAPI transferTimerProc(HWND, UINT, UINT_PTR hTimer, DWORD) { unsigned int i; @@ -374,7 +374,7 @@ void ICQTransfer::process() while (fileProgress < fileSize && GetTickCount() < startTime+100) sendPacket0x06(); ack(ACKRESULT_DATA); - if (fileProgress < fileSize) hTimer = SetTimer(NULL, 0, 1, (TIMERPROC)transferTimerProc); + if (fileProgress < fileSize) hTimer = SetTimer(NULL, 0, 1, transferTimerProc); else if (current < count-1) sendPacket0x02(); } diff --git a/protocols/ICQCorp/src/user.cpp b/protocols/ICQCorp/src/user.cpp index 7b183760bd..73b5bcb98f 100644 --- a/protocols/ICQCorp/src/user.cpp +++ b/protocols/ICQCorp/src/user.cpp @@ -92,7 +92,7 @@ static void setTextValue(HWND hWnd, int id, char *value) /////////////////////////////////////////////////////////////////////////////// -static BOOL CALLBACK icqUserInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK icqUserInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { LPNMHDR hdr; @@ -146,8 +146,8 @@ int icqUserInfoInitialise(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -1900000000; - odp.pszTitle = Translate(protoName); - odp.pfnDlgProc = (DLGPROC)icqUserInfoDlgProc; + odp.pszTitle = protoName; + odp.pfnDlgProc = icqUserInfoDlgProc; odp.pszTemplate = MAKEINTRESOURCE(IDD_INFO_ICQCORP); odp.hInstance = hInstance; UserInfo_AddPage(wParam, &odp); -- cgit v1.2.3