[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [libkexiv2/frameworks] /: pure Qt5 and pure KF5
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2014-11-30 22:58:03
Message-ID: E1XvDRL-0003nk-HP () scm ! kde ! org
[Download RAW message or body]
Git commit e94d15929cb117632a10989648101d4df374f4da by Gilles Caulier.
Committed on 30/11/2014 at 22:57.
Pushed by cgilles into branch 'frameworks'.
pure Qt5 and pure KF5
M +1 -1 CMakeLists.txt
M +178 -178 src/altlangstredit.cpp
M +253 -253 src/countryselector.cpp
M +27 -27 src/subjectwidget.cpp
M +1 -1 tests/setiptcpreview.cpp
M +33 -31 tests/setxmpface.cpp
M +1 -1 tests/usexmpsidecar.cpp
http://commits.kde.org/libkexiv2/e94d15929cb117632a10989648101d4df374f4da
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 265769d..2b4dffb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,7 @@ ecm_setup_version(${LIBKEXIV2_LIB_VERSION}
############## Targets #########################
-remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII) # TODO just for \
porting, remove +#remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII) # \
TODO just for porting, remove
add_definitions(-DTRANSLATION_DOMAIN=\"libkexiv2\")
diff --git a/src/altlangstredit.cpp b/src/altlangstredit.cpp
index 65b40b8..bd545aa 100644
--- a/src/altlangstredit.cpp
+++ b/src/altlangstredit.cpp
@@ -59,188 +59,188 @@ public:
delValueButton = 0;
languageCB = 0;
linesVisible = 0;
- currentLanguage = "x-default";
+ currentLanguage = QString::fromLatin1("x-default");
// We cannot use KLocale::allLanguagesList() here because KDE only
// support 2 characters country codes. XMP require 2+2 characters \
language+country
// following ISO 3066 \
(http://babelwiki.babelzilla.org/index.php?title=Language_codes)
// The first one from the list is the Default Language code specified by XMP \
paper
- languageCodeMap.insert( "x-default", i18n("Default Language") );
+ languageCodeMap.insert( QString::fromLatin1("x-default"), i18n("Default \
Language") );
// Standard ISO 3066 country codes.
- languageCodeMap.insert( "af-ZA", i18n("Afrikaans (South Africa)") );
- languageCodeMap.insert( "am-ET", i18n("Amharic (Ethiopia)") );
- languageCodeMap.insert( "ar-AE", i18n("Arabic (UAE)") );
- languageCodeMap.insert( "ar-BH", i18n("Arabic (Bahrain)") );
- languageCodeMap.insert( "ar-DZ", i18n("Arabic (Algeria)") );
- languageCodeMap.insert( "ar-EG", i18n("Arabic (Egypt)") );
- languageCodeMap.insert( "ar-IQ", i18n("Arabic (Iraq)") );
- languageCodeMap.insert( "ar-JO", i18n("Arabic (Jordan)") );
- languageCodeMap.insert( "ar-KW", i18n("Arabic (Kuwait)") );
- languageCodeMap.insert( "ar-LB", i18n("Arabic (Lebanon)") );
- languageCodeMap.insert( "ar-LY", i18n("Arabic (Libya)") );
- languageCodeMap.insert( "ar-MA", i18n("Arabic (Morocco)") );
- languageCodeMap.insert( "ar-OM", i18n("Arabic (Oman)") );
- languageCodeMap.insert( "ar-QA", i18n("Arabic (Qatar)") );
- languageCodeMap.insert( "ar-SA", i18n("Arabic (Saudi Arabia)") );
- languageCodeMap.insert( "ar-SY", i18n("Arabic (Syria)") );
- languageCodeMap.insert( "ar-TN", i18n("Arabic (Tunisia)") );
- languageCodeMap.insert( "ar-YE", i18n("Arabic (Yemen)") );
- languageCodeMap.insert( "as-IN", i18n("Assamese (India)") );
- languageCodeMap.insert( "ba-RU", i18n("Bashkir (Russia)") );
- languageCodeMap.insert( "be-BY", i18n("Belarusian (Belarus)") );
- languageCodeMap.insert( "bg-BG", i18n("Bulgarian (Bulgaria)") );
- languageCodeMap.insert( "bn-IN", i18n("Bengali (India)") );
- languageCodeMap.insert( "bo-BT", i18n("Tibetan (Bhutan)") );
- languageCodeMap.insert( "bo-CN", i18n("Tibetan (PRC)") );
- languageCodeMap.insert( "br-FR", i18n("Breton (France)") );
- languageCodeMap.insert( "ca-AD", i18n("Catalan (Andorra)") );
- languageCodeMap.insert( "ca-ES", i18n("Catalan (Spain)") );
- languageCodeMap.insert( "ca-FR", i18n("Catalan (France)") );
- languageCodeMap.insert( "co-FR", i18n("Corsican (France)") );
- languageCodeMap.insert( "cs-CZ", i18n("Czech (Czech Republic)") );
- languageCodeMap.insert( "cy-GB", i18n("Welsh (United Kingdom)") );
- languageCodeMap.insert( "da-DK", i18n("Danish (Denmark)") );
- languageCodeMap.insert( "de-AT", i18n("German (Austria)") );
- languageCodeMap.insert( "de-CH", i18n("German (Switzerland)") );
- languageCodeMap.insert( "de-DE", i18n("German (Germany)") );
- languageCodeMap.insert( "de-LI", i18n("German (Liechtenstein)") );
- languageCodeMap.insert( "de-LU", i18n("German (Luxembourg)") );
- languageCodeMap.insert( "el-GR", i18n("Greek (Greece)") );
- languageCodeMap.insert( "en-AU", i18n("English (Australia)") );
- languageCodeMap.insert( "en-BZ", i18n("English (Belize)") );
- languageCodeMap.insert( "en-CA", i18n("English (Canada)") );
- languageCodeMap.insert( "en-CB", i18n("English (Caribbean)") );
- languageCodeMap.insert( "en-GB", i18n("English (United Kingdom)") );
- languageCodeMap.insert( "en-IE", i18n("English (Ireland)") );
- languageCodeMap.insert( "en-IN", i18n("English (India)") );
- languageCodeMap.insert( "en-JA", i18n("English (Jamaica)") );
- languageCodeMap.insert( "en-MY", i18n("English (Malaysia)") );
- languageCodeMap.insert( "en-NZ", i18n("English (New Zealand)") );
- languageCodeMap.insert( "en-PH", i18n("English (Philippines)") );
- languageCodeMap.insert( "en-SG", i18n("English (Singapore)") );
- languageCodeMap.insert( "en-TT", i18n("English (Trinidad)") );
- languageCodeMap.insert( "en-US", i18n("English (United States)") );
- languageCodeMap.insert( "en-ZA", i18n("English (South Africa)") );
- languageCodeMap.insert( "en-ZW", i18n("English (Zimbabwe)") );
- languageCodeMap.insert( "es-AR", i18n("Spanish (Argentina)") );
- languageCodeMap.insert( "es-BO", i18n("Spanish (Bolivia)") );
- languageCodeMap.insert( "es-CL", i18n("Spanish (Chile)") );
- languageCodeMap.insert( "es-CO", i18n("Spanish (Colombia)") );
- languageCodeMap.insert( "es-CR", i18n("Spanish (Costa Rica)") );
- languageCodeMap.insert( "es-DO", i18n("Spanish (Dominican Republic)") );
- languageCodeMap.insert( "es-EC", i18n("Spanish (Ecuador)") );
- languageCodeMap.insert( "es-ES", i18n("Spanish (Spain)") );
- languageCodeMap.insert( "es-GT", i18n("Spanish (Guatemala)") );
- languageCodeMap.insert( "es-HN", i18n("Spanish (Honduras)") );
- languageCodeMap.insert( "es-MX", i18n("Spanish (Mexico)") );
- languageCodeMap.insert( "es-NI", i18n("Spanish (Nicaragua)") );
- languageCodeMap.insert( "es-PA", i18n("Spanish (Panama)") );
- languageCodeMap.insert( "es-PE", i18n("Spanish (Peru)") );
- languageCodeMap.insert( "es-PR", i18n("Spanish (Puerto Rico)") );
- languageCodeMap.insert( "es-PY", i18n("Spanish (Paraguay)") );
- languageCodeMap.insert( "es-SV", i18n("Spanish (El Salvador)") );
- languageCodeMap.insert( "es-UR", i18n("Spanish (Uruguay)") );
- languageCodeMap.insert( "es-US", i18n("Spanish (United States)") );
- languageCodeMap.insert( "es-VE", i18n("Spanish (Venezuela)") );
- languageCodeMap.insert( "et-EE", i18n("Estonian (Estonia)") );
- languageCodeMap.insert( "eu-ES", i18n("Basque (Basque Country)") );
- languageCodeMap.insert( "fa-IR", i18n("Persian (Iran)") );
- languageCodeMap.insert( "fi-FI", i18n("Finnish (Finland)") );
- languageCodeMap.insert( "fo-FO", i18n("Faeroese (Faero Islands)") );
- languageCodeMap.insert( "fr-BE", i18n("French (Belgium)") );
- languageCodeMap.insert( "fr-CA", i18n("French (Canada)") );
- languageCodeMap.insert( "fr-CH", i18n("French (Switzerland)") );
- languageCodeMap.insert( "fr-FR", i18n("French (France)") );
- languageCodeMap.insert( "fr-LU", i18n("French (Luxembourg)") );
- languageCodeMap.insert( "fr-MC", i18n("French (Monaco)") );
- languageCodeMap.insert( "fy-NL", i18n("Frisian (Netherlands)") );
- languageCodeMap.insert( "ga-IE", i18n("Irish (Ireland)") );
- languageCodeMap.insert( "gl-ES", i18n("Galician (Galicia)") );
- languageCodeMap.insert( "gu-IN", i18n("Gujarati (India)") );
- languageCodeMap.insert( "he-IL", i18n("Hebrew (Israel)") );
- languageCodeMap.insert( "hi-IN", i18n("Hindi (India)") );
- languageCodeMap.insert( "hr-BA", i18n("Croatian (Bosnia and Herzegovina, \
Latin)") );
- languageCodeMap.insert( "hr-HR", i18n("Croatian (Croatia)") );
- languageCodeMap.insert( "hu-HU", i18n("Hungarian (Hungary)") );
- languageCodeMap.insert( "hy-AM", i18n("Armenian (Armenia)") );
- languageCodeMap.insert( "id-ID", i18n("(Indonesian)") );
- languageCodeMap.insert( "ii-CN", i18n("Yi (PRC)") );
- languageCodeMap.insert( "is-IS", i18n("Icelandic (Iceland)") );
- languageCodeMap.insert( "it-CH", i18n("Italian (Switzerland)") );
- languageCodeMap.insert( "it-IT", i18n("Italian (Italy)") );
- languageCodeMap.insert( "ja-JP", i18n("Japanese (Japan)") );
- languageCodeMap.insert( "ka-GE", i18n("Georgian (Georgia)") );
- languageCodeMap.insert( "kk-KZ", i18n("Kazakh (Kazakhstan)") );
- languageCodeMap.insert( "kl-GL", i18n("Greenlandic (Greenland)") );
- languageCodeMap.insert( "km-KH", i18n("Khmer (Cambodia)") );
- languageCodeMap.insert( "kn-IN", i18n("Kannada (India)") );
- languageCodeMap.insert( "ko-KR", i18n("Korean (South Korea)") );
- languageCodeMap.insert( "ky-KG", i18n("Kyrgyz (Kyrgyzstan)") );
- languageCodeMap.insert( "lb-LU", i18n("Luxembourgish (Luxembourg)") );
- languageCodeMap.insert( "lo-LA", i18n("Lao (Lao PDR)") );
- languageCodeMap.insert( "lt-LT", i18n("Lithuanian (Lithuania)") );
- languageCodeMap.insert( "lv-LV", i18n("Latvian (Latvia)") );
- languageCodeMap.insert( "mi-NZ", i18n("Maori (New Zealand)") );
- languageCodeMap.insert( "mk-MK", i18n("Macedonian (Macedonia)") );
- languageCodeMap.insert( "ml-IN", i18n("Malayalam (India)") );
- languageCodeMap.insert( "mn-CN", i18n("Mongolian (PRC)") );
- languageCodeMap.insert( "mn-MN", i18n("Mongolian (Mongolia)") );
- languageCodeMap.insert( "mr-IN", i18n("Marathi (India)") );
- languageCodeMap.insert( "ms-BN", i18n("Malay (Brunei Darussalam)") );
- languageCodeMap.insert( "ms-MY", i18n("Malay (Malaysia)") );
- languageCodeMap.insert( "mt-MT", i18n("Maltese (Malta)") );
- languageCodeMap.insert( "nb-NO", i18n("Norwegian Bokmål (Norway)") );
- languageCodeMap.insert( "ne-NP", i18n("Nepali (Nepal)") );
- languageCodeMap.insert( "nl-BE", i18n("Dutch (Belgium)") );
- languageCodeMap.insert( "nl-NL", i18n("Dutch (Netherlands)") );
- languageCodeMap.insert( "nn-NO", i18n("Norwegian Nynorsk (Norway)") );
- languageCodeMap.insert( "ns-ZA", i18n("Sesotho sa Leboa (South Africa)") );
- languageCodeMap.insert( "oc-FR", i18n("Occitan (France)") );
- languageCodeMap.insert( "or-IN", i18n("Oriya (India)") );
- languageCodeMap.insert( "pa-IN", i18n("Punjabi (India)") );
- languageCodeMap.insert( "pl-PL", i18n("Polish (Poland)") );
- languageCodeMap.insert( "ps-AF", i18n("Pashto (Afghanistan)") );
- languageCodeMap.insert( "pt-BR", i18n("Portuguese (Brazil)") );
- languageCodeMap.insert( "pt-PT", i18n("Portuguese (Portugal)") );
- languageCodeMap.insert( "rm-CH", i18n("Romansh (Switzerland)") );
- languageCodeMap.insert( "ro-RO", i18n("Romanian (Romania)") );
- languageCodeMap.insert( "ru-RU", i18n("Russian (Russia)") );
- languageCodeMap.insert( "rw-RW", i18n("Kinyarwanda (Rwanda)") );
- languageCodeMap.insert( "sa-IN", i18n("Sanskrit (India)") );
- languageCodeMap.insert( "se-FI", i18n("Sami (Northern, Finland)") );
- languageCodeMap.insert( "se-NO", i18n("Sami (Northern, Norway)") );
- languageCodeMap.insert( "se-SE", i18n("Sami (Northern, Sweden)") );
- languageCodeMap.insert( "si-LK", i18n("Sinhala (Sri Lanka)") );
- languageCodeMap.insert( "sk-SK", i18n("Slovak (Slovakia)") );
- languageCodeMap.insert( "sl-SI", i18n("Slovenian (Slovenia)") );
- languageCodeMap.insert( "sq-AL", i18n("Albanian (Albania)") );
- languageCodeMap.insert( "sv-FI", i18n("Swedish (Finland)") );
- languageCodeMap.insert( "sv-SE", i18n("Swedish (Sweden)") );
- languageCodeMap.insert( "sw-KE", i18n("Swahili (Kenya)") );
- languageCodeMap.insert( "ta-IN", i18n("Tamil (India)") );
- languageCodeMap.insert( "te-IN", i18n("Telugu (India)") );
- languageCodeMap.insert( "th-TH", i18n("Thai (Thailand)") );
- languageCodeMap.insert( "tk-TM", i18n("Turkmen (Turkmenistan)") );
- languageCodeMap.insert( "tn-ZA", i18n("Setswana Tswana (South Africa)") );
- languageCodeMap.insert( "tr-IN", i18n("Urdu (India)") );
- languageCodeMap.insert( "tr-TR", i18n("Turkish (Turkey)") );
- languageCodeMap.insert( "tt-RU", i18n("Tatar (Russia)") );
- languageCodeMap.insert( "ug-CN", i18n("Uighur (PRC)") );
- languageCodeMap.insert( "uk-UA", i18n("Ukrainian (Ukraine)") );
- languageCodeMap.insert( "ur-PK", i18n("Urdu (Pakistan)") );
- languageCodeMap.insert( "vi-VN", i18n("Vietnamese (Vietnam)") );
- languageCodeMap.insert( "wo-SN", i18n("Wolof (Senegal)") );
- languageCodeMap.insert( "xh-ZA", i18n("isiXhosa Xhosa (South Africa)") );
- languageCodeMap.insert( "yo-NG", i18n("Yoruba (Nigeria)") );
- languageCodeMap.insert( "zh-CN", i18n("Chinese (PRC)") );
- languageCodeMap.insert( "zh-HK", i18n("Chinese (Hong Kong SAR, PRC)") );
- languageCodeMap.insert( "zh-MO", i18n("Chinese (Macao SAR)") );
- languageCodeMap.insert( "zh-SG", i18n("Chinese (Singapore)") );
- languageCodeMap.insert( "zh-TW", i18n("Chinese (Taiwan)") );
- languageCodeMap.insert( "zu-ZA", i18n("isiZulu Zulu (South Africa)") );
+ languageCodeMap.insert( QString::fromLatin1("af-ZA"), i18n("Afrikaans (South \
Africa)") ); + languageCodeMap.insert( QString::fromLatin1("am-ET"), \
i18n("Amharic (Ethiopia)") ); + languageCodeMap.insert( \
QString::fromLatin1("ar-AE"), i18n("Arabic (UAE)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-BH"), i18n("Arabic (Bahrain)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-DZ"), i18n("Arabic (Algeria)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-EG"), i18n("Arabic (Egypt)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-IQ"), i18n("Arabic (Iraq)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-JO"), i18n("Arabic (Jordan)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-KW"), i18n("Arabic (Kuwait)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-LB"), i18n("Arabic (Lebanon)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-LY"), i18n("Arabic (Libya)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-MA"), i18n("Arabic (Morocco)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-OM"), i18n("Arabic (Oman)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-QA"), i18n("Arabic (Qatar)") ); + \
languageCodeMap.insert( QString::fromLatin1("ar-SA"), i18n("Arabic (Saudi Arabia)") \
); + languageCodeMap.insert( QString::fromLatin1("ar-SY"), i18n("Arabic \
(Syria)") ); + languageCodeMap.insert( QString::fromLatin1("ar-TN"), \
i18n("Arabic (Tunisia)") ); + languageCodeMap.insert( \
QString::fromLatin1("ar-YE"), i18n("Arabic (Yemen)") ); + \
languageCodeMap.insert( QString::fromLatin1("as-IN"), i18n("Assamese (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("ba-RU"), i18n("Bashkir (Russia)") ); + \
languageCodeMap.insert( QString::fromLatin1("be-BY"), i18n("Belarusian (Belarus)") ); \
+ languageCodeMap.insert( QString::fromLatin1("bg-BG"), i18n("Bulgarian \
(Bulgaria)") ); + languageCodeMap.insert( QString::fromLatin1("bn-IN"), \
i18n("Bengali (India)") ); + languageCodeMap.insert( \
QString::fromLatin1("bo-BT"), i18n("Tibetan (Bhutan)") ); + \
languageCodeMap.insert( QString::fromLatin1("bo-CN"), i18n("Tibetan (PRC)") ); + \
languageCodeMap.insert( QString::fromLatin1("br-FR"), i18n("Breton (France)") ); + \
languageCodeMap.insert( QString::fromLatin1("ca-AD"), i18n("Catalan (Andorra)") ); + \
languageCodeMap.insert( QString::fromLatin1("ca-ES"), i18n("Catalan (Spain)") ); + \
languageCodeMap.insert( QString::fromLatin1("ca-FR"), i18n("Catalan (France)") ); + \
languageCodeMap.insert( QString::fromLatin1("co-FR"), i18n("Corsican (France)") ); + \
languageCodeMap.insert( QString::fromLatin1("cs-CZ"), i18n("Czech (Czech Republic)") \
); + languageCodeMap.insert( QString::fromLatin1("cy-GB"), i18n("Welsh (United \
Kingdom)") ); + languageCodeMap.insert( QString::fromLatin1("da-DK"), \
i18n("Danish (Denmark)") ); + languageCodeMap.insert( \
QString::fromLatin1("de-AT"), i18n("German (Austria)") ); + \
languageCodeMap.insert( QString::fromLatin1("de-CH"), i18n("German (Switzerland)") ); \
+ languageCodeMap.insert( QString::fromLatin1("de-DE"), i18n("German \
(Germany)") ); + languageCodeMap.insert( QString::fromLatin1("de-LI"), \
i18n("German (Liechtenstein)") ); + languageCodeMap.insert( \
QString::fromLatin1("de-LU"), i18n("German (Luxembourg)") ); + \
languageCodeMap.insert( QString::fromLatin1("el-GR"), i18n("Greek (Greece)") ); + \
languageCodeMap.insert( QString::fromLatin1("en-AU"), i18n("English (Australia)") ); \
+ languageCodeMap.insert( QString::fromLatin1("en-BZ"), i18n("English \
(Belize)") ); + languageCodeMap.insert( QString::fromLatin1("en-CA"), \
i18n("English (Canada)") ); + languageCodeMap.insert( \
QString::fromLatin1("en-CB"), i18n("English (Caribbean)") ); + \
languageCodeMap.insert( QString::fromLatin1("en-GB"), i18n("English (United \
Kingdom)") ); + languageCodeMap.insert( QString::fromLatin1("en-IE"), \
i18n("English (Ireland)") ); + languageCodeMap.insert( \
QString::fromLatin1("en-IN"), i18n("English (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("en-JA"), i18n("English (Jamaica)") ); + \
languageCodeMap.insert( QString::fromLatin1("en-MY"), i18n("English (Malaysia)") ); + \
languageCodeMap.insert( QString::fromLatin1("en-NZ"), i18n("English (New Zealand)") \
); + languageCodeMap.insert( QString::fromLatin1("en-PH"), i18n("English \
(Philippines)") ); + languageCodeMap.insert( QString::fromLatin1("en-SG"), \
i18n("English (Singapore)") ); + languageCodeMap.insert( \
QString::fromLatin1("en-TT"), i18n("English (Trinidad)") ); + \
languageCodeMap.insert( QString::fromLatin1("en-US"), i18n("English (United States)") \
); + languageCodeMap.insert( QString::fromLatin1("en-ZA"), i18n("English \
(South Africa)") ); + languageCodeMap.insert( QString::fromLatin1("en-ZW"), \
i18n("English (Zimbabwe)") ); + languageCodeMap.insert( \
QString::fromLatin1("es-AR"), i18n("Spanish (Argentina)") ); + \
languageCodeMap.insert( QString::fromLatin1("es-BO"), i18n("Spanish (Bolivia)") ); + \
languageCodeMap.insert( QString::fromLatin1("es-CL"), i18n("Spanish (Chile)") ); + \
languageCodeMap.insert( QString::fromLatin1("es-CO"), i18n("Spanish (Colombia)") ); + \
languageCodeMap.insert( QString::fromLatin1("es-CR"), i18n("Spanish (Costa Rica)") ); \
+ languageCodeMap.insert( QString::fromLatin1("es-DO"), i18n("Spanish \
(Dominican Republic)") ); + languageCodeMap.insert( \
QString::fromLatin1("es-EC"), i18n("Spanish (Ecuador)") ); + \
languageCodeMap.insert( QString::fromLatin1("es-ES"), i18n("Spanish (Spain)") ); + \
languageCodeMap.insert( QString::fromLatin1("es-GT"), i18n("Spanish (Guatemala)") ); \
+ languageCodeMap.insert( QString::fromLatin1("es-HN"), i18n("Spanish \
(Honduras)") ); + languageCodeMap.insert( QString::fromLatin1("es-MX"), \
i18n("Spanish (Mexico)") ); + languageCodeMap.insert( \
QString::fromLatin1("es-NI"), i18n("Spanish (Nicaragua)") ); + \
languageCodeMap.insert( QString::fromLatin1("es-PA"), i18n("Spanish (Panama)") ); + \
languageCodeMap.insert( QString::fromLatin1("es-PE"), i18n("Spanish (Peru)") ); + \
languageCodeMap.insert( QString::fromLatin1("es-PR"), i18n("Spanish (Puerto Rico)") \
); + languageCodeMap.insert( QString::fromLatin1("es-PY"), i18n("Spanish \
(Paraguay)") ); + languageCodeMap.insert( QString::fromLatin1("es-SV"), \
i18n("Spanish (El Salvador)") ); + languageCodeMap.insert( \
QString::fromLatin1("es-UR"), i18n("Spanish (Uruguay)") ); + \
languageCodeMap.insert( QString::fromLatin1("es-US"), i18n("Spanish (United States)") \
); + languageCodeMap.insert( QString::fromLatin1("es-VE"), i18n("Spanish \
(Venezuela)") ); + languageCodeMap.insert( QString::fromLatin1("et-EE"), \
i18n("Estonian (Estonia)") ); + languageCodeMap.insert( \
QString::fromLatin1("eu-ES"), i18n("Basque (Basque Country)") ); + \
languageCodeMap.insert( QString::fromLatin1("fa-IR"), i18n("Persian (Iran)") ); + \
languageCodeMap.insert( QString::fromLatin1("fi-FI"), i18n("Finnish (Finland)") ); + \
languageCodeMap.insert( QString::fromLatin1("fo-FO"), i18n("Faeroese (Faero \
Islands)") ); + languageCodeMap.insert( QString::fromLatin1("fr-BE"), \
i18n("French (Belgium)") ); + languageCodeMap.insert( \
QString::fromLatin1("fr-CA"), i18n("French (Canada)") ); + \
languageCodeMap.insert( QString::fromLatin1("fr-CH"), i18n("French (Switzerland)") ); \
+ languageCodeMap.insert( QString::fromLatin1("fr-FR"), i18n("French \
(France)") ); + languageCodeMap.insert( QString::fromLatin1("fr-LU"), \
i18n("French (Luxembourg)") ); + languageCodeMap.insert( \
QString::fromLatin1("fr-MC"), i18n("French (Monaco)") ); + \
languageCodeMap.insert( QString::fromLatin1("fy-NL"), i18n("Frisian (Netherlands)") \
); + languageCodeMap.insert( QString::fromLatin1("ga-IE"), i18n("Irish \
(Ireland)") ); + languageCodeMap.insert( QString::fromLatin1("gl-ES"), \
i18n("Galician (Galicia)") ); + languageCodeMap.insert( \
QString::fromLatin1("gu-IN"), i18n("Gujarati (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("he-IL"), i18n("Hebrew (Israel)") ); + \
languageCodeMap.insert( QString::fromLatin1("hi-IN"), i18n("Hindi (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("hr-BA"), i18n("Croatian (Bosnia and \
Herzegovina, Latin)") ); + languageCodeMap.insert( \
QString::fromLatin1("hr-HR"), i18n("Croatian (Croatia)") ); + \
languageCodeMap.insert( QString::fromLatin1("hu-HU"), i18n("Hungarian (Hungary)") ); \
+ languageCodeMap.insert( QString::fromLatin1("hy-AM"), i18n("Armenian \
(Armenia)") ); + languageCodeMap.insert( QString::fromLatin1("id-ID"), \
i18n("(Indonesian)") ); + languageCodeMap.insert( \
QString::fromLatin1("ii-CN"), i18n("Yi (PRC)") ); + languageCodeMap.insert( \
QString::fromLatin1("is-IS"), i18n("Icelandic (Iceland)") ); + \
languageCodeMap.insert( QString::fromLatin1("it-CH"), i18n("Italian (Switzerland)") \
); + languageCodeMap.insert( QString::fromLatin1("it-IT"), i18n("Italian \
(Italy)") ); + languageCodeMap.insert( QString::fromLatin1("ja-JP"), \
i18n("Japanese (Japan)") ); + languageCodeMap.insert( \
QString::fromLatin1("ka-GE"), i18n("Georgian (Georgia)") ); + \
languageCodeMap.insert( QString::fromLatin1("kk-KZ"), i18n("Kazakh (Kazakhstan)") ); \
+ languageCodeMap.insert( QString::fromLatin1("kl-GL"), i18n("Greenlandic \
(Greenland)") ); + languageCodeMap.insert( QString::fromLatin1("km-KH"), \
i18n("Khmer (Cambodia)") ); + languageCodeMap.insert( \
QString::fromLatin1("kn-IN"), i18n("Kannada (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("ko-KR"), i18n("Korean (South Korea)") ); \
+ languageCodeMap.insert( QString::fromLatin1("ky-KG"), i18n("Kyrgyz \
(Kyrgyzstan)") ); + languageCodeMap.insert( QString::fromLatin1("lb-LU"), \
i18n("Luxembourgish (Luxembourg)") ); + languageCodeMap.insert( \
QString::fromLatin1("lo-LA"), i18n("Lao (Lao PDR)") ); + \
languageCodeMap.insert( QString::fromLatin1("lt-LT"), i18n("Lithuanian (Lithuania)") \
); + languageCodeMap.insert( QString::fromLatin1("lv-LV"), i18n("Latvian \
(Latvia)") ); + languageCodeMap.insert( QString::fromLatin1("mi-NZ"), \
i18n("Maori (New Zealand)") ); + languageCodeMap.insert( \
QString::fromLatin1("mk-MK"), i18n("Macedonian (Macedonia)") ); + \
languageCodeMap.insert( QString::fromLatin1("ml-IN"), i18n("Malayalam (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("mn-CN"), i18n("Mongolian (PRC)") ); + \
languageCodeMap.insert( QString::fromLatin1("mn-MN"), i18n("Mongolian (Mongolia)") ); \
+ languageCodeMap.insert( QString::fromLatin1("mr-IN"), i18n("Marathi \
(India)") ); + languageCodeMap.insert( QString::fromLatin1("ms-BN"), \
i18n("Malay (Brunei Darussalam)") ); + languageCodeMap.insert( \
QString::fromLatin1("ms-MY"), i18n("Malay (Malaysia)") ); + \
languageCodeMap.insert( QString::fromLatin1("mt-MT"), i18n("Maltese (Malta)") ); + \
languageCodeMap.insert( QString::fromLatin1("nb-NO"), i18n("Norwegian Bokmål \
(Norway)") ); + languageCodeMap.insert( QString::fromLatin1("ne-NP"), \
i18n("Nepali (Nepal)") ); + languageCodeMap.insert( \
QString::fromLatin1("nl-BE"), i18n("Dutch (Belgium)") ); + \
languageCodeMap.insert( QString::fromLatin1("nl-NL"), i18n("Dutch (Netherlands)") ); \
+ languageCodeMap.insert( QString::fromLatin1("nn-NO"), i18n("Norwegian \
Nynorsk (Norway)") ); + languageCodeMap.insert( QString::fromLatin1("ns-ZA"), \
i18n("Sesotho sa Leboa (South Africa)") ); + languageCodeMap.insert( \
QString::fromLatin1("oc-FR"), i18n("Occitan (France)") ); + \
languageCodeMap.insert( QString::fromLatin1("or-IN"), i18n("Oriya (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("pa-IN"), i18n("Punjabi (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("pl-PL"), i18n("Polish (Poland)") ); + \
languageCodeMap.insert( QString::fromLatin1("ps-AF"), i18n("Pashto (Afghanistan)") ); \
+ languageCodeMap.insert( QString::fromLatin1("pt-BR"), i18n("Portuguese \
(Brazil)") ); + languageCodeMap.insert( QString::fromLatin1("pt-PT"), \
i18n("Portuguese (Portugal)") ); + languageCodeMap.insert( \
QString::fromLatin1("rm-CH"), i18n("Romansh (Switzerland)") ); + \
languageCodeMap.insert( QString::fromLatin1("ro-RO"), i18n("Romanian (Romania)") ); + \
languageCodeMap.insert( QString::fromLatin1("ru-RU"), i18n("Russian (Russia)") ); + \
languageCodeMap.insert( QString::fromLatin1("rw-RW"), i18n("Kinyarwanda (Rwanda)") ); \
+ languageCodeMap.insert( QString::fromLatin1("sa-IN"), i18n("Sanskrit \
(India)") ); + languageCodeMap.insert( QString::fromLatin1("se-FI"), \
i18n("Sami (Northern, Finland)") ); + languageCodeMap.insert( \
QString::fromLatin1("se-NO"), i18n("Sami (Northern, Norway)") ); + \
languageCodeMap.insert( QString::fromLatin1("se-SE"), i18n("Sami (Northern, Sweden)") \
); + languageCodeMap.insert( QString::fromLatin1("si-LK"), i18n("Sinhala (Sri \
Lanka)") ); + languageCodeMap.insert( QString::fromLatin1("sk-SK"), \
i18n("Slovak (Slovakia)") ); + languageCodeMap.insert( \
QString::fromLatin1("sl-SI"), i18n("Slovenian (Slovenia)") ); + \
languageCodeMap.insert( QString::fromLatin1("sq-AL"), i18n("Albanian (Albania)") ); + \
languageCodeMap.insert( QString::fromLatin1("sv-FI"), i18n("Swedish (Finland)") ); + \
languageCodeMap.insert( QString::fromLatin1("sv-SE"), i18n("Swedish (Sweden)") ); + \
languageCodeMap.insert( QString::fromLatin1("sw-KE"), i18n("Swahili (Kenya)") ); + \
languageCodeMap.insert( QString::fromLatin1("ta-IN"), i18n("Tamil (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("te-IN"), i18n("Telugu (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("th-TH"), i18n("Thai (Thailand)") ); + \
languageCodeMap.insert( QString::fromLatin1("tk-TM"), i18n("Turkmen (Turkmenistan)") \
); + languageCodeMap.insert( QString::fromLatin1("tn-ZA"), i18n("Setswana \
Tswana (South Africa)") ); + languageCodeMap.insert( \
QString::fromLatin1("tr-IN"), i18n("Urdu (India)") ); + \
languageCodeMap.insert( QString::fromLatin1("tr-TR"), i18n("Turkish (Turkey)") ); + \
languageCodeMap.insert( QString::fromLatin1("tt-RU"), i18n("Tatar (Russia)") ); + \
languageCodeMap.insert( QString::fromLatin1("ug-CN"), i18n("Uighur (PRC)") ); + \
languageCodeMap.insert( QString::fromLatin1("uk-UA"), i18n("Ukrainian (Ukraine)") ); \
+ languageCodeMap.insert( QString::fromLatin1("ur-PK"), i18n("Urdu \
(Pakistan)") ); + languageCodeMap.insert( QString::fromLatin1("vi-VN"), \
i18n("Vietnamese (Vietnam)") ); + languageCodeMap.insert( \
QString::fromLatin1("wo-SN"), i18n("Wolof (Senegal)") ); + \
languageCodeMap.insert( QString::fromLatin1("xh-ZA"), i18n("isiXhosa Xhosa (South \
Africa)") ); + languageCodeMap.insert( QString::fromLatin1("yo-NG"), \
i18n("Yoruba (Nigeria)") ); + languageCodeMap.insert( \
QString::fromLatin1("zh-CN"), i18n("Chinese (PRC)") ); + \
languageCodeMap.insert( QString::fromLatin1("zh-HK"), i18n("Chinese (Hong Kong SAR, \
PRC)") ); + languageCodeMap.insert( QString::fromLatin1("zh-MO"), \
i18n("Chinese (Macao SAR)") ); + languageCodeMap.insert( \
QString::fromLatin1("zh-SG"), i18n("Chinese (Singapore)") ); + \
languageCodeMap.insert( QString::fromLatin1("zh-TW"), i18n("Chinese (Taiwan)") ); + \
}
~Private()
@@ -275,7 +275,7 @@ AltLangStrEdit::AltLangStrEdit(QWidget* const parent)
QGridLayout* const grid = new QGridLayout(this);
d->titleLabel = new QLabel(this);
d->delValueButton = new QToolButton(this);
- d->delValueButton->setIcon(QIcon::fromTheme("edit-clear"));
+ d->delValueButton->setIcon(QIcon::fromTheme(QString::fromLatin1("edit-clear")));
d->delValueButton->setToolTip(i18n("Remove entry for this language"));
d->delValueButton->setEnabled(false);
@@ -325,7 +325,7 @@ void AltLangStrEdit::setCurrentLanguageCode(const QString& lang)
{
if(d->currentLanguage.isEmpty())
{
- d->currentLanguage = "x-default";
+ d->currentLanguage = QString::fromLatin1("x-default");
}
else
{
@@ -370,7 +370,7 @@ void AltLangStrEdit::slotSelectionChanged()
d->valueEdit->blockSignals(true);
QString langISO3066 = d->currentLanguage;
- langISO3066.replace('-', '_');
+ langISO3066.replace(QString::fromLatin1("-"), QString::fromLatin1("_"));
d->valueEdit->setSpellCheckingLanguage(langISO3066);
QString text = d->values.value(d->currentLanguage);
@@ -418,7 +418,7 @@ void AltLangStrEdit::loadLangAltListEntries()
foreach(const QString& item, list)
{
d->languageCB->addItem(item);
- d->languageCB->setItemIcon(d->languageCB->count()-1, \
QIcon::fromTheme("dialog-ok")); + \
d->languageCB->setItemIcon(d->languageCB->count()-1, \
QIcon::fromTheme(QString::fromLatin1("dialog-ok")).pixmap(16, 16)); }
d->languageCB->insertSeparator(d->languageCB->count());
@@ -442,7 +442,7 @@ void AltLangStrEdit::loadLangAltListEntries()
QString AltLangStrEdit::defaultAltLang() const
{
- return d->values.value(QString("x-default"));
+ return d->values.value(QString::fromLatin1("x-default"));
}
bool AltLangStrEdit::asDefaultAltLang() const
diff --git a/src/countryselector.cpp b/src/countryselector.cpp
index 5622591..db0af59 100644
--- a/src/countryselector.cpp
+++ b/src/countryselector.cpp
@@ -52,261 +52,261 @@ public:
// Standard ISO 3166 country codes.
- countryCodeMap.insert( "AFG", i18n("Afghanistan") );
- countryCodeMap.insert( "ALB", i18n("Albania") );
- countryCodeMap.insert( "DZA", i18n("Algeria") );
- countryCodeMap.insert( "ASM", i18n("American Samoa") );
- countryCodeMap.insert( "AND", i18n("Andorra") );
- countryCodeMap.insert( "AGO", i18n("Angola") );
- countryCodeMap.insert( "AIA", i18n("Anguilla") );
- countryCodeMap.insert( "AGO", i18n("Angola") );
- countryCodeMap.insert( "ATA", i18n("Antarctica") );
- countryCodeMap.insert( "ATG", i18n("Antigua and Barbuda") );
- countryCodeMap.insert( "ARG", i18n("Argentina") );
- countryCodeMap.insert( "ARM", i18n("Armenia") );
- countryCodeMap.insert( "ABW", i18n("Aruba") );
- countryCodeMap.insert( "AUS", i18n("Australia") );
- countryCodeMap.insert( "AUT", i18n("Austria") );
- countryCodeMap.insert( "AZE", i18n("Azerbaijan") );
- countryCodeMap.insert( "BHS", i18n("Bahamas") );
- countryCodeMap.insert( "BHR", i18n("Bahrain") );
- countryCodeMap.insert( "BGD", i18n("Bangladesh") );
- countryCodeMap.insert( "BRB", i18n("Barbados") );
- countryCodeMap.insert( "BLR", i18n("Belarus") );
- countryCodeMap.insert( "BEL", i18n("Belgium") );
- countryCodeMap.insert( "BLZ", i18n("Belize") );
- countryCodeMap.insert( "BEN", i18n("Benin") );
- countryCodeMap.insert( "BMU", i18n("Bermuda") );
- countryCodeMap.insert( "BTN", i18n("Bhutan") );
- countryCodeMap.insert( "BOL", i18n("Bolivia") );
- countryCodeMap.insert( "BIH", i18n("Bosnia and Herzegovina") );
- countryCodeMap.insert( "BWA", i18n("Botswana") );
- countryCodeMap.insert( "BVT", i18n("Bouvet Island") );
- countryCodeMap.insert( "BRA", i18n("Brazil") );
- countryCodeMap.insert( "IOT", i18n("British Indian Ocean Territory") );
- countryCodeMap.insert( "VGB", i18n("British Virgin Islands") );
- countryCodeMap.insert( "BRN", i18n("Brunei Darussalam") );
- countryCodeMap.insert( "BGR", i18n("Bulgaria") );
- countryCodeMap.insert( "BFA", i18n("Burkina Faso") );
- countryCodeMap.insert( "BDI", i18n("Burundi") );
- countryCodeMap.insert( "KHM", i18n("Cambodia") );
- countryCodeMap.insert( "CMR", i18n("Cameroon") );
- countryCodeMap.insert( "CAN", i18n("Canada") );
- countryCodeMap.insert( "CPV", i18n("Cape Verde") );
- countryCodeMap.insert( "CYM", i18n("Cayman Islands") );
- countryCodeMap.insert( "CAF", i18n("Central African Republic") );
- countryCodeMap.insert( "TCD", i18n("Chad") );
- countryCodeMap.insert( "CHL", i18n("Chile") );
- countryCodeMap.insert( "CHN", i18n("China") );
- countryCodeMap.insert( "CXR", i18n("Christmas Island ") );
- countryCodeMap.insert( "CCK", i18n("Cocos Islands") );
- countryCodeMap.insert( "COL", i18n("Colombia") );
- countryCodeMap.insert( "COM", i18n("Comoros") );
- countryCodeMap.insert( "COD", i18n("Zaire") );
- countryCodeMap.insert( "COG", i18n("Congo") );
- countryCodeMap.insert( "COK", i18n("Cook Islands") );
- countryCodeMap.insert( "CRI", i18n("Costa Rica") );
- countryCodeMap.insert( "CIV", i18n("Ivory Coast") );
- countryCodeMap.insert( "CUB", i18n("Cuba") );
- countryCodeMap.insert( "CYP", i18n("Cyprus") );
- countryCodeMap.insert( "CZE", i18n("Czech Republic") );
- countryCodeMap.insert( "DNK", i18n("Denmark") );
- countryCodeMap.insert( "DJI", i18n("Djibouti") );
- countryCodeMap.insert( "DMA", i18n("Dominica") );
- countryCodeMap.insert( "DOM", i18n("Dominican Republic") );
- countryCodeMap.insert( "ECU", i18n("Ecuador") );
- countryCodeMap.insert( "EGY", i18n("Egypt") );
- countryCodeMap.insert( "SLV", i18n("El Salvador") );
- countryCodeMap.insert( "GNQ", i18n("Equatorial Guinea") );
- countryCodeMap.insert( "ERI", i18n("Eritrea") );
- countryCodeMap.insert( "EST", i18n("Estonia") );
- countryCodeMap.insert( "ETH", i18n("Ethiopia") );
- countryCodeMap.insert( "FRO", i18n("Faeroe Islands") );
- countryCodeMap.insert( "FLK", i18n("Falkland Islands") );
- countryCodeMap.insert( "FJI", i18n("Fiji Islands") );
- countryCodeMap.insert( "FIN", i18n("Finland") );
- countryCodeMap.insert( "FRA", i18n("France") );
- countryCodeMap.insert( "GUF", i18n("French Guiana") );
- countryCodeMap.insert( "PYF", i18n("French Polynesia") );
- countryCodeMap.insert( "ATF", i18n("French Southern Territories") );
- countryCodeMap.insert( "GAB", i18n("Gabon") );
- countryCodeMap.insert( "GMB", i18n("Gambia") );
- countryCodeMap.insert( "GEO", i18n("Georgia") );
- countryCodeMap.insert( "DEU", i18n("Germany") );
- countryCodeMap.insert( "GHA", i18n("Ghana") );
- countryCodeMap.insert( "GIB", i18n("Gibraltar") );
- countryCodeMap.insert( "GRC", i18n("Greece") );
- countryCodeMap.insert( "GRL", i18n("Greenland") );
- countryCodeMap.insert( "GRD", i18n("Grenada") );
- countryCodeMap.insert( "GLP", i18n("Guadaloupe") );
- countryCodeMap.insert( "GUM", i18n("Guam") );
- countryCodeMap.insert( "GTM", i18n("Guatemala") );
- countryCodeMap.insert( "GIN", i18n("Guinea") );
- countryCodeMap.insert( "GNB", i18n("Guinea-Bissau") );
- countryCodeMap.insert( "GUY", i18n("Guyana") );
- countryCodeMap.insert( "HTI", i18n("Haiti") );
- countryCodeMap.insert( "HMD", i18n("Heard and McDonald Islands") );
- countryCodeMap.insert( "VAT", i18n("Vatican") );
- countryCodeMap.insert( "HND", i18n("Honduras") );
- countryCodeMap.insert( "HKG", i18n("Hong Kong") );
- countryCodeMap.insert( "HRV", i18n("Croatia") );
- countryCodeMap.insert( "HUN", i18n("Hungary") );
- countryCodeMap.insert( "ISL", i18n("Iceland") );
- countryCodeMap.insert( "IND", i18n("India") );
- countryCodeMap.insert( "IDN", i18n("Indonesia") );
- countryCodeMap.insert( "IRN", i18n("Iran") );
- countryCodeMap.insert( "IRQ", i18n("Iraq") );
- countryCodeMap.insert( "IRL", i18n("Ireland") );
- countryCodeMap.insert( "ISR", i18n("Israel") );
- countryCodeMap.insert( "ITA", i18n("Italy") );
- countryCodeMap.insert( "JAM", i18n("Jamaica") );
- countryCodeMap.insert( "JPN", i18n("Japan") );
- countryCodeMap.insert( "JOR", i18n("Jordan") );
- countryCodeMap.insert( "KAZ", i18n("Kazakhstan") );
- countryCodeMap.insert( "KEN", i18n("Kenya") );
- countryCodeMap.insert( "KIR", i18n("Kiribati") );
- countryCodeMap.insert( "PRK", i18n("North-Korea") );
- countryCodeMap.insert( "KOR", i18n("South-Korea") );
- countryCodeMap.insert( "KWT", i18n("Kuwait") );
- countryCodeMap.insert( "KGZ", i18n("Kyrgyz Republic") );
- countryCodeMap.insert( "LAO", i18n("Lao") );
- countryCodeMap.insert( "LVA", i18n("Latvia") );
- countryCodeMap.insert( "LBN", i18n("Lebanon") );
- countryCodeMap.insert( "LSO", i18n("Lesotho") );
- countryCodeMap.insert( "LBR", i18n("Liberia") );
- countryCodeMap.insert( "LBY", i18n("Libyan Arab Jamahiriya") );
- countryCodeMap.insert( "LIE", i18n("Liechtenstein") );
- countryCodeMap.insert( "LTU", i18n("Lithuania") );
- countryCodeMap.insert( "LUX", i18n("Luxembourg") );
- countryCodeMap.insert( "MAC", i18n("Macao") );
- countryCodeMap.insert( "MKD", i18n("Macedonia") );
- countryCodeMap.insert( "MDG", i18n("Madagascar") );
- countryCodeMap.insert( "MWI", i18n("Malawi") );
- countryCodeMap.insert( "MYS", i18n("Malaysia") );
- countryCodeMap.insert( "MDV", i18n("Maldives") );
- countryCodeMap.insert( "MLI", i18n("Mali") );
- countryCodeMap.insert( "MLT", i18n("Malta") );
- countryCodeMap.insert( "MHL", i18n("Marshall Islands") );
- countryCodeMap.insert( "MTQ", i18n("Martinique") );
- countryCodeMap.insert( "MRT", i18n("Mauritania") );
- countryCodeMap.insert( "MUS", i18n("Mauritius") );
- countryCodeMap.insert( "MYT", i18n("Mayotte") );
- countryCodeMap.insert( "MEX", i18n("Mexico") );
- countryCodeMap.insert( "FSM", i18n("Micronesia") );
- countryCodeMap.insert( "MDA", i18n("Moldova") );
- countryCodeMap.insert( "MCO", i18n("Monaco") );
- countryCodeMap.insert( "MNG", i18n("Mongolia") );
- countryCodeMap.insert( "MSR", i18n("Montserrat") );
- countryCodeMap.insert( "MAR", i18n("Morocco") );
- countryCodeMap.insert( "MOZ", i18n("Mozambique") );
- countryCodeMap.insert( "MMR", i18n("Myanmar") );
- countryCodeMap.insert( "NAM", i18n("Namibia") );
- countryCodeMap.insert( "NRU", i18n("Nauru") );
- countryCodeMap.insert( "NPL", i18n("Nepal") );
- countryCodeMap.insert( "ANT", i18n("Netherlands Antilles") );
- countryCodeMap.insert( "NLD", i18n("Netherlands") );
- countryCodeMap.insert( "NCL", i18n("New Caledonia") );
- countryCodeMap.insert( "NZL", i18n("New Zealand") );
- countryCodeMap.insert( "NIC", i18n("Nicaragua") );
- countryCodeMap.insert( "NER", i18n("Niger") );
- countryCodeMap.insert( "NGA", i18n("Nigeria") );
- countryCodeMap.insert( "NIU", i18n("Niue") );
- countryCodeMap.insert( "NFK", i18n("Norfolk Island") );
- countryCodeMap.insert( "MNP", i18n("Northern Mariana Islands") );
- countryCodeMap.insert( "NOR", i18n("Norway") );
- countryCodeMap.insert( "OMN", i18n("Oman") );
- countryCodeMap.insert( "PAK", i18n("Pakistan") );
- countryCodeMap.insert( "PLW", i18n("Palau") );
- countryCodeMap.insert( "PSE", i18n("Palestinian Territory") );
- countryCodeMap.insert( "PAN", i18n("Panama") );
- countryCodeMap.insert( "PNG", i18n("Papua New Guinea") );
- countryCodeMap.insert( "PRY", i18n("Paraguay") );
- countryCodeMap.insert( "PER", i18n("Peru") );
- countryCodeMap.insert( "PHL", i18n("Philippines") );
- countryCodeMap.insert( "PCN", i18n("Pitcairn Island") );
- countryCodeMap.insert( "POL", i18n("Poland") );
- countryCodeMap.insert( "PRT", i18n("Portugal") );
- countryCodeMap.insert( "PRI", i18n("Puerto Rico") );
- countryCodeMap.insert( "QAT", i18n("Qatar") );
- countryCodeMap.insert( "REU", i18n("Reunion") );
- countryCodeMap.insert( "ROU", i18n("Romania") );
- countryCodeMap.insert( "RUS", i18n("Russian Federation") );
- countryCodeMap.insert( "RWA", i18n("Rwanda") );
- countryCodeMap.insert( "SHN", i18n("St. Helena") );
- countryCodeMap.insert( "KNA", i18n("St. Kitts and Nevis") );
- countryCodeMap.insert( "LCA", i18n("St. Lucia") );
- countryCodeMap.insert( "SPM", i18n("St. Pierre and Miquelon") );
- countryCodeMap.insert( "VCT", i18n("St. Vincent and the Grenadines") );
- countryCodeMap.insert( "WSM", i18n("Samoa") );
- countryCodeMap.insert( "SMR", i18n("San Marino") );
- countryCodeMap.insert( "STP", i18n("Sao Tome and Principe") );
- countryCodeMap.insert( "SAU", i18n("Saudi Arabia") );
- countryCodeMap.insert( "SEN", i18n("Senegal") );
- countryCodeMap.insert( "SCG", i18n("Serbia and Montenegro") );
- countryCodeMap.insert( "SYC", i18n("Seychelles") );
- countryCodeMap.insert( "SLE", i18n("Sierra Leone") );
- countryCodeMap.insert( "SGP", i18n("Singapore") );
- countryCodeMap.insert( "SVK", i18n("Slovakia") );
- countryCodeMap.insert( "SVN", i18n("Slovenia") );
- countryCodeMap.insert( "SLB", i18n("Solomon Islands") );
- countryCodeMap.insert( "SOM", i18n("Somalia") );
- countryCodeMap.insert( "ZAF", i18n("South Africa") );
- countryCodeMap.insert( "SGS", i18n("South Georgia and the South Sandwich \
Islands") );
- countryCodeMap.insert( "ESP", i18n("Spain") );
- countryCodeMap.insert( "LKA", i18n("Sri Lanka") );
- countryCodeMap.insert( "SDN", i18n("Sudan") );
- countryCodeMap.insert( "SUR", i18n("Suriname") );
- countryCodeMap.insert( "SJM", i18n("Svalbard & Jan Mayen Islands") );
- countryCodeMap.insert( "SWZ", i18n("Swaziland") );
- countryCodeMap.insert( "SWE", i18n("Sweden") );
- countryCodeMap.insert( "CHE", i18n("Switzerland") );
- countryCodeMap.insert( "SYR", i18n("Syrian Arab Republic") );
- countryCodeMap.insert( "TWN", i18n("Taiwan") );
- countryCodeMap.insert( "TJK", i18n("Tajikistan") );
- countryCodeMap.insert( "TZA", i18n("Tanzania") );
- countryCodeMap.insert( "THA", i18n("Thailand") );
- countryCodeMap.insert( "TLS", i18n("Timor-Leste") );
- countryCodeMap.insert( "TGO", i18n("Togo") );
- countryCodeMap.insert( "TKL", i18n("Tokelau Islands") );
- countryCodeMap.insert( "TON", i18n("Tonga") );
- countryCodeMap.insert( "TTO", i18n("Trinidad and Tobago") );
- countryCodeMap.insert( "TUN", i18n("Tunisia") );
- countryCodeMap.insert( "TUR", i18n("Turkey") );
- countryCodeMap.insert( "TKM", i18n("Turkmenistan") );
- countryCodeMap.insert( "TCA", i18n("Turks and Caicos Islands") );
- countryCodeMap.insert( "TUV", i18n("Tuvalu") );
- countryCodeMap.insert( "VIR", i18n("US Virgin Islands") );
- countryCodeMap.insert( "UGA", i18n("Uganda") );
- countryCodeMap.insert( "UKR", i18n("Ukraine") );
- countryCodeMap.insert( "ARE", i18n("United Arab Emirates") );
- countryCodeMap.insert( "GBR", i18n("United Kingdom") );
- countryCodeMap.insert( "UMI", i18n("United States Minor Outlying Islands") \
);
- countryCodeMap.insert( "USA", i18n("United States of America") );
- countryCodeMap.insert( "URY", i18n("Uruguay, Eastern Republic of") );
- countryCodeMap.insert( "UZB", i18n("Uzbekistan") );
- countryCodeMap.insert( "VUT", i18n("Vanuatu") );
- countryCodeMap.insert( "VEN", i18n("Venezuela") );
- countryCodeMap.insert( "VNM", i18n("Viet Nam") );
- countryCodeMap.insert( "WLF", i18n("Wallis and Futuna Islands ") );
- countryCodeMap.insert( "ESH", i18n("Western Sahara") );
- countryCodeMap.insert( "YEM", i18n("Yemen") );
- countryCodeMap.insert( "ZMB", i18n("Zambia") );
- countryCodeMap.insert( "ZWE", i18n("Zimbabwe") );
+ countryCodeMap.insert( QString::fromLatin1("AFG"), i18n("Afghanistan") );
+ countryCodeMap.insert( QString::fromLatin1("ALB"), i18n("Albania") );
+ countryCodeMap.insert( QString::fromLatin1("DZA"), i18n("Algeria") );
+ countryCodeMap.insert( QString::fromLatin1("ASM"), i18n("American Samoa") );
+ countryCodeMap.insert( QString::fromLatin1("AND"), i18n("Andorra") );
+ countryCodeMap.insert( QString::fromLatin1("AGO"), i18n("Angola") );
+ countryCodeMap.insert( QString::fromLatin1("AIA"), i18n("Anguilla") );
+ countryCodeMap.insert( QString::fromLatin1("AGO"), i18n("Angola") );
+ countryCodeMap.insert( QString::fromLatin1("ATA"), i18n("Antarctica") );
+ countryCodeMap.insert( QString::fromLatin1("ATG"), i18n("Antigua and \
Barbuda") ); + countryCodeMap.insert( QString::fromLatin1("ARG"), \
i18n("Argentina") ); + countryCodeMap.insert( QString::fromLatin1("ARM"), \
i18n("Armenia") ); + countryCodeMap.insert( QString::fromLatin1("ABW"), \
i18n("Aruba") ); + countryCodeMap.insert( QString::fromLatin1("AUS"), \
i18n("Australia") ); + countryCodeMap.insert( QString::fromLatin1("AUT"), \
i18n("Austria") ); + countryCodeMap.insert( QString::fromLatin1("AZE"), \
i18n("Azerbaijan") ); + countryCodeMap.insert( QString::fromLatin1("BHS"), \
i18n("Bahamas") ); + countryCodeMap.insert( QString::fromLatin1("BHR"), \
i18n("Bahrain") ); + countryCodeMap.insert( QString::fromLatin1("BGD"), \
i18n("Bangladesh") ); + countryCodeMap.insert( QString::fromLatin1("BRB"), \
i18n("Barbados") ); + countryCodeMap.insert( QString::fromLatin1("BLR"), \
i18n("Belarus") ); + countryCodeMap.insert( QString::fromLatin1("BEL"), \
i18n("Belgium") ); + countryCodeMap.insert( QString::fromLatin1("BLZ"), \
i18n("Belize") ); + countryCodeMap.insert( QString::fromLatin1("BEN"), \
i18n("Benin") ); + countryCodeMap.insert( QString::fromLatin1("BMU"), \
i18n("Bermuda") ); + countryCodeMap.insert( QString::fromLatin1("BTN"), \
i18n("Bhutan") ); + countryCodeMap.insert( QString::fromLatin1("BOL"), \
i18n("Bolivia") ); + countryCodeMap.insert( QString::fromLatin1("BIH"), \
i18n("Bosnia and Herzegovina") ); + countryCodeMap.insert( \
QString::fromLatin1("BWA"), i18n("Botswana") ); + countryCodeMap.insert( \
QString::fromLatin1("BVT"), i18n("Bouvet Island") ); + countryCodeMap.insert( \
QString::fromLatin1("BRA"), i18n("Brazil") ); + countryCodeMap.insert( \
QString::fromLatin1("IOT"), i18n("British Indian Ocean Territory") ); + \
countryCodeMap.insert( QString::fromLatin1("VGB"), i18n("British Virgin Islands") ); \
+ countryCodeMap.insert( QString::fromLatin1("BRN"), i18n("Brunei Darussalam") \
); + countryCodeMap.insert( QString::fromLatin1("BGR"), i18n("Bulgaria") );
+ countryCodeMap.insert( QString::fromLatin1("BFA"), i18n("Burkina Faso") );
+ countryCodeMap.insert( QString::fromLatin1("BDI"), i18n("Burundi") );
+ countryCodeMap.insert( QString::fromLatin1("KHM"), i18n("Cambodia") );
+ countryCodeMap.insert( QString::fromLatin1("CMR"), i18n("Cameroon") );
+ countryCodeMap.insert( QString::fromLatin1("CAN"), i18n("Canada") );
+ countryCodeMap.insert( QString::fromLatin1("CPV"), i18n("Cape Verde") );
+ countryCodeMap.insert( QString::fromLatin1("CYM"), i18n("Cayman Islands") );
+ countryCodeMap.insert( QString::fromLatin1("CAF"), i18n("Central African \
Republic") ); + countryCodeMap.insert( QString::fromLatin1("TCD"), \
i18n("Chad") ); + countryCodeMap.insert( QString::fromLatin1("CHL"), \
i18n("Chile") ); + countryCodeMap.insert( QString::fromLatin1("CHN"), \
i18n("China") ); + countryCodeMap.insert( QString::fromLatin1("CXR"), \
i18n("Christmas Island ") ); + countryCodeMap.insert( \
QString::fromLatin1("CCK"), i18n("Cocos Islands") ); + countryCodeMap.insert( \
QString::fromLatin1("COL"), i18n("Colombia") ); + countryCodeMap.insert( \
QString::fromLatin1("COM"), i18n("Comoros") ); + countryCodeMap.insert( \
QString::fromLatin1("COD"), i18n("Zaire") ); + countryCodeMap.insert( \
QString::fromLatin1("COG"), i18n("Congo") ); + countryCodeMap.insert( \
QString::fromLatin1("COK"), i18n("Cook Islands") ); + countryCodeMap.insert( \
QString::fromLatin1("CRI"), i18n("Costa Rica") ); + countryCodeMap.insert( \
QString::fromLatin1("CIV"), i18n("Ivory Coast") ); + countryCodeMap.insert( \
QString::fromLatin1("CUB"), i18n("Cuba") ); + countryCodeMap.insert( \
QString::fromLatin1("CYP"), i18n("Cyprus") ); + countryCodeMap.insert( \
QString::fromLatin1("CZE"), i18n("Czech Republic") ); + countryCodeMap.insert( \
QString::fromLatin1("DNK"), i18n("Denmark") ); + countryCodeMap.insert( \
QString::fromLatin1("DJI"), i18n("Djibouti") ); + countryCodeMap.insert( \
QString::fromLatin1("DMA"), i18n("Dominica") ); + countryCodeMap.insert( \
QString::fromLatin1("DOM"), i18n("Dominican Republic") ); + \
countryCodeMap.insert( QString::fromLatin1("ECU"), i18n("Ecuador") ); + \
countryCodeMap.insert( QString::fromLatin1("EGY"), i18n("Egypt") ); + \
countryCodeMap.insert( QString::fromLatin1("SLV"), i18n("El Salvador") ); + \
countryCodeMap.insert( QString::fromLatin1("GNQ"), i18n("Equatorial Guinea") ); + \
countryCodeMap.insert( QString::fromLatin1("ERI"), i18n("Eritrea") ); + \
countryCodeMap.insert( QString::fromLatin1("EST"), i18n("Estonia") ); + \
countryCodeMap.insert( QString::fromLatin1("ETH"), i18n("Ethiopia") ); + \
countryCodeMap.insert( QString::fromLatin1("FRO"), i18n("Faeroe Islands") ); + \
countryCodeMap.insert( QString::fromLatin1("FLK"), i18n("Falkland Islands") ); + \
countryCodeMap.insert( QString::fromLatin1("FJI"), i18n("Fiji Islands") ); + \
countryCodeMap.insert( QString::fromLatin1("FIN"), i18n("Finland") ); + \
countryCodeMap.insert( QString::fromLatin1("FRA"), i18n("France") ); + \
countryCodeMap.insert( QString::fromLatin1("GUF"), i18n("French Guiana") ); + \
countryCodeMap.insert( QString::fromLatin1("PYF"), i18n("French Polynesia") ); + \
countryCodeMap.insert( QString::fromLatin1("ATF"), i18n("French Southern \
Territories") ); + countryCodeMap.insert( QString::fromLatin1("GAB"), \
i18n("Gabon") ); + countryCodeMap.insert( QString::fromLatin1("GMB"), \
i18n("Gambia") ); + countryCodeMap.insert( QString::fromLatin1("GEO"), \
i18n("Georgia") ); + countryCodeMap.insert( QString::fromLatin1("DEU"), \
i18n("Germany") ); + countryCodeMap.insert( QString::fromLatin1("GHA"), \
i18n("Ghana") ); + countryCodeMap.insert( QString::fromLatin1("GIB"), \
i18n("Gibraltar") ); + countryCodeMap.insert( QString::fromLatin1("GRC"), \
i18n("Greece") ); + countryCodeMap.insert( QString::fromLatin1("GRL"), \
i18n("Greenland") ); + countryCodeMap.insert( QString::fromLatin1("GRD"), \
i18n("Grenada") ); + countryCodeMap.insert( QString::fromLatin1("GLP"), \
i18n("Guadaloupe") ); + countryCodeMap.insert( QString::fromLatin1("GUM"), \
i18n("Guam") ); + countryCodeMap.insert( QString::fromLatin1("GTM"), \
i18n("Guatemala") ); + countryCodeMap.insert( QString::fromLatin1("GIN"), \
i18n("Guinea") ); + countryCodeMap.insert( QString::fromLatin1("GNB"), \
i18n("Guinea-Bissau") ); + countryCodeMap.insert( QString::fromLatin1("GUY"), \
i18n("Guyana") ); + countryCodeMap.insert( QString::fromLatin1("HTI"), \
i18n("Haiti") ); + countryCodeMap.insert( QString::fromLatin1("HMD"), \
i18n("Heard and McDonald Islands") ); + countryCodeMap.insert( \
QString::fromLatin1("VAT"), i18n("Vatican") ); + countryCodeMap.insert( \
QString::fromLatin1("HND"), i18n("Honduras") ); + countryCodeMap.insert( \
QString::fromLatin1("HKG"), i18n("Hong Kong") ); + countryCodeMap.insert( \
QString::fromLatin1("HRV"), i18n("Croatia") ); + countryCodeMap.insert( \
QString::fromLatin1("HUN"), i18n("Hungary") ); + countryCodeMap.insert( \
QString::fromLatin1("ISL"), i18n("Iceland") ); + countryCodeMap.insert( \
QString::fromLatin1("IND"), i18n("India") ); + countryCodeMap.insert( \
QString::fromLatin1("IDN"), i18n("Indonesia") ); + countryCodeMap.insert( \
QString::fromLatin1("IRN"), i18n("Iran") ); + countryCodeMap.insert( \
QString::fromLatin1("IRQ"), i18n("Iraq") ); + countryCodeMap.insert( \
QString::fromLatin1("IRL"), i18n("Ireland") ); + countryCodeMap.insert( \
QString::fromLatin1("ISR"), i18n("Israel") ); + countryCodeMap.insert( \
QString::fromLatin1("ITA"), i18n("Italy") ); + countryCodeMap.insert( \
QString::fromLatin1("JAM"), i18n("Jamaica") ); + countryCodeMap.insert( \
QString::fromLatin1("JPN"), i18n("Japan") ); + countryCodeMap.insert( \
QString::fromLatin1("JOR"), i18n("Jordan") ); + countryCodeMap.insert( \
QString::fromLatin1("KAZ"), i18n("Kazakhstan") ); + countryCodeMap.insert( \
QString::fromLatin1("KEN"), i18n("Kenya") ); + countryCodeMap.insert( \
QString::fromLatin1("KIR"), i18n("Kiribati") ); + countryCodeMap.insert( \
QString::fromLatin1("PRK"), i18n("North-Korea") ); + countryCodeMap.insert( \
QString::fromLatin1("KOR"), i18n("South-Korea") ); + countryCodeMap.insert( \
QString::fromLatin1("KWT"), i18n("Kuwait") ); + countryCodeMap.insert( \
QString::fromLatin1("KGZ"), i18n("Kyrgyz Republic") ); + \
countryCodeMap.insert( QString::fromLatin1("LAO"), i18n("Lao") ); + \
countryCodeMap.insert( QString::fromLatin1("LVA"), i18n("Latvia") ); + \
countryCodeMap.insert( QString::fromLatin1("LBN"), i18n("Lebanon") ); + \
countryCodeMap.insert( QString::fromLatin1("LSO"), i18n("Lesotho") ); + \
countryCodeMap.insert( QString::fromLatin1("LBR"), i18n("Liberia") ); + \
countryCodeMap.insert( QString::fromLatin1("LBY"), i18n("Libyan Arab Jamahiriya") ); \
+ countryCodeMap.insert( QString::fromLatin1("LIE"), i18n("Liechtenstein") ); \
+ countryCodeMap.insert( QString::fromLatin1("LTU"), i18n("Lithuania") ); + \
countryCodeMap.insert( QString::fromLatin1("LUX"), i18n("Luxembourg") ); + \
countryCodeMap.insert( QString::fromLatin1("MAC"), i18n("Macao") ); + \
countryCodeMap.insert( QString::fromLatin1("MKD"), i18n("Macedonia") ); + \
countryCodeMap.insert( QString::fromLatin1("MDG"), i18n("Madagascar") ); + \
countryCodeMap.insert( QString::fromLatin1("MWI"), i18n("Malawi") ); + \
countryCodeMap.insert( QString::fromLatin1("MYS"), i18n("Malaysia") ); + \
countryCodeMap.insert( QString::fromLatin1("MDV"), i18n("Maldives") ); + \
countryCodeMap.insert( QString::fromLatin1("MLI"), i18n("Mali") ); + \
countryCodeMap.insert( QString::fromLatin1("MLT"), i18n("Malta") ); + \
countryCodeMap.insert( QString::fromLatin1("MHL"), i18n("Marshall Islands") ); + \
countryCodeMap.insert( QString::fromLatin1("MTQ"), i18n("Martinique") ); + \
countryCodeMap.insert( QString::fromLatin1("MRT"), i18n("Mauritania") ); + \
countryCodeMap.insert( QString::fromLatin1("MUS"), i18n("Mauritius") ); + \
countryCodeMap.insert( QString::fromLatin1("MYT"), i18n("Mayotte") ); + \
countryCodeMap.insert( QString::fromLatin1("MEX"), i18n("Mexico") ); + \
countryCodeMap.insert( QString::fromLatin1("FSM"), i18n("Micronesia") ); + \
countryCodeMap.insert( QString::fromLatin1("MDA"), i18n("Moldova") ); + \
countryCodeMap.insert( QString::fromLatin1("MCO"), i18n("Monaco") ); + \
countryCodeMap.insert( QString::fromLatin1("MNG"), i18n("Mongolia") ); + \
countryCodeMap.insert( QString::fromLatin1("MSR"), i18n("Montserrat") ); + \
countryCodeMap.insert( QString::fromLatin1("MAR"), i18n("Morocco") ); + \
countryCodeMap.insert( QString::fromLatin1("MOZ"), i18n("Mozambique") ); + \
countryCodeMap.insert( QString::fromLatin1("MMR"), i18n("Myanmar") ); + \
countryCodeMap.insert( QString::fromLatin1("NAM"), i18n("Namibia") ); + \
countryCodeMap.insert( QString::fromLatin1("NRU"), i18n("Nauru") ); + \
countryCodeMap.insert( QString::fromLatin1("NPL"), i18n("Nepal") ); + \
countryCodeMap.insert( QString::fromLatin1("ANT"), i18n("Netherlands Antilles") ); + \
countryCodeMap.insert( QString::fromLatin1("NLD"), i18n("Netherlands") ); + \
countryCodeMap.insert( QString::fromLatin1("NCL"), i18n("New Caledonia") ); + \
countryCodeMap.insert( QString::fromLatin1("NZL"), i18n("New Zealand") ); + \
countryCodeMap.insert( QString::fromLatin1("NIC"), i18n("Nicaragua") ); + \
countryCodeMap.insert( QString::fromLatin1("NER"), i18n("Niger") ); + \
countryCodeMap.insert( QString::fromLatin1("NGA"), i18n("Nigeria") ); + \
countryCodeMap.insert( QString::fromLatin1("NIU"), i18n("Niue") ); + \
countryCodeMap.insert( QString::fromLatin1("NFK"), i18n("Norfolk Island") ); + \
countryCodeMap.insert( QString::fromLatin1("MNP"), i18n("Northern Mariana Islands") \
); + countryCodeMap.insert( QString::fromLatin1("NOR"), i18n("Norway") );
+ countryCodeMap.insert( QString::fromLatin1("OMN"), i18n("Oman") );
+ countryCodeMap.insert( QString::fromLatin1("PAK"), i18n("Pakistan") );
+ countryCodeMap.insert( QString::fromLatin1("PLW"), i18n("Palau") );
+ countryCodeMap.insert( QString::fromLatin1("PSE"), i18n("Palestinian \
Territory") ); + countryCodeMap.insert( QString::fromLatin1("PAN"), \
i18n("Panama") ); + countryCodeMap.insert( QString::fromLatin1("PNG"), \
i18n("Papua New Guinea") ); + countryCodeMap.insert( \
QString::fromLatin1("PRY"), i18n("Paraguay") ); + countryCodeMap.insert( \
QString::fromLatin1("PER"), i18n("Peru") ); + countryCodeMap.insert( \
QString::fromLatin1("PHL"), i18n("Philippines") ); + countryCodeMap.insert( \
QString::fromLatin1("PCN"), i18n("Pitcairn Island") ); + \
countryCodeMap.insert( QString::fromLatin1("POL"), i18n("Poland") ); + \
countryCodeMap.insert( QString::fromLatin1("PRT"), i18n("Portugal") ); + \
countryCodeMap.insert( QString::fromLatin1("PRI"), i18n("Puerto Rico") ); + \
countryCodeMap.insert( QString::fromLatin1("QAT"), i18n("Qatar") ); + \
countryCodeMap.insert( QString::fromLatin1("REU"), i18n("Reunion") ); + \
countryCodeMap.insert( QString::fromLatin1("ROU"), i18n("Romania") ); + \
countryCodeMap.insert( QString::fromLatin1("RUS"), i18n("Russian Federation") ); + \
countryCodeMap.insert( QString::fromLatin1("RWA"), i18n("Rwanda") ); + \
countryCodeMap.insert( QString::fromLatin1("SHN"), i18n("St. Helena") ); + \
countryCodeMap.insert( QString::fromLatin1("KNA"), i18n("St. Kitts and Nevis") ); + \
countryCodeMap.insert( QString::fromLatin1("LCA"), i18n("St. Lucia") ); + \
countryCodeMap.insert( QString::fromLatin1("SPM"), i18n("St. Pierre and Miquelon") ); \
+ countryCodeMap.insert( QString::fromLatin1("VCT"), i18n("St. Vincent and the \
Grenadines") ); + countryCodeMap.insert( QString::fromLatin1("WSM"), \
i18n("Samoa") ); + countryCodeMap.insert( QString::fromLatin1("SMR"), \
i18n("San Marino") ); + countryCodeMap.insert( QString::fromLatin1("STP"), \
i18n("Sao Tome and Principe") ); + countryCodeMap.insert( \
QString::fromLatin1("SAU"), i18n("Saudi Arabia") ); + countryCodeMap.insert( \
QString::fromLatin1("SEN"), i18n("Senegal") ); + countryCodeMap.insert( \
QString::fromLatin1("SCG"), i18n("Serbia and Montenegro") ); + \
countryCodeMap.insert( QString::fromLatin1("SYC"), i18n("Seychelles") ); + \
countryCodeMap.insert( QString::fromLatin1("SLE"), i18n("Sierra Leone") ); + \
countryCodeMap.insert( QString::fromLatin1("SGP"), i18n("Singapore") ); + \
countryCodeMap.insert( QString::fromLatin1("SVK"), i18n("Slovakia") ); + \
countryCodeMap.insert( QString::fromLatin1("SVN"), i18n("Slovenia") ); + \
countryCodeMap.insert( QString::fromLatin1("SLB"), i18n("Solomon Islands") ); + \
countryCodeMap.insert( QString::fromLatin1("SOM"), i18n("Somalia") ); + \
countryCodeMap.insert( QString::fromLatin1("ZAF"), i18n("South Africa") ); + \
countryCodeMap.insert( QString::fromLatin1("SGS"), i18n("South Georgia and the South \
Sandwich Islands") ); + countryCodeMap.insert( QString::fromLatin1("ESP"), \
i18n("Spain") ); + countryCodeMap.insert( QString::fromLatin1("LKA"), \
i18n("Sri Lanka") ); + countryCodeMap.insert( QString::fromLatin1("SDN"), \
i18n("Sudan") ); + countryCodeMap.insert( QString::fromLatin1("SUR"), \
i18n("Suriname") ); + countryCodeMap.insert( QString::fromLatin1("SJM"), \
i18n("Svalbard & Jan Mayen Islands") ); + countryCodeMap.insert( \
QString::fromLatin1("SWZ"), i18n("Swaziland") ); + countryCodeMap.insert( \
QString::fromLatin1("SWE"), i18n("Sweden") ); + countryCodeMap.insert( \
QString::fromLatin1("CHE"), i18n("Switzerland") ); + countryCodeMap.insert( \
QString::fromLatin1("SYR"), i18n("Syrian Arab Republic") ); + \
countryCodeMap.insert( QString::fromLatin1("TWN"), i18n("Taiwan") ); + \
countryCodeMap.insert( QString::fromLatin1("TJK"), i18n("Tajikistan") ); + \
countryCodeMap.insert( QString::fromLatin1("TZA"), i18n("Tanzania") ); + \
countryCodeMap.insert( QString::fromLatin1("THA"), i18n("Thailand") ); + \
countryCodeMap.insert( QString::fromLatin1("TLS"), i18n("Timor-Leste") ); + \
countryCodeMap.insert( QString::fromLatin1("TGO"), i18n("Togo") ); + \
countryCodeMap.insert( QString::fromLatin1("TKL"), i18n("Tokelau Islands") ); + \
countryCodeMap.insert( QString::fromLatin1("TON"), i18n("Tonga") ); + \
countryCodeMap.insert( QString::fromLatin1("TTO"), i18n("Trinidad and Tobago") ); + \
countryCodeMap.insert( QString::fromLatin1("TUN"), i18n("Tunisia") ); + \
countryCodeMap.insert( QString::fromLatin1("TUR"), i18n("Turkey") ); + \
countryCodeMap.insert( QString::fromLatin1("TKM"), i18n("Turkmenistan") ); + \
countryCodeMap.insert( QString::fromLatin1("TCA"), i18n("Turks and Caicos Islands") \
); + countryCodeMap.insert( QString::fromLatin1("TUV"), i18n("Tuvalu") );
+ countryCodeMap.insert( QString::fromLatin1("VIR"), i18n("US Virgin Islands") \
); + countryCodeMap.insert( QString::fromLatin1("UGA"), i18n("Uganda") );
+ countryCodeMap.insert( QString::fromLatin1("UKR"), i18n("Ukraine") );
+ countryCodeMap.insert( QString::fromLatin1("ARE"), i18n("United Arab \
Emirates") ); + countryCodeMap.insert( QString::fromLatin1("GBR"), \
i18n("United Kingdom") ); + countryCodeMap.insert( QString::fromLatin1("UMI"), \
i18n("United States Minor Outlying Islands") ); + countryCodeMap.insert( \
QString::fromLatin1("USA"), i18n("United States of America") ); + \
countryCodeMap.insert( QString::fromLatin1("URY"), i18n("Uruguay, Eastern Republic \
of") ); + countryCodeMap.insert( QString::fromLatin1("UZB"), \
i18n("Uzbekistan") ); + countryCodeMap.insert( QString::fromLatin1("VUT"), \
i18n("Vanuatu") ); + countryCodeMap.insert( QString::fromLatin1("VEN"), \
i18n("Venezuela") ); + countryCodeMap.insert( QString::fromLatin1("VNM"), \
i18n("Viet Nam") ); + countryCodeMap.insert( QString::fromLatin1("WLF"), \
i18n("Wallis and Futuna Islands ") ); + countryCodeMap.insert( \
QString::fromLatin1("ESH"), i18n("Western Sahara") ); + countryCodeMap.insert( \
QString::fromLatin1("YEM"), i18n("Yemen") ); + countryCodeMap.insert( \
QString::fromLatin1("ZMB"), i18n("Zambia") ); + countryCodeMap.insert( \
QString::fromLatin1("ZWE"), i18n("Zimbabwe") );
// Supplemental IPTC/IIM country codes.
- countryCodeMap.insert( "XUN", i18n("United Nations") );
- countryCodeMap.insert( "XEU", i18n("European Union") );
- countryCodeMap.insert( "XSP", i18n("Space") );
- countryCodeMap.insert( "XSE", i18n("At Sea") );
- countryCodeMap.insert( "XIF", i18n("In Flight") );
- countryCodeMap.insert( "XEN", i18n("England") );
- countryCodeMap.insert( "XSC", i18n("Scotland") );
- countryCodeMap.insert( "XNI", i18n("Northern Ireland") );
- countryCodeMap.insert( "XWA", i18n("Wales") );
- countryCodeMap.insert( "PSE", i18n("Palestine") );
- countryCodeMap.insert( "GZA", i18n("Gaza") );
- countryCodeMap.insert( "JRO", i18n("Jericho") );
+ countryCodeMap.insert( QString::fromLatin1("XUN"), i18n("United Nations") );
+ countryCodeMap.insert( QString::fromLatin1("XEU"), i18n("European Union") );
+ countryCodeMap.insert( QString::fromLatin1("XSP"), i18n("Space") );
+ countryCodeMap.insert( QString::fromLatin1("XSE"), i18n("At Sea") );
+ countryCodeMap.insert( QString::fromLatin1("XIF"), i18n("In Flight") );
+ countryCodeMap.insert( QString::fromLatin1("XEN"), i18n("England") );
+ countryCodeMap.insert( QString::fromLatin1("XSC"), i18n("Scotland") );
+ countryCodeMap.insert( QString::fromLatin1("XNI"), i18n("Northern Ireland") \
); + countryCodeMap.insert( QString::fromLatin1("XWA"), i18n("Wales") );
+ countryCodeMap.insert( QString::fromLatin1("PSE"), i18n("Palestine") );
+ countryCodeMap.insert( QString::fromLatin1("GZA"), i18n("Gaza") );
+ countryCodeMap.insert( QString::fromLatin1("JRO"), i18n("Jericho") );
}
typedef QMap<QString, QString> CountryCodeMap;
@@ -320,7 +320,7 @@ CountrySelector::CountrySelector(QWidget* const parent)
for (Private::CountryCodeMap::Iterator it = d->countryCodeMap.begin();
it != d->countryCodeMap.end(); ++it)
{
- addItem(QString("%1 - %2").arg(it.key()).arg(it.value()));
+ addItem(QString::fromLatin1("%1 - %2").arg(it.key()).arg(it.value()));
}
model()->sort(0);
diff --git a/src/subjectwidget.cpp b/src/subjectwidget.cpp
index d8abd36..90a745f 100644
--- a/src/subjectwidget.cpp
+++ b/src/subjectwidget.cpp
@@ -120,7 +120,7 @@ SubjectWidget::SubjectWidget(QWidget* const parent)
// See http://iptc.cms.apa.at/std/topicset/topicset.iptc-subjectcode.xml for \
details.
QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
- \
"libkexiv2/data/topicset.iptc-subjectcode.xml"); + \
QString::fromLatin1("libkexiv2/data/topicset.iptc-subjectcode.xml"));
if (!loadSubjectCodesFromXML(QUrl(path)))
qCDebug(LIBKEXIV2_LOG) << "Cannot load IPTC/NAA subject codes XML database";
@@ -128,7 +128,7 @@ SubjectWidget::SubjectWidget(QWidget* const parent)
// --------------------------------------------------------
// Subject Reference Number only accept digit.
- QRegExp refDigitRx("^[0-9]{8}$");
+ QRegExp refDigitRx(QString::fromLatin1("^[0-9]{8}$"));
QValidator* const refValidator = new QRegExpValidator(refDigitRx, this);
// --------------------------------------------------------
@@ -208,9 +208,9 @@ SubjectWidget::SubjectWidget(QWidget* const parent)
d->addSubjectButton = new QPushButton(i18n("&Add"));
d->delSubjectButton = new QPushButton(i18n("&Delete"));
d->repSubjectButton = new QPushButton(i18n("&Replace"));
- d->addSubjectButton->setIcon(QIcon::fromTheme("list-add"));
- d->delSubjectButton->setIcon(QIcon::fromTheme("edit-delete"));
- d->repSubjectButton->setIcon(QIcon::fromTheme("view-refresh"));
+ d->addSubjectButton->setIcon(QIcon::fromTheme(QString::fromLatin1("list-add")).pixmap(16, \
16)); + d->delSubjectButton->setIcon(QIcon::fromTheme(QString::fromLatin1("edit-delete")).pixmap(16, \
16)); + d->repSubjectButton->setIcon(QIcon::fromTheme(QString::fromLatin1("view-refresh")).pixmap(16, \
16)); d->delSubjectButton->setEnabled(false);
d->repSubjectButton->setEnabled(false);
@@ -369,13 +369,13 @@ void SubjectWidget::slotRefChanged()
QString SubjectWidget::buildSubject() const
{
QString subject = m_iprEdit->text();
- subject.append(":");
+ subject.append(QString::fromLatin1(":"));
subject.append(m_refEdit->text());
- subject.append(":");
+ subject.append(QString::fromLatin1(":"));
subject.append(m_nameEdit->text());
- subject.append(":");
+ subject.append(QString::fromLatin1(":"));
subject.append(m_matterEdit->text());
- subject.append(":");
+ subject.append(QString::fromLatin1(":"));
subject.append(m_detailEdit->text());
return subject;
}
@@ -412,11 +412,11 @@ void SubjectWidget::slotSubjectSelectionChanged()
if (!d->subjectsBox->selectedItems().isEmpty())
{
QString subject = d->subjectsBox->selectedItems()[0]->text();
- m_iprEdit->setText(subject.section(':', 0, 0));
- m_refEdit->setText(subject.section(':', 1, 1));
- m_nameEdit->setText(subject.section(':', 2, 2));
- m_matterEdit->setText(subject.section(':', 3, 3));
- m_detailEdit->setText(subject.section(':', 4, 4));
+ m_iprEdit->setText(subject.section(QString::fromLatin1(":"), 0, 0));
+ m_refEdit->setText(subject.section(QString::fromLatin1(":"), 1, 1));
+ m_nameEdit->setText(subject.section(QString::fromLatin1(":"), 2, 2));
+ m_matterEdit->setText(subject.section(QString::fromLatin1(":"), 3, 3));
+ m_detailEdit->setText(subject.section(QString::fromLatin1(":"), 4, 4));
d->delSubjectButton->setEnabled(true);
d->repSubjectButton->setEnabled(true);
}
@@ -464,14 +464,14 @@ bool SubjectWidget::loadSubjectCodesFromXML(const QUrl& url)
if (!xmlfile.open(QIODevice::ReadOnly))
return false;
- QDomDocument xmlDoc("NewsML");
+ QDomDocument xmlDoc(QString::fromLatin1("NewsML"));
if (!xmlDoc.setContent(&xmlfile))
return false;
QDomElement xmlDocElem = xmlDoc.documentElement();
- if (xmlDocElem.tagName()!="NewsML")
+ if (xmlDocElem.tagName() != QString::fromLatin1("NewsML"))
return false;
for (QDomNode nbE1 = xmlDocElem.firstChild();
@@ -480,7 +480,7 @@ bool SubjectWidget::loadSubjectCodesFromXML(const QUrl& url)
QDomElement newsItemElement = nbE1.toElement();
if (newsItemElement.isNull()) continue;
- if (newsItemElement.tagName() != "NewsItem") continue;
+ if (newsItemElement.tagName() != QString::fromLatin1("NewsItem")) continue;
for (QDomNode nbE2 = newsItemElement.firstChild();
!nbE2.isNull(); nbE2 = nbE2.nextSibling())
@@ -488,7 +488,7 @@ bool SubjectWidget::loadSubjectCodesFromXML(const QUrl& url)
QDomElement topicSetElement = nbE2.toElement();
if (topicSetElement.isNull()) continue;
- if (topicSetElement.tagName() != "TopicSet") continue;
+ if (topicSetElement.tagName() != QString::fromLatin1("TopicSet")) \
continue;
for (QDomNode nbE3 = topicSetElement.firstChild();
!nbE3.isNull(); nbE3 = nbE3.nextSibling())
@@ -496,7 +496,7 @@ bool SubjectWidget::loadSubjectCodesFromXML(const QUrl& url)
QDomElement topicElement = nbE3.toElement();
if (topicElement.isNull()) continue;
- if (topicElement.tagName() != "Topic") continue;
+ if (topicElement.tagName() != QString::fromLatin1("Topic")) \
continue;
QString type, name, matter, detail, ref;
@@ -507,20 +507,20 @@ bool SubjectWidget::loadSubjectCodesFromXML(const QUrl& url)
if (topicSubElement.isNull()) continue;
- if (topicSubElement.tagName() == "TopicType")
- type = topicSubElement.attribute("FormalName");
+ if (topicSubElement.tagName() == \
QString::fromLatin1("TopicType")) + type = \
topicSubElement.attribute(QString::fromLatin1("FormalName"));
- if (topicSubElement.tagName() == "FormalName")
+ if (topicSubElement.tagName() == \
QString::fromLatin1("FormalName")) ref = topicSubElement.text();
- if (topicSubElement.tagName() == "Description" &&
- topicSubElement.attribute("Variant") == "Name")
+ if (topicSubElement.tagName() == \
QString::fromLatin1("Description") && + \
topicSubElement.attribute(QString::fromLatin1("Variant")) == \
QString::fromLatin1("Name")) {
- if (type == "Subject")
+ if (type == QString::fromLatin1("Subject"))
name = topicSubElement.text();
- else if (type == "SubjectMatter")
+ else if (type == QString::fromLatin1("SubjectMatter"))
matter = topicSubElement.text();
- else if (type == "SubjectDetail")
+ else if (type == QString::fromLatin1("SubjectDetail"))
detail = topicSubElement.text();
}
}
diff --git a/tests/setiptcpreview.cpp b/tests/setiptcpreview.cpp
index 714253d..61464f0 100644
--- a/tests/setiptcpreview.cpp
+++ b/tests/setiptcpreview.cpp
@@ -74,7 +74,7 @@ int main (int argc, char **argv)
QImage preview2;
KExiv2 meta2(filePath);
meta2.getImagePreview(preview2);
- preview2.save("preview.png", "PNG");
+ preview2.save(QString::fromLatin1("preview.png"), "PNG");
return 0;
}
diff --git a/tests/setxmpface.cpp b/tests/setxmpface.cpp
index b105b9b..87a188b 100644
--- a/tests/setxmpface.cpp
+++ b/tests/setxmpface.cpp
@@ -44,15 +44,15 @@ bool setFaceTags(KExiv2& meta,const char* xmpTagName,const \
QMap<QString,QRectF>& Q_UNUSED(setProgramName);
meta.setXmpTagString(xmpTagName,QString(),KExiv2::XmpTagType(1),false);
- QString qxmpTagName(xmpTagName);
- QString nameTagKey = qxmpTagName + QLatin1String("[%1]/mwg-rs:Name");
- QString typeTagKey = qxmpTagName + QLatin1String("[%1]/mwg-rs:Type");
- QString areaTagKey = qxmpTagName + QLatin1String("[%1]/mwg-rs:Area");
- QString areaxTagKey = qxmpTagName + \
QLatin1String("[%1]/mwg-rs:Area/stArea:x");
- QString areayTagKey = qxmpTagName + \
QLatin1String("[%1]/mwg-rs:Area/stArea:y");
- QString areawTagKey = qxmpTagName + \
QLatin1String("[%1]/mwg-rs:Area/stArea:w");
- QString areahTagKey = qxmpTagName + \
QLatin1String("[%1]/mwg-rs:Area/stArea:h");
- QString areanormTagKey = qxmpTagName + \
QLatin1String("[%1]/mwg-rs:Area/stArea:unit"); + QString \
qxmpTagName(QString::fromLatin1(xmpTagName)); + QString nameTagKey = \
qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Name"); + QString typeTagKey \
= qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Type"); + QString areaTagKey \
= qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Area"); + QString areaxTagKey \
= qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Area/stArea:x"); + QString \
areayTagKey = qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Area/stArea:y"); + \
QString areawTagKey = qxmpTagName + \
QString::fromLatin1("[%1]/mwg-rs:Area/stArea:w"); + QString areahTagKey = \
qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Area/stArea:h"); + QString \
areanormTagKey = qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Area/stArea:unit");
QMap<QString,QRectF>::const_iterator it = faces.constBegin();
int i =1;
@@ -64,7 +64,7 @@ bool setFaceTags(KExiv2& meta,const char* xmpTagName,const \
QMap<QString,QRectF>&
meta.setXmpTagString(nameTagKey.arg(i).toLatin1().constData(),it.key(),
KExiv2::XmpTagType(0),false);
/** Set tag type as Face **/
- meta.setXmpTagString(typeTagKey.arg(i).toLatin1().constData(),QString("Face"),
+ meta.setXmpTagString(typeTagKey.arg(i).toLatin1().constData(),QString::fromLatin1("Face"),
KExiv2::XmpTagType(0),false);
/** Set tag Area, with xmp type struct **/
meta.setXmpTagString(areaTagKey.arg(i).toLatin1().constData(),QString(),
@@ -82,7 +82,7 @@ bool setFaceTags(KExiv2& meta,const char* xmpTagName,const \
QMap<QString,QRectF>&
meta.setXmpTagString(areahTagKey.arg(i).toLatin1().constData(),QString::number(h),
KExiv2::XmpTagType(0),false);
/** Set stArea:unit inside Area structure as normalized **/
- meta.setXmpTagString(areanormTagKey.arg(i).toLatin1().constData(),QString("normalized"),
+ meta.setXmpTagString(areanormTagKey.arg(i).toLatin1().constData(),QString::fromLatin1("normalized"),
KExiv2::XmpTagType(0),false);
++it;
@@ -95,20 +95,21 @@ bool setFaceTags(KExiv2& meta,const char* xmpTagName,const \
QMap<QString,QRectF>&
void removeFaceTags(KExiv2& meta,const char* xmpTagName)
{
- QString qxmpTagName(xmpTagName);
- QString regionTagKey = qxmpTagName + QString("[%1]");
- QString nameTagKey = qxmpTagName + QString("[%1]/mwg-rs:Name");
- QString typeTagKey = qxmpTagName + QString("[%1]/mwg-rs:Type");
- QString areaTagKey = qxmpTagName + QString("[%1]/mwg-rs:Area");
- QString areaxTagKey = qxmpTagName + QString("[%1]/mwg-rs:Area/stArea:x");
- QString areayTagKey = qxmpTagName + QString("[%1]/mwg-rs:Area/stArea:y");
- QString areawTagKey = qxmpTagName + QString("[%1]/mwg-rs:Area/stArea:w");
- QString areahTagKey = qxmpTagName + QString("[%1]/mwg-rs:Area/stArea:h");
- QString areanormTagKey = qxmpTagName + \
QString("[%1]/mwg-rs:Area/stArea:unit"); + QString \
qxmpTagName(QString::fromLatin1(xmpTagName)); + QString regionTagKey = \
qxmpTagName + QString::fromLatin1("[%1]"); + QString nameTagKey = \
qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Name"); + QString typeTagKey \
= qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Type"); + QString areaTagKey \
= qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Area"); + QString areaxTagKey \
= qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Area/stArea:x"); + QString \
areayTagKey = qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Area/stArea:y"); + \
QString areawTagKey = qxmpTagName + \
QString::fromLatin1("[%1]/mwg-rs:Area/stArea:w"); + QString areahTagKey = \
qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Area/stArea:h"); + QString \
areanormTagKey = qxmpTagName + QString::fromLatin1("[%1]/mwg-rs:Area/stArea:unit");
meta.removeXmpTag(xmpTagName,false);
- bool dirty= true;
- int i=1;
+ bool dirty = true;
+ int i =1;
+
while(dirty)
{
dirty = false;
@@ -124,16 +125,17 @@ void removeFaceTags(KExiv2& meta,const char* xmpTagName)
i++;
}
}
+
int main (int argc, char **argv)
{
- if(argc != 3)
+ if (argc != 3)
{
qDebug() << "Adding a face rectangle to image";
qDebug() << "Usage: <add/remove> <image>";
return -1;
}
- QString filePath(argv[2]);
+ QString filePath(QString::fromLatin1(argv[2]));
KExiv2Iface::KExiv2::initializeExiv2();
KExiv2 meta;
@@ -141,7 +143,7 @@ int main (int argc, char **argv)
meta.setWriteRawFiles(true);
/** Add a random rectangle with facetag Bob **/
- QString name = "Bob Marley";
+ QString name = QString::fromLatin1("Bob Marley");
float x =0.5;
float y =0.5;
float w = 60;
@@ -153,7 +155,7 @@ int main (int argc, char **argv)
faces[name] = rect;
- QString name2 = "Hello Kitty!";
+ QString name2 = QString::fromLatin1("Hello Kitty!");
QRectF rect2(0.4,0.4,30,30);
faces[name2] = rect2;
@@ -162,18 +164,18 @@ int main (int argc, char **argv)
qDebug() << "Image support XMP" << g;
- const QString bag = "Xmp.mwg-rs.Regions/mwg-rs:RegionList";
+ const QString bag = QString::fromLatin1("Xmp.mwg-rs.Regions/mwg-rs:RegionList");
- QString op(argv[1]);
+ QString op(QString::fromLatin1(argv[1]));
- if(op == "add")
+ if (op == QString::fromLatin1("add"))
setFaceTags(meta,bag.toLatin1().constData(),faces,false);
else
removeFaceTags(meta,bag.toLatin1().constData());
meta.applyChanges();
- QString recoverName = "Xmp.mwg-rs.Regions/mwg-rs:RegionList[1]/mwg-rs:Name";
+ QString recoverName = \
QString::fromLatin1("Xmp.mwg-rs.Regions/mwg-rs:RegionList[1]/mwg-rs:Name");
KExiv2 meta2;
meta2.load(filePath);
diff --git a/tests/usexmpsidecar.cpp b/tests/usexmpsidecar.cpp
index 8d47678..a6f3402 100644
--- a/tests/usexmpsidecar.cpp
+++ b/tests/usexmpsidecar.cpp
@@ -46,7 +46,7 @@ int main (int argc, char **argv)
return -1;
}
- QString filePath(argv[1]);
+ QString filePath(QString::fromLatin1(argv[1]));
KExiv2 meta;
meta.setUseXMPSidecar4Reading(true);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic