diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-07-27 14:23:31 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-07-27 14:23:31 +0000 |
| commit | 2f261839b60692e33d0e160344d0d636d49c90ba (patch) | |
| tree | 187921722698b681d29df3f6e60fb18394a5e9d5 /plugins/CountryFlags | |
| parent | 2e931a0b2780587d85f3902468c935f5adba70c8 (diff) | |
less TCHARs
git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/CountryFlags')
| -rw-r--r-- | plugins/CountryFlags/src/ip2country.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/plugins/CountryFlags/src/ip2country.cpp b/plugins/CountryFlags/src/ip2country.cpp index 261f91aaa2..b3411d8ec9 100644 --- a/plugins/CountryFlags/src/ip2country.cpp +++ b/plugins/CountryFlags/src/ip2country.cpp @@ -207,27 +207,27 @@ static int EnumIpDataLines(const char *pszFileCSV,const char *pszFileOut) buf=strchr(pszCountry,'"');
*buf=pszTwo[2]='\0';
/* corrections */
- 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 (!mir_tstrcmpi(pszCountry,"UNITED STATES MINOR OUTLYING ISLANDS"))
- mir_tstrcpy(pszCountry,"UNITED STATES");
- else if (!mir_tstrcmpi(pszCountry,"SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS"))
- mir_tstrcpy(pszCountry,"UNITED KINGDOM");
- else if (!mir_tstrcmpi(pszTwo,"JE")) /* map error */
- mir_tstrcpy(pszCountry,"UNITED KINGDOM");
- else if (!mir_tstrcmpi(pszTwo,"AX")) /* Åland Island belongs to Finland */
- mir_tstrcpy(pszCountry,"FINLAND");
- else if (!mir_tstrcmpi(pszTwo,"ME"))
- mir_tstrcpy(pszCountry,"MONTENEGRO");
- else if (!mir_tstrcmpi(pszTwo,"RS") || !mir_tstrcmpi(pszTwo,"CS"))
- mir_tstrcpy(pszCountry,"SERBIA");
+ if (!mir_wstrcmpi(pszCountry,"ANTARCTICA")) continue;
+ if (!mir_wstrcmpi(pszCountry,"TIMOR-LESTE")) continue;
+ if (!mir_wstrcmpi(pszCountry,"PALESTINIAN TERRITORY, OCCUPIED"))
+ mir_wstrcpy(pszCountry,"ISRAEL");
+ else if (!mir_wstrcmpi(pszCountry,"UNITED STATES MINOR OUTLYING ISLANDS"))
+ mir_wstrcpy(pszCountry,"UNITED STATES");
+ else if (!mir_wstrcmpi(pszCountry,"SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS"))
+ mir_wstrcpy(pszCountry,"UNITED KINGDOM");
+ else if (!mir_wstrcmpi(pszTwo,"JE")) /* map error */
+ mir_wstrcpy(pszCountry,"UNITED KINGDOM");
+ else if (!mir_wstrcmpi(pszTwo,"AX")) /* Åland Island belongs to Finland */
+ mir_wstrcpy(pszCountry,"FINLAND");
+ else if (!mir_wstrcmpi(pszTwo,"ME"))
+ mir_wstrcpy(pszCountry,"MONTENEGRO");
+ else if (!mir_wstrcmpi(pszTwo,"RS") || !mir_wstrcmpi(pszTwo,"CS"))
+ mir_wstrcpy(pszCountry,"SERBIA");
/* convert */
for(i=0;i<nCountriesCount;i++) {
/* map different writings */
for(j=0;j<_countof(differentCountryNames);j++)
- if (!mir_tstrcmpi(countries[i].szName,differentCountryNames[j].szMir)) {
+ if (!mir_wstrcmpi(countries[i].szName,differentCountryNames[j].szMir)) {
buf=(char*)differentCountryNames[j].szCSV;
break;
}
|