diff options
| -rw-r--r-- | plugins/Clist_nicer/src/config.cpp | 2 | ||||
| -rw-r--r-- | plugins/Folders/src/folders.cpp | 2 | ||||
| -rw-r--r-- | plugins/SecureIM/src/crypt_lists.cpp | 4 | ||||
| -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 | ||||
| -rw-r--r-- | src/mir_core/src/subclass.cpp | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp index dbbf58a4ba..96eac98fce 100644 --- a/plugins/Clist_nicer/src/config.cpp +++ b/plugins/Clist_nicer/src/config.cpp @@ -28,7 +28,7 @@ TCluiData cfg::dat = {0}; ClcData* cfg::clcdat = 0;
static mir_cs cachecs;
-LIST<TExtraCache> cfg::arCache(100, LIST<TExtraCache>::FTSortFunc(NumericKeySortT));
+LIST<TExtraCache> cfg::arCache(100, NumericKeySortT);
bool cfg::shutDown = false;
diff --git a/plugins/Folders/src/folders.cpp b/plugins/Folders/src/folders.cpp index 8cc718db4f..80278cc187 100644 --- a/plugins/Folders/src/folders.cpp +++ b/plugins/Folders/src/folders.cpp @@ -24,7 +24,7 @@ char ModuleName[] = "Folders"; HINSTANCE hInstance;
int hLangpack;
-OBJLIST<CFolderItem> lstRegisteredFolders(10, OBJLIST<CFolderItem>::FTSortFunc(PtrKeySortT));
+OBJLIST<CFolderItem> lstRegisteredFolders(10, PtrKeySortT);
PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp index 28557fd1af..b0407c4a55 100644 --- a/plugins/SecureIM/src/crypt_lists.cpp +++ b/plugins/SecureIM/src/crypt_lists.cpp @@ -1,7 +1,7 @@ #include "commonheaders.h"
-LIST<SupPro> arProto(10, LIST<SupPro>::FTSortFunc(HandleKeySortT));
-LIST<UinKey> arClist(100, LIST<UinKey>::FTSortFunc(NumericKeySortT));
+LIST<SupPro> arProto(10, HandleKeySortT);
+LIST<UinKey> arClist(100, NumericKeySortT);
void loadSupportedProtocols()
{
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)
{
}
diff --git a/src/mir_core/src/subclass.cpp b/src/mir_core/src/subclass.cpp index ac7c419e39..ba7b2e5aa5 100644 --- a/src/mir_core/src/subclass.cpp +++ b/src/mir_core/src/subclass.cpp @@ -31,7 +31,7 @@ struct MSubclassData }
};
-static LIST<MSubclassData> arSubclass(10, LIST<MSubclassData>::FTSortFunc(HandleKeySortT));
+static LIST<MSubclassData> arSubclass(10, HandleKeySortT);
/////////////////////////////////////////////////////////////////////////////////////////
|