- 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, 7 insertions, 7 deletions

diff --git a/src/modules/extraicons/DefaultExtraIcons.cpp b/src/modules/extraicons/DefaultExtraIcons.cpp
index 9b968d81f1..fe75c5b1a8 100644
--- a/src/modules/extraicons/DefaultExtraIcons.cpp
+++ b/src/modules/extraicons/DefaultExtraIcons.cpp
@@ -33,7 +33,7 @@ ExtraIcon* GetExtraIcon(HANDLE id);
 

 HANDLE hExtraVisibility, hExtraChat, hExtraGender, hExtraProto;

 

-static void SetVisibility(HANDLE hContact, int apparentMode, bool clear)

+static void SetVisibility(HCONTACT hContact, int apparentMode, bool clear)

 {

 	if (hContact == NULL)

 		return;

@@ -69,7 +69,7 @@ static void SetVisibility(HANDLE hContact, int apparentMode, bool clear)
 	}

 }

 

-static void SetGender(HANDLE hContact, int gender, bool clear)

+static void SetGender(HCONTACT hContact, int gender, bool clear)

 {

 	if (hContact == NULL)

 		return;

@@ -134,7 +134,7 @@ static Info infos[] =
 		&EmailOnClick },

 };

 

-static void SetExtraIcons(HANDLE hContact)

+static void SetExtraIcons(HCONTACT hContact)

 {

 	if (hContact == NULL)

 		return;

@@ -161,7 +161,7 @@ static void SetExtraIcons(HANDLE hContact)
 

 static int SettingChanged(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 	if (hContact == NULL)

 		return 0;

 

@@ -209,7 +209,7 @@ static int DefaultOnClick(WPARAM wParam, LPARAM lParam, LPARAM param)
 	if (p == NULL)

 		return 0;

 

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 	if (hContact == NULL)

 		return 0;

 

@@ -279,7 +279,7 @@ static ProtoInfo* FindProto(const char *proto)
 

 static int ProtocolApplyIcon(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 	char *proto = GetContactProto(hContact);

 	if (IsEmpty(proto))

 		return 0;

@@ -319,7 +319,7 @@ void DefaultExtraIcons_Load()
 			p.hExtraIcon = ExtraIcon_Register(p.name, p.desc, LoadSkinnedIconName(p.iSkinIcon));

 	}

 

-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		SetExtraIcons(hContact);

 		SetVisibility(hContact, -1, false);

 		SetGender(hContact, -1, false);