SortedList emulation expunged

git-svn-id: http://svn.miranda-ng.org/main/trunk@16878 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 10 insertions, 9 deletions

diff --git a/include/m_clistint.h b/include/m_clistint.h
index 61d0188423..8c312f4d63 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -78,16 +78,13 @@ struct ClcContact;
 struct ClcData;

 struct ClcCacheEntry;

 

-struct ContactList

+struct ClcGroup : public MZeroedObject

 {

-	struct ClcContact** items;

-	int count, limit, increment;

-	void* sortFunc;

-};

+	__forceinline ClcGroup(int _limit) :

+		cl(_limit)

+	{}

 

-struct ClcGroup

-{

-	ContactList cl;

+	LIST<ClcContact> cl;

 	int expanded, hideOffline, groupId;

 	ClcGroup *parent;

 	int scanIndex;

@@ -121,8 +118,12 @@ struct ClcContactBase
 	ClcCacheEntry *pce; // cache is persistent, contacts aren't

 };

 

-struct ClcDataBase

+struct ClcDataBase : public MZeroedObject

 {

+	__forceinline ClcDataBase() :

+		list(50)

+	{}

+

 	ClcGroup list;

 	int rowHeight;

 	int yScroll;