From bdf69f6310f09c90c20512ebe9dfa73ec524da59 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Fri, 7 Sep 2012 15:37:01 +0000 Subject: -minor signature fixes -fixed path to precompiled headers git-svn-id: http://svn.miranda-ng.org/main/trunk@1545 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/src/commonheaders.h | 2 ++ plugins/UserInfoEx/src/ctrl_contact.cpp | 8 ++++---- plugins/UserInfoEx/src/dlg_anniversarylist.cpp | 2 +- plugins/UserInfoEx/src/dlg_msgbox.cpp | 8 ++++---- plugins/UserInfoEx/src/dlg_msgbox.h | 2 +- plugins/UserInfoEx/src/dlg_propsheet.cpp | 6 ------ plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp | 2 +- plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp | 2 +- plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp | 2 +- plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp | 2 +- plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp | 6 +++--- plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp | 7 +------ plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp | 2 +- plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp | 6 +++--- plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp | 2 +- plugins/UserInfoEx/src/mir_db.cpp | 1 - plugins/UserInfoEx/src/psp_anniversary.cpp | 2 +- plugins/UserInfoEx/src/svc_email.cpp | 1 - plugins/UserInfoEx/src/svc_gender.cpp | 1 - plugins/UserInfoEx/src/svc_phone.cpp | 1 - plugins/UserInfoEx/src/svc_refreshci.cpp | 6 +++--- plugins/UserInfoEx/src/svc_reminder.cpp | 4 ++-- plugins/UserInfoEx/src/svc_timezone.cpp | 1 - plugins/UserInfoEx/src/svc_timezone_old.cpp | 1 - 24 files changed, 31 insertions(+), 46 deletions(-) (limited to 'plugins/UserInfoEx/src') diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h index f31a6fcac0..849e22eb5e 100644 --- a/plugins/UserInfoEx/src/commonheaders.h +++ b/plugins/UserInfoEx/src/commonheaders.h @@ -94,6 +94,8 @@ typedef std::basic_string tstring; #include #include #include +#include +#include #include #include #include diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp index 8b13ad9256..57917f028f 100644 --- a/plugins/UserInfoEx/src/ctrl_contact.cpp +++ b/plugins/UserInfoEx/src/ctrl_contact.cpp @@ -703,12 +703,12 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L switch (GetWindowLongPtr(hwnd, GWLP_ID)) { case EDIT_PHONE: dlgID = IDD_ADDPHONE; - dlgProc = (DLGPROC)DlgProc_Phone; + dlgProc = DlgProc_Phone; cbi.pszIcon = ICO_BTN_CUSTOMPHONE; break; case EDIT_EMAIL: dlgID = IDD_ADDEMAIL; - dlgProc = (DLGPROC)DlgProc_EMail; + dlgProc = DlgProc_EMail; cbi.pszIcon = ICO_BTN_EMAIL; break; default: @@ -761,11 +761,11 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L switch (GetWindowLongPtr(hwnd, GWLP_ID)) { case EDIT_PHONE: dlgID = IDD_ADDPHONE; - dlgProc = (DLGPROC)DlgProc_Phone; + dlgProc = DlgProc_Phone; break; case EDIT_EMAIL: dlgID = IDD_ADDEMAIL; - dlgProc = (DLGPROC)DlgProc_EMail; + dlgProc = DlgProc_EMail; break; default: return 1; diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp index 1b0cd689da..876ed97fa3 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp @@ -974,7 +974,7 @@ public: _rcWin.left = _rcWin.right = _rcWin.top = _rcWin.bottom = 0; LoadFilter(); - _hDlg = CreateDialogParam(ghInst, MAKEINTRESOURCE(IDD_ANNIVERSARY_LIST), NULL, (DLGPROC)DlgProc, (LPARAM)this); + _hDlg = CreateDialogParam(ghInst, MAKEINTRESOURCE(IDD_ANNIVERSARY_LIST), NULL, DlgProc, (LPARAM)this); if (_hDlg) { MagneticWindows_AddWindow(_hDlg); _mHookExit = HookEventMessage(ME_SYSTEM_PRESHUTDOWN, _hDlg, WM_CLOSE); diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp index 5f55802e3d..b9af5e57d4 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.cpp +++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp @@ -591,7 +591,7 @@ static INT_PTR CALLBACK MsgBoxPop(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP mir_tcsncpy(pd.lptzText, pMsgBox->ptszMsg, SIZEOF(pd.lptzText)); // CALLBAC Proc - pd.PluginWindowProc = (WNDPROC)PopupProc; + pd.PluginWindowProc = PopupProc; // pd.PluginData = pmpd; @@ -709,7 +709,7 @@ static INT_PTR CALLBACK MsgBoxPop(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP * * @return TRUE, FALSE, IDOK, IDYES, IDALL, IDNO or IDCANCEL **/ -static INT_PTR CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -791,11 +791,11 @@ INT_PTR MsgBoxService(WPARAM wParam, LPARAM lParam) DB::Setting::GetByte(SET_POPUPMSGBOX, DEFVAL_POPUPMSGBOX) // user likes popups? ) { - rc = DialogBoxParam(ghInst, MAKEINTRESOURCE(IDD_MSGBOXDUMMI), pMsgBox->hParent, (DLGPROC)MsgBoxPop, lParam); + rc = DialogBoxParam(ghInst, MAKEINTRESOURCE(IDD_MSGBOXDUMMI), pMsgBox->hParent, MsgBoxPop, lParam); } else { - rc = DialogBoxParam(ghInst, MAKEINTRESOURCE(IDD_MSGBOX), pMsgBox->hParent, (DLGPROC)MsgBoxProc, lParam); + rc = DialogBoxParam(ghInst, MAKEINTRESOURCE(IDD_MSGBOX), pMsgBox->hParent, MsgBoxProc, lParam); } } return rc; diff --git a/plugins/UserInfoEx/src/dlg_msgbox.h b/plugins/UserInfoEx/src/dlg_msgbox.h index 6b01cd55bf..683a57c63a 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.h +++ b/plugins/UserInfoEx/src/dlg_msgbox.h @@ -98,6 +98,6 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPTSTR pszTitle, LPTSTR pszInf INT_PTR CALLBACK MsgErr(HWND hParent, LPCTSTR pszFormat, ...); INT_PTR MsgBoxService(WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); #endif /* _SVC_DLG_INCLUDED_ */ \ No newline at end of file diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index eee049aea1..09537a4b2a 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -37,12 +37,6 @@ Last change by : $Author: ing.u.horn $ #include "svc_ExImport.h" #include "svc_reminder.h" -/** - * Miranda includes: - **/ -#include -#include - #define OPTIONPAGE_OLD_SIZE (offsetof(OPTIONSDIALOGPAGE, hLangpack)) #define UPDATEANIMFRAMES 20 diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index 0f75c0df43..537fb0d8c8 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -27,7 +27,7 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ -#include "commonheaders.h" +#include "..\commonheaders.h" #include "..\svc_contactinfo.h" #include "classExImContactBase.h" #include "mir_rfcCodecs.h" diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index 2264f4d278..0f29f08c25 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -27,7 +27,7 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ -#include "commonheaders.h" +#include "..\commonheaders.h" #include "classExImContactXML.h" #include "svc_ExImXML.h" #include "mir_rfcCodecs.h" diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp index 9ca27d7289..09431edde5 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp @@ -28,7 +28,7 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ -#include "commonheaders.h" +#include "..\commonheaders.h" //#include "svc_ExImport.h" #include "dlg_ExImModules.h" diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp index 6b72dbdb46..1b62985ec9 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp @@ -28,7 +28,7 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ -#include "commonheaders.h" +#include "..\commonheaders.h" #include diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp index 9da4ee4373..2f7ee91aca 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp @@ -28,7 +28,7 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ -#include "commonheaders.h" +#include "..\commonheaders.h" #include "dlg_ExImProgress.h" /*********************************************************************************************************** @@ -41,7 +41,7 @@ Last change by : $Author: ing.u.horn $ * params: none * return: nothing **/ -LRESULT CALLBACK DlgProcProgress(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DlgProcProgress(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -102,7 +102,7 @@ LRESULT CALLBACK DlgProcProgress(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar CProgress::CProgress() { _dwStartTime = GetTickCount(); - _hDlg = CreateDialog(ghInst, MAKEINTRESOURCE(IDD_COPYPROGRESS), 0, (DLGPROC)DlgProcProgress); + _hDlg = CreateDialog(ghInst, MAKEINTRESOURCE(IDD_COPYPROGRESS), 0, DlgProcProgress); } /** diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp index f3c4ce6362..24c4e7eab9 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp @@ -31,17 +31,12 @@ Last change by : $Author: ing.u.horn $ /** * system & local includes: **/ -#include "commonheaders.h" +#include "..\commonheaders.h" #include "classExImContactBase.h" #include "dlg_ExImModules.h" #include "svc_ExImport.h" #include "svc_ExImINI.h" -/** - * Miranda includes - **/ -#include -#include /*********************************************************************************************************** * exporting stuff diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp index 53faf60c02..2a3144b878 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp @@ -31,7 +31,7 @@ Last change by : $Author: ing.u.horn $ /** * system & local includes: **/ -#include "commonheaders.h" +#include "../commonheaders.h" #include "../svc_reminder.h" #include "svc_ExImport.h" #include "svc_ExImVCF.h" diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp index dca52f1685..f43b5fe9c6 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp @@ -27,7 +27,7 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ -#include "commonheaders.h" +#include "..\commonheaders.h" #define XMLCARD_VERSION "1.1" @@ -38,7 +38,7 @@ Last change by : $Author: ing.u.horn $ #include "classExImContactXML.h" #include "svc_ExImport.h" -LRESULT CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -112,7 +112,7 @@ INT CFileXml::Export(lpExImParam ExImContact, LPCSTR pszFileName) result = (DWORD)DialogBox(ghInst, MAKEINTRESOURCE(IDD_EXPORT_DATAHISTORY), - NULL, (DLGPROC)DlgProc_DataHistory); + NULL, DlgProc_DataHistory); if (LOWORD(result) != IDOK) { return 0; diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp index 35bb59c3b9..1570aa6e01 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp @@ -28,7 +28,7 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ -#include "commonheaders.h" +#include "..\commonheaders.h" #include "classExImContactBase.h" #include "dlg_ExImModules.h" #include "dlg_ExImOpenSaveFile.h" diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp index e4596df4cc..005495939c 100644 --- a/plugins/UserInfoEx/src/mir_db.cpp +++ b/plugins/UserInfoEx/src/mir_db.cpp @@ -29,7 +29,6 @@ Last change by : $Author: ing.u.horn $ */ #include "commonheaders.h" -#include #include "ctrl_base.h" #include "mir_string.h" #include "mir_db.h" diff --git a/plugins/UserInfoEx/src/psp_anniversary.cpp b/plugins/UserInfoEx/src/psp_anniversary.cpp index 4872c655db..d98d0baee6 100644 --- a/plugins/UserInfoEx/src/psp_anniversary.cpp +++ b/plugins/UserInfoEx/src/psp_anniversary.cpp @@ -258,7 +258,7 @@ INT_PTR CALLBACK PSPProcAnniversary(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM if (HIWORD(wParam) == BN_CLICKED && PtrIsValid(pDateCtrl)) { MAnnivDate Date; - if (IDOK == DialogBoxParam(ghInst, MAKEINTRESOURCE(IDD_ANNIVERSARY_EDITOR), hDlg, (DLGPROC)DlgProc_AnniversaryEditor, (LPARAM)&Date)) + if (IDOK == DialogBoxParam(ghInst, MAKEINTRESOURCE(IDD_ANNIVERSARY_EDITOR), hDlg, DlgProc_AnniversaryEditor, (LPARAM)&Date)) { SendMessage(GetParent(hDlg), PSM_CHANGED, NULL, NULL); if (!pDateCtrl->AddDate(Date)) diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index a9a0b47686..a581dfe2d2 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -28,7 +28,6 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ #include "commonheaders.h" -#include "m_email.h" static HANDLE ghMenuItem = NULL; static HANDLE ghExtraIconDef = INVALID_HANDLE_VALUE; diff --git a/plugins/UserInfoEx/src/svc_gender.cpp b/plugins/UserInfoEx/src/svc_gender.cpp index 433a7664b9..e48ff7a22f 100644 --- a/plugins/UserInfoEx/src/svc_gender.cpp +++ b/plugins/UserInfoEx/src/svc_gender.cpp @@ -28,7 +28,6 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ #include "commonheaders.h" -#include "m_contacts.h" static HANDLE ghExtraIconF = INVALID_HANDLE_VALUE; static HANDLE ghExtraIconM = INVALID_HANDLE_VALUE; diff --git a/plugins/UserInfoEx/src/svc_phone.cpp b/plugins/UserInfoEx/src/svc_phone.cpp index fab967c9a1..05d1e8f821 100644 --- a/plugins/UserInfoEx/src/svc_phone.cpp +++ b/plugins/UserInfoEx/src/svc_phone.cpp @@ -28,7 +28,6 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ #include "commonheaders.h" -#include "m_icq.h" enum EPhoneType { diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp index bddc9e60ca..1a14ec0bea 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.cpp +++ b/plugins/UserInfoEx/src/svc_refreshci.cpp @@ -302,7 +302,7 @@ public: _hWnd = CreateDialogParam(ghInst, MAKEINTRESOURCE(IDD_REFRESHDETAILS), 0, - (DLGPROC)CDlgUpdProgress::WndProc, + CDlgUpdProgress::WndProc, (LPARAM) this); if (_hWnd) { @@ -382,7 +382,7 @@ class CPopupUpdProgress : public CUpdProgress * if passed to the default windows procedure. * **/ - static INT_PTR CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { // Filter out messages, which must not be passed to default windows procedure or even // to the callback function! @@ -439,7 +439,7 @@ public: pd.lchIcon = IcoLib_GetIcon(ICO_BTN_UPDATE); pd.iSeconds = -1; pd.PluginData = this; - pd.PluginWindowProc = (WNDPROC)CPopupUpdProgress::WndProc; + pd.PluginWindowProc = CPopupUpdProgress::WndProc; pd.actionCount = SIZEOF(_popupButtons); pd.lpActions = _popupButtons; diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index f91ba47f33..c26e2027e6 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -333,7 +333,7 @@ static VOID NotifyWithExtraIcon(HANDLE hContact, const CEvent &evt) * * @return message specific **/ -static INT_PTR CALLBACK PopupWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -374,7 +374,7 @@ static INT NotifyWithPopup(HANDLE hContact, CEvent::EType eventType, INT DaysToA POPUPDATAT_V2 ppd; ZeroMemory(&ppd, sizeof(POPUPDATAT_V2)); - ppd.PluginWindowProc = (WNDPROC)PopupWindowProc; + ppd.PluginWindowProc = PopupWindowProc; ppd.iSeconds = (INT)DB::Setting::GetByte(SET_POPUP_DELAY, 0); if (hContact) diff --git a/plugins/UserInfoEx/src/svc_timezone.cpp b/plugins/UserInfoEx/src/svc_timezone.cpp index d9d0b4688c..288e1aa1b5 100644 --- a/plugins/UserInfoEx/src/svc_timezone.cpp +++ b/plugins/UserInfoEx/src/svc_timezone.cpp @@ -28,7 +28,6 @@ Last change by : $Author: $ =============================================================================== */ #include "commonheaders.h" -#include "m_icq.h" #include "svc_timezone.h" /*********************************************************************************************************** diff --git a/plugins/UserInfoEx/src/svc_timezone_old.cpp b/plugins/UserInfoEx/src/svc_timezone_old.cpp index f602f68f5d..c3b9a5a431 100644 --- a/plugins/UserInfoEx/src/svc_timezone_old.cpp +++ b/plugins/UserInfoEx/src/svc_timezone_old.cpp @@ -28,7 +28,6 @@ Last change by : $Author: ing.u.horn $ =============================================================================== */ #include "commonheaders.h" -#include "m_icq.h" #include "svc_timezone_old.h" #define TZREG "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones" -- cgit v1.2.3