HCONTACT is not needed anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 10 insertions, 10 deletions

diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp
index 141301a970..34514b0c88 100644
--- a/plugins/CountryFlags/src/extraimg.cpp
+++ b/plugins/CountryFlags/src/extraimg.cpp
@@ -27,15 +27,15 @@ static HANDLE hServiceDetectContactOrigin;
 static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam)

 {

 	int countryNumber = 0xFFFF;

-	char *pszProto = GetContactProto((HCONTACT)wParam);

+	char *pszProto = GetContactProto((MCONTACT)wParam);

 	/* ip detect */

 	if (bUseIpToCountry)

-		countryNumber = ServiceIpToCountry(db_get_dw((HCONTACT)wParam,pszProto,"RealIP",0),0);

+		countryNumber = ServiceIpToCountry(db_get_dw((MCONTACT)wParam,pszProto,"RealIP",0),0);

 	/* fallback */

 	if (countryNumber == 0xFFFF)

-		countryNumber = db_get_w((HCONTACT)wParam,pszProto,"Country",0);

+		countryNumber = db_get_w((MCONTACT)wParam,pszProto,"Country",0);

 	if (countryNumber == 0 || countryNumber == 0xFFFF)

-		countryNumber = db_get_w((HCONTACT)wParam,pszProto,"CompanyCountry",0);

+		countryNumber = db_get_w((MCONTACT)wParam,pszProto,"CompanyCountry",0);

 	return (countryNumber == 0) ? 0xFFFF : countryNumber;

 }

 

@@ -45,7 +45,7 @@ static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam)
 

 static HANDLE hExtraIcon;

 

-static void CALLBACK SetExtraImage(HCONTACT hContact)

+static void CALLBACK SetExtraImage(MCONTACT hContact)

 {

 	if (!bShowExtraIcon)

 		return;

@@ -63,14 +63,14 @@ static void CALLBACK SetExtraImage(HCONTACT hContact)
 // always call in context of main thread

 static void RemoveExtraImages(void)

 {

-	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

+	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

 		ExtraIcon_Clear(hExtraIcon, hContact);

 }

 

 // always call in context of main thread

 static void EnsureExtraImages(void)

 {

-	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

+	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

 		SetExtraImage(hContact);

 }

 

@@ -87,7 +87,7 @@ void UpdateExtraImages()
 #define STATUSICON_REFRESHDELAY  100  /* time for which setting changes are buffered */

 

 // always call in context of main thread

-static void __fastcall SetStatusIcon(HCONTACT hContact,int countryNumber)

+static void __fastcall SetStatusIcon(MCONTACT hContact,int countryNumber)

 {

 	StatusIconData sid = { sizeof(sid) };

 	sid.szModule = MODULENAME;

@@ -106,7 +106,7 @@ static void __fastcall SetStatusIcon(HCONTACT hContact,int countryNumber)
 }

 

 // always call in context of main thread

-static void __fastcall UnsetStatusIcon(HCONTACT hContact)

+static void __fastcall UnsetStatusIcon(MCONTACT hContact)

 {

 	StatusIconData sid = { sizeof(sid) };

 	sid.szModule = MODULENAME;

@@ -167,7 +167,7 @@ static int ExtraImgSettingChanged(WPARAM wParam,LPARAM lParam)
 		/* user details update */

 		if (!lstrcmpA(dbcws->szSetting,"RealIP") || !lstrcmpA(dbcws->szSetting,"Country") || !lstrcmpA(dbcws->szSetting,"CompanyCountry")) {

 			/* Extra Image */

-			SetExtraImage((HCONTACT)wParam);

+			SetExtraImage((MCONTACT)wParam);

 			/* Status Icon */

 			if (ServiceExists(MS_MSG_REMOVEICON))

 				CallFunctionBuffered(UpdateStatusIcons,0,FALSE,STATUSICON_REFRESHDELAY);