- 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

1 files changed, 9 insertions, 9 deletions

diff --git a/plugins/UserInfoEx/src/mir_contactqueue.h b/plugins/UserInfoEx/src/mir_contactqueue.h
index b42d89c1a6..4da54dcacc 100644
--- a/plugins/UserInfoEx/src/mir_contactqueue.h
+++ b/plugins/UserInfoEx/src/mir_contactqueue.h
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 struct CQueueItem

 {

 	DWORD	check_time;

-	HANDLE	hContact;

+	HCONTACT hContact;

 	PVOID	param;

 };

 

@@ -65,7 +65,7 @@ public:
 	 *

 	 * @return	nothing

 	 **/

-	void RemoveAll(HANDLE hContact);

+	void RemoveAll(HCONTACT hContact);

 

 	/**

 	 * This function removes all queue items for the hContact considering the correct parameter.

@@ -75,7 +75,7 @@ public:
 	 *

 	 * @return	nothing

 	 **/

-	void RemoveAllConsiderParam(HANDLE hContact, PVOID param);

+	void RemoveAllConsiderParam(HCONTACT hContact, PVOID param);

 

 	/**

 	 * This method adds the desired new item.

@@ -87,7 +87,7 @@ public:
 	 * @retval		TRUE			- The item is added to the queue successfully.

 	 * @retval		FALSE			- The item is not added to the queue.

 	 **/

-	BOOL Add(int waitTime, HANDLE hContact, PVOID param = NULL);

+	BOOL Add(int waitTime, HCONTACT hContact, PVOID param = NULL);

 

 	/**

 	 * This method adds the desired new item only, if the queue does not yet contain

@@ -100,7 +100,7 @@ public:
 	 * @retval		TRUE			- The item is added to the queue successfully.

 	 * @retval		FALSE			- The item is not added to the queue.

 	 **/

-	BOOL AddIfDontHave(int waitTime, HANDLE hContact, PVOID param = NULL);

+	BOOL AddIfDontHave(int waitTime, HCONTACT hContact, PVOID param = NULL);

 

 	/**

 	 * This method removes all existing queue items for the contact and adds a new queue item

@@ -113,7 +113,7 @@ public:
 	 *

 	 * @return		nothing

 	 **/

-	BOOL AddUnique(int waitTime, HANDLE hContact, PVOID param = NULL);

+	BOOL AddUnique(int waitTime, HCONTACT hContact, PVOID param = NULL);

 

 	/**

 	 * This method removes all existing queue items for the contact with the same parameter as @e param

@@ -126,7 +126,7 @@ public:
 	 *

 	 * @return	nothing

 	 **/

-	BOOL AddUniqueConsiderParam	(int waitTime, HANDLE hContact, PVOID param = NULL);

+	BOOL AddUniqueConsiderParam	(int waitTime, HCONTACT hContact, PVOID param = NULL);

 

 	/**

 	 * This method resumes the worker thread and immitiatly goes on with the next entry.

@@ -140,7 +140,7 @@ public:
 protected:

 	

 	virtual void OnEmpty		() {};

-	virtual void Callback		(HANDLE hContact, PVOID param) = 0;

+	virtual void Callback		(HCONTACT hContact, PVOID param) = 0;

 

 	/**

 	 * This is the real thread callback function. As long as _status

@@ -198,7 +198,7 @@ private:
 	 * @retval		TRUE		- The item is added to the queue successfully.

 	 * @retval		FALSE		- The item is not added to the queue.

 	 **/

-	BOOL InternalAdd(int waitTime, HANDLE hContact, PVOID param);

+	BOOL InternalAdd(int waitTime, HCONTACT hContact, PVOID param);

 };

 

 #endif // __CONTACTASYNCQUEUE_H__
\ No newline at end of file