From d9c98bcdfca6da51a1a82dc6c0dc5996b3b6cd6d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 30 Nov 2014 21:20:14 +0000
Subject: new sorting functions applied

git-svn-id: http://svn.miranda-ng.org/main/trunk@11180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/CountryFlags/src/extraimg.cpp   |  2 +-
 plugins/CountryFlags/src/ip2country.cpp | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'plugins/CountryFlags/src')

diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp
index 0e42d64b7e..9e9d0dd307 100644
--- a/plugins/CountryFlags/src/extraimg.cpp
+++ b/plugins/CountryFlags/src/extraimg.cpp
@@ -165,7 +165,7 @@ static int ExtraImgSettingChanged(WPARAM hContact, LPARAM lParam)
 	DBCONTACTWRITESETTING *dbcws = (DBCONTACTWRITESETTING*)lParam;
 	if (hContact) {
 		/* user details update */
-		if (!lstrcmpA(dbcws->szSetting,"RealIP") || !lstrcmpA(dbcws->szSetting,"Country") || !lstrcmpA(dbcws->szSetting,"CompanyCountry")) {
+		if (!mir_strcmp(dbcws->szSetting,"RealIP") || !mir_strcmp(dbcws->szSetting,"Country") || !mir_strcmp(dbcws->szSetting,"CompanyCountry")) {
 			/* Extra Image */
 			SetExtraImage(hContact);
 			/* Status Icon */
diff --git a/plugins/CountryFlags/src/ip2country.cpp b/plugins/CountryFlags/src/ip2country.cpp
index b47ab8ded7..811c66f759 100644
--- a/plugins/CountryFlags/src/ip2country.cpp
+++ b/plugins/CountryFlags/src/ip2country.cpp
@@ -207,34 +207,34 @@ static int EnumIpDataLines(const char *pszFileCSV,const char *pszFileOut)
 			buf=strchr(pszCountry,'"');
 			*buf=pszTwo[2]='\0';
 			/* corrections */
-			if (!lstrcmpi(pszCountry,"ANTARCTICA")) continue;
-			if (!lstrcmpi(pszCountry,"TIMOR-LESTE")) continue;
-			if (!lstrcmpi(pszCountry,"PALESTINIAN TERRITORY, OCCUPIED"))
+			if (!mir_tstrcmpi(pszCountry,"ANTARCTICA")) continue;
+			if (!mir_tstrcmpi(pszCountry,"TIMOR-LESTE")) continue;
+			if (!mir_tstrcmpi(pszCountry,"PALESTINIAN TERRITORY, OCCUPIED"))
 				mir_tstrcpy(pszCountry,"ISRAEL");
-			else if (!lstrcmpi(pszCountry,"UNITED STATES MINOR OUTLYING ISLANDS"))
+			else if (!mir_tstrcmpi(pszCountry,"UNITED STATES MINOR OUTLYING ISLANDS"))
 				mir_tstrcpy(pszCountry,"UNITED STATES");
-			else if (!lstrcmpi(pszCountry,"SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS"))
+			else if (!mir_tstrcmpi(pszCountry,"SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS"))
 				mir_tstrcpy(pszCountry,"UNITED KINGDOM");
-			else if (!lstrcmpi(pszTwo,"JE")) /* map error */
+			else if (!mir_tstrcmpi(pszTwo,"JE")) /* map error */
 				mir_tstrcpy(pszCountry,"UNITED KINGDOM");
-			else if (!lstrcmpi(pszTwo,"AX")) /* Åland Island belongs to Finland */
+			else if (!mir_tstrcmpi(pszTwo,"AX")) /* Åland Island belongs to Finland */
 				mir_tstrcpy(pszCountry,"FINLAND");
-			else if (!lstrcmpi(pszTwo,"ME"))
+			else if (!mir_tstrcmpi(pszTwo,"ME"))
 				mir_tstrcpy(pszCountry,"MONTENEGRO");
-			else if (!lstrcmpi(pszTwo,"RS") || !lstrcmpi(pszTwo,"CS"))
+			else if (!mir_tstrcmpi(pszTwo,"RS") || !mir_tstrcmpi(pszTwo,"CS"))
 				mir_tstrcpy(pszCountry,"SERBIA");
 			/* convert */
 			for(i=0;i<nCountriesCount;i++) {
 				/* map different writings */
 				for(j=0;j<SIZEOF(differentCountryNames);j++)
-					if (!lstrcmpi(countries[i].szName,differentCountryNames[j].szMir)) {
+					if (!mir_tstrcmpi(countries[i].szName,differentCountryNames[j].szMir)) {
 						buf=(char*)differentCountryNames[j].szCSV;
 						break;
 					}
 				if (j == SIZEOF(differentCountryNames))
 					buf=(char*)countries[i].szName;
 				/* check country */
-				if (!lstrcmpiA(pszCountry,buf)) {
+				if (!mir_strcmpi(pszCountry,buf)) {
 					dwOut=(DWORD)atoi(pszFrom);
 					AppendToByteBuffer(&buffer,(void*)&dwOut,sizeof(DWORD));
 					dwOut=(DWORD)atoi(pszTo);
-- 
cgit v1.2.3