diff options
Diffstat (limited to 'plugins/UserInfoEx/src')
| -rw-r--r-- | plugins/UserInfoEx/src/ctrl_base.cpp | 6 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ctrl_base.h | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/mir_db.cpp | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/svc_timezone_old.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/plugins/UserInfoEx/src/ctrl_base.cpp b/plugins/UserInfoEx/src/ctrl_base.cpp index 28d664d82b..35780b7fb4 100644 --- a/plugins/UserInfoEx/src/ctrl_base.cpp +++ b/plugins/UserInfoEx/src/ctrl_base.cpp @@ -155,7 +155,7 @@ CCtrlList* CCtrlList::CreateObj(HWND hOwnerDlg) *
*
**/
-INT_PTR CCtrlList::sortFunc(CBaseCtrl *p1, CBaseCtrl *p2)
+int CCtrlList::sortFunc(const CBaseCtrl *p1, const CBaseCtrl *p2)
{
return p1->_idCtrl - p2->_idCtrl;
}
@@ -164,8 +164,8 @@ INT_PTR CCtrlList::sortFunc(CBaseCtrl *p1, CBaseCtrl *p2) *
*
**/
-CCtrlList::CCtrlList(HWND hOwnerDlg)
-: LIST<CBaseCtrl>(10, (FTSortFunc) CCtrlList::sortFunc)
+CCtrlList::CCtrlList(HWND hOwnerDlg) :
+ LIST<CBaseCtrl>(10, &CCtrlList::sortFunc)
{
_hOwnerDlg = hOwnerDlg;
SetUserData(_hOwnerDlg, this);
diff --git a/plugins/UserInfoEx/src/ctrl_base.h b/plugins/UserInfoEx/src/ctrl_base.h index 22aacd2baf..28a8b5cf83 100644 --- a/plugins/UserInfoEx/src/ctrl_base.h +++ b/plugins/UserInfoEx/src/ctrl_base.h @@ -206,7 +206,7 @@ class CCtrlList : public LIST<CBaseCtrl> {
HWND _hOwnerDlg;
- static INT_PTR sortFunc(CBaseCtrl *tz1, CBaseCtrl *tz2);
+ static int sortFunc(const CBaseCtrl *tz1, const CBaseCtrl *tz2);
CCtrlList(HWND hOwnerDlg);
~CCtrlList();
diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp index 59e8db3473..e54be73d85 100644 --- a/plugins/UserInfoEx/src/mir_db.cpp +++ b/plugins/UserInfoEx/src/mir_db.cpp @@ -739,7 +739,7 @@ int CEnumList::CompareProc(LPCSTR p1, LPCSTR p2) return 0;
}
-CEnumList::CEnumList() : LIST<CHAR>(50, (FTSortFunc)CEnumList::CompareProc)
+CEnumList::CEnumList() : LIST<CHAR>(50, CEnumList::CompareProc)
{
}
diff --git a/plugins/UserInfoEx/src/svc_timezone_old.cpp b/plugins/UserInfoEx/src/svc_timezone_old.cpp index fb82f07b18..4056bcb15b 100644 --- a/plugins/UserInfoEx/src/svc_timezone_old.cpp +++ b/plugins/UserInfoEx/src/svc_timezone_old.cpp @@ -95,7 +95,7 @@ class CTzBias : public LIST<CTimeZone> return (result || !tz1->ptszDisplay || !tz2->ptszDisplay) ? result : mir_tstrcmpi(tz1->ptszDisplay, tz2->ptszDisplay);
}
public:
- CTzBias() : LIST<CTimeZone>(50, (FTSortFunc) CTzBias::sortFunc)
+ CTzBias() : LIST<CTimeZone>(50, &CTzBias::sortFunc)
{
}
@@ -145,7 +145,7 @@ public: const CTzBias& Bias;
CTzMgr()
- :LIST<CTimeZone>(50, (FTSortFunc) CTzMgr::sortFunc),
+ :LIST<CTimeZone>(50, CTzMgr::sortFunc),
_bias(), Bias(_bias)
{
}
|