From 56ae169ecbc85ba64991edf1019bf15d1f963a11 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 11 Feb 2014 14:59:24 +0000
Subject: more sorting issues

git-svn-id: http://svn.miranda-ng.org/main/trunk@8097 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_nicer/src/config.cpp         | 2 +-
 plugins/FloatingContacts/src/thumbs.cpp    | 2 +-
 plugins/SecureIM/src/crypt_lists.cpp       | 2 +-
 plugins/SeenPlugin/src/main.cpp            | 2 +-
 plugins/TabSRMM/src/contactcache.cpp       | 2 +-
 plugins/TabSRMM/src/eventpopups.cpp        | 2 +-
 plugins/UserInfoEx/src/Flags/svc_flags.cpp | 2 +-
 protocols/Gadu-Gadu/src/gg_proto.cpp       | 4 ++--
 src/modules/clist/clcitems.cpp             | 2 +-
 src/modules/srmm/statusicon.cpp            | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp
index 7ccb4840d4..0e49aea1bf 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 CRITICAL_SECTION cachecs;
-LIST<TExtraCache> cfg::arCache(100, LIST<TExtraCache>::FTSortFunc(HandleKeySortT));
+LIST<TExtraCache> cfg::arCache(100, LIST<TExtraCache>::FTSortFunc(NumericKeySortT));
 
 bool cfg::shutDown = false;
 
diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp
index 69228d7265..bc6b4888c7 100644
--- a/plugins/FloatingContacts/src/thumbs.cpp
+++ b/plugins/FloatingContacts/src/thumbs.cpp
@@ -760,7 +760,7 @@ void UndockThumbs(ThumbInfo *pThumb1, ThumbInfo *pThumb2)
 /////////////////////////////////////////////////////////////////////////////
 // ThumbList
 
-ThumbList::ThumbList(): OBJLIST<ThumbInfo>(1, HandleKeySortT)
+ThumbList::ThumbList(): OBJLIST<ThumbInfo>(1, NumericKeySortT)
 {
 }
 
diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp
index 3c3a5808e9..c8727ed04a 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(HandleKeySortT));
+LIST<UinKey> arClist(100, LIST<UinKey>::FTSortFunc(NumericKeySortT));
 
 void loadSupportedProtocols()
 {
diff --git a/plugins/SeenPlugin/src/main.cpp b/plugins/SeenPlugin/src/main.cpp
index 0fc5128622..c1d07fb08f 100644
--- a/plugins/SeenPlugin/src/main.cpp
+++ b/plugins/SeenPlugin/src/main.cpp
@@ -47,7 +47,7 @@ DBVTranslation idleTr[TRANSNUMBER]={
 };
 
 BOOL includeIdle;
-LIST<logthread_info> arContacts(16, HandleKeySortT);
+LIST<logthread_info> arContacts(16, NumericKeySortT);
 CRITICAL_SECTION csContacts;
 
 void UninitHistoryDialog(void);
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp
index 31f20b99a7..1b690f5aaf 100644
--- a/plugins/TabSRMM/src/contactcache.cpp
+++ b/plugins/TabSRMM/src/contactcache.cpp
@@ -35,7 +35,7 @@
 
 #include "commonheaders.h"
 
-static OBJLIST<CContactCache> arContacts(50, HandleKeySortT);
+static OBJLIST<CContactCache> arContacts(50, NumericKeySortT);
 
 CContactCache::CContactCache(const MCONTACT hContact)
 {
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 43aa9d02d8..58acd08e64 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -40,7 +40,7 @@
 
 #include "commonheaders.h"
 
-static LIST<PLUGIN_DATAT> arPopupList(10, HandleKeySortT);
+static LIST<PLUGIN_DATAT> arPopupList(10, NumericKeySortT);
 
 BOOL bWmNotify = TRUE;
 
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index 1dbe3cbad7..bf48a674eb 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -35,7 +35,7 @@ static	HANDLE hExtraIconSvc;
 
 static int OnContactSettingChanged(WPARAM wParam,LPARAM lParam);
 
-static LIST<MsgWndData> gMsgWndList(10, HandleKeySortT);
+static LIST<MsgWndData> gMsgWndList(10, NumericKeySortT);
 
 /***********************************************************************************************************
  * service functions
diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index b6f55e0db7..e4258d97c8 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -23,8 +23,8 @@
 
 GGPROTO::GGPROTO(const char* pszProtoName, const TCHAR* tszUserName) :
 	PROTO<GGPROTO>(pszProtoName, tszUserName),
-	avatar_requests(1, HandleKeySortT),
-	avatar_transfers(1, HandleKeySortT)
+	avatar_requests(1, NumericKeySortT),
+	avatar_transfers(1, NumericKeySortT)
 {
 #ifdef DEBUGMODE
 	extendedLogging = 0;
diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp
index 9587d3f94f..9e0352f2b7 100644
--- a/src/modules/clist/clcitems.cpp
+++ b/src/modules/clist/clcitems.cpp
@@ -608,7 +608,7 @@ void fnSaveStateAndRebuildList(HWND hwnd, struct ClcData *dat)
 	KillTimer(hwnd, TIMERID_RENAME);
 	cli.pfnEndRename(hwnd, dat, 1);
 
-	OBJLIST<SavedContactState_t> saveContact(10, HandleKeySortT);
+	OBJLIST<SavedContactState_t> saveContact(10, NumericKeySortT);
 	OBJLIST<SavedGroupState_t> saveGroup(100, NumericKeySortT);
 	OBJLIST<SavedInfoState_t> saveInfo(10, NumericKeySortT);
 
diff --git a/src/modules/srmm/statusicon.cpp b/src/modules/srmm/statusicon.cpp
index 677bcfa068..17d48c3a32 100644
--- a/src/modules/srmm/statusicon.cpp
+++ b/src/modules/srmm/statusicon.cpp
@@ -50,7 +50,7 @@ struct StatusIconChild : public MZeroedObject
 struct StatusIconMain : public MZeroedObject
 {
 	StatusIconMain() :
-		arChildren(3, HandleKeySortT)
+		arChildren(3, NumericKeySortT)
 		{}
 
 	~StatusIconMain()
-- 
cgit v1.2.3