From 2c8efde364e6dc3e3ad2da9e99b667c1b56c1585 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 2 Feb 2016 08:48:56 +0000
Subject: another perversion (called EventList) died

git-svn-id: http://svn.miranda-ng.org/main/trunk@16210 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 include/delphi/m_clistint.inc |  2 +-
 include/m_clistint.h          | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 5b92b8f8ad..dd9526d786 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -452,7 +452,7 @@ type
   * version 2 - events processing
   *************************************************************************************)
 
-    events : TEventList;
+    events : PEventList;
 
     pfnAddEvent : function (_para1:PCLISTEVENT):PCListEvent; cdecl;
     pfnGetEvent : function (hContact:TMCONTACT; idx:int):PCLISTEVENT; cdecl;
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 04109666ba..a78ff48c6e 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_clist.h>
 #endif 
 
+#include <m_system_cpp.h>
 #include <m_protocols.h>
 #include <m_clc.h>
 
@@ -80,13 +81,6 @@ struct ContactList
 	void* sortFunc;
 };
 
-struct EventList
-{
-	struct CListEvent** items;
-	int count, limit, increment;
-	void* sortFunc;
-};
-
 struct ClcGroup
 {
 	ContactList cl;
@@ -165,8 +159,14 @@ struct ClcDataBase
 	int filterSearch;
 };
 
-struct CListEvent : public CLISTEVENT
+struct CListEvent : public CLISTEVENT, public MZeroedObject
 {
+	~CListEvent()
+	{
+		mir_free(pszService);
+		mir_free(pszTooltip);
+	}
+
 	int imlIconIndex;
 	int flashesDone;
 
@@ -410,7 +410,7 @@ struct CLIST_INTERFACE
 	 * version 2 - events processing
 	 *************************************************************************************/
 
-	EventList events;
+	OBJLIST<CListEvent> *events;
 
 	struct CListEvent* (*pfnAddEvent)(CLISTEVENT*);
 	CLISTEVENT* (*pfnGetEvent)(MCONTACT hContact, int idx);
-- 
cgit v1.2.3