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
---
 src/modules/extraicons/ExtraIconGroup.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/modules/extraicons/ExtraIconGroup.cpp')

diff --git a/src/modules/extraicons/ExtraIconGroup.cpp b/src/modules/extraicons/ExtraIconGroup.cpp
index 5ec33e2b2c..9df088c1c8 100644
--- a/src/modules/extraicons/ExtraIconGroup.cpp
+++ b/src/modules/extraicons/ExtraIconGroup.cpp
@@ -54,7 +54,7 @@ void ExtraIconGroup::rebuildIcons()
 		items[i]->rebuildIcons();
 }
 
-void ExtraIconGroup::applyIcon(HANDLE hContact)
+void ExtraIconGroup::applyIcon(HCONTACT hContact)
 {
 	if (!isEnabled() || hContact == NULL)
 		return;
@@ -91,7 +91,7 @@ void ExtraIconGroup::setSlot(int slot)
 		items[i]->setSlot(slot);
 }
 
-ExtraIcon * ExtraIconGroup::getCurrentItem(HANDLE hContact) const
+ExtraIcon * ExtraIconGroup::getCurrentItem(HCONTACT hContact) const
 {
 	int id = (int)db_get_dw(hContact, MODULE_NAME, szName, 0);
 	if (id < 1)
@@ -104,24 +104,24 @@ ExtraIcon * ExtraIconGroup::getCurrentItem(HANDLE hContact) const
 	return NULL;
 }
 
-void ExtraIconGroup::onClick(HANDLE hContact)
+void ExtraIconGroup::onClick(HCONTACT hContact)
 {
 	ExtraIcon *extra = getCurrentItem(hContact);
 	if (extra != NULL)
 		extra->onClick(hContact);
 }
 
-int ExtraIconGroup::setIcon(int id, HANDLE hContact, HANDLE value)
+int ExtraIconGroup::setIcon(int id, HCONTACT hContact, HANDLE value)
 {
 	return internalSetIcon(id, hContact, (void*)value, false);
 }
 
-int ExtraIconGroup::setIconByName(int id, HANDLE hContact, const char *value)
+int ExtraIconGroup::setIconByName(int id, HCONTACT hContact, const char *value)
 {
 	return internalSetIcon(id, hContact, (void*)value, true);
 }
 
-int ExtraIconGroup::internalSetIcon(int id, HANDLE hContact, void *value, bool bByName)
+int ExtraIconGroup::internalSetIcon(int id, HCONTACT hContact, void *value, bool bByName)
 {
 	if (insideApply) {
 		for (int i=0; i < items.getCount(); i++)
@@ -208,7 +208,7 @@ int ExtraIconGroup::getType() const
 	return EXTRAICON_TYPE_GROUP;
 }
 
-int ExtraIconGroup::ClistSetExtraIcon(HANDLE hContact, HANDLE hImage)
+int ExtraIconGroup::ClistSetExtraIcon(HCONTACT hContact, HANDLE hImage)
 {
 	if (hImage != INVALID_HANDLE_VALUE)
 		setValidExtraIcon = true;
-- 
cgit v1.2.3