From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 08:04:30 +0000
Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat
 constants to avoid name conflicts

git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/BasicHistory/src/EventList.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/BasicHistory/src/EventList.h')

diff --git a/plugins/BasicHistory/src/EventList.h b/plugins/BasicHistory/src/EventList.h
index a32ff92b9c..6a3327760c 100644
--- a/plugins/BasicHistory/src/EventList.h
+++ b/plugins/BasicHistory/src/EventList.h
@@ -80,7 +80,7 @@ private:
 	void InitFilters();
 	void InitNames();
 	void AddGroup(const EventIndex& ev);
-	void GetTempList(std::list<EventTempIndex>& tempList, bool noFilter, bool noExt, HANDLE _hContact);
+	void GetTempList(std::list<EventTempIndex>& tempList, bool noFilter, bool noExt, HCONTACT _hContact);
 	void ImportMessages(const std::vector<IImport::ExternalMessage>& messages);
 protected:
 	TCHAR contactName[256];
@@ -102,11 +102,11 @@ protected:
 	void RebuildGroup(int selected);
 public:
 	EventList();
-	EventList(HANDLE _hContact, int filter);
+	EventList(HCONTACT _hContact, int filter);
 	~EventList();
 	
 	HWND hWnd;
-	HANDLE hContact;
+	HCONTACT hContact;
 	std::vector<std::deque<EventIndex> > eventList;
 	bool useImportedMessages;
 
@@ -116,7 +116,7 @@ public:
 	int GetFilterNr();
 	std::wstring GetFilterName();
 	void RefreshEventList();
-	bool SearchInContact(HANDLE hContact, TCHAR *strFind, ComparatorInterface* compFun);
+	bool SearchInContact(HCONTACT hContact, TCHAR *strFind, ComparatorInterface* compFun);
 	std::wstring GetContactName();
 	std::wstring GetMyName();
 	std::wstring GetProtocolName();
@@ -124,10 +124,10 @@ public:
 	std::wstring GetContactId();
 	std::string GetBaseProtocol();
 	void MargeMessages(const std::vector<IImport::ExternalMessage>& messages);
-	static void AddImporter(HANDLE hContact, IImport::ImportType type, const std::wstring& file);
-	static int GetContactMessageNumber(HANDLE hContact);
-	static bool IsImportedHistory(HANDLE hContact);
-	static void DeleteImporter(HANDLE hContact);
+	static void AddImporter(HCONTACT hContact, IImport::ImportType type, const std::wstring& file);
+	static int GetContactMessageNumber(HCONTACT hContact);
+	static bool IsImportedHistory(HCONTACT hContact);
+	static void DeleteImporter(HCONTACT hContact);
 	static void GetObjectDescription( DBEVENTINFO *dbei, TCHAR* str, int cbStr );
 	bool GetEventData(const EventIndex& ev, EventData& data);
 	void GetExtEventDBei(const EventIndex& ev);
-- 
cgit v1.2.3