From 3cb3a5c3a8a1deb1631a296894c152d82e2f9959 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 10 Apr 2011 08:32:40 +0000 Subject: [PATCH] Fixing msvc issue: compiler limit : blocks nested too deeply --- .../gamelobbydialog/gamelobbydialogimpl.cpp | 499 +++++++++--------- .../qt/gamelobbydialog/gamelobbydialogimpl.h | 5 +- 2 files changed, 257 insertions(+), 247 deletions(-) diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index c9970f7b..5380ba92 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -25,6 +25,7 @@ using namespace std; + gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) : QDialog(parent), myW(NULL), myStartWindow(parent), myConfig(c), currentGameName(""), myPlayerId(0), isGameAdministrator(false), inGame(false), guestMode(false), blinkingButtonAnimationState(true), myChat(NULL), keyUpCounter(0), infoMsgToShowId(0), currentInvitationGameId(0), inviteDialogIsCurrentlyShown(false), autoStartTimerCounter(0) { @@ -1671,251 +1672,259 @@ void gameLobbyDialogImpl::showConnectedPlayersContextMenu(QPoint p) QString gameLobbyDialogImpl::getFullCountryString(QString cs) { - QString fullString(""); - if(cs == "") fullString = ""; - else if(cs == "AF") fullString = tr("Afghanistan"); - else if(cs == "AX") fullString = tr("ALand Islands"); - else if(cs == "AL") fullString = tr("Albania"); - else if(cs == "DZ") fullString = tr("Algeria"); - else if(cs == "AS") fullString = tr("American Samoa"); - else if(cs == "AD") fullString = tr("Andorra"); - else if(cs == "AO") fullString = tr("Angola"); - else if(cs == "AI") fullString = tr("Anguilla"); - else if(cs == "AQ") fullString = tr("Antarctica"); - else if(cs == "AG") fullString = tr("Antigua And Barbuda"); - else if(cs == "AR") fullString = tr("Argentina"); - else if(cs == "AM") fullString = tr("Armenia"); - else if(cs == "AW") fullString = tr("Aruba"); - else if(cs == "AU") fullString = tr("Australia"); - else if(cs == "AT") fullString = tr("Austria"); - else if(cs == "AZ") fullString = tr("Azerbaijan"); - else if(cs == "BS") fullString = tr("Bahamas"); - else if(cs == "BH") fullString = tr("Bahrain"); - else if(cs == "BD") fullString = tr("Bangladesh"); - else if(cs == "BB") fullString = tr("Barbados"); - else if(cs == "BY") fullString = tr("Belarus"); - else if(cs == "BE") fullString = tr("Belgium"); - else if(cs == "BZ") fullString = tr("Belize"); - else if(cs == "BJ") fullString = tr("Benin"); - else if(cs == "BM") fullString = tr("Bermuda"); - else if(cs == "BT") fullString = tr("Bhutan"); - else if(cs == "BO") fullString = tr("Bolivia"); - else if(cs == "BA") fullString = tr("Bosnia And Herzegovina"); - else if(cs == "BW") fullString = tr("Botswana"); - else if(cs == "BV") fullString = tr("Bouvet Island"); - else if(cs == "BR") fullString = tr("Brazil"); - else if(cs == "IO") fullString = tr("British Indian Ocean Territory"); - else if(cs == "BN") fullString = tr("Brunei Darussalam"); - else if(cs == "BG") fullString = tr("Bulgaria"); - else if(cs == "BF") fullString = tr("Burkina Faso"); - else if(cs == "BI") fullString = tr("Burundi"); - else if(cs == "KH") fullString = tr("Cambodia"); - else if(cs == "CM") fullString = tr("Cameroon"); - else if(cs == "CA") fullString = tr("Canada"); - else if(cs == "CV") fullString = tr("Cape Verde"); - else if(cs == "KY") fullString = tr("Cayman Islands"); - else if(cs == "CF") fullString = tr("Central African Republic"); - else if(cs == "TD") fullString = tr("Chad"); - else if(cs == "CL") fullString = tr("Chile"); - else if(cs == "CN") fullString = tr("China"); - else if(cs == "CX") fullString = tr("Christmas Island"); - else if(cs == "CC") fullString = tr("Cocos (Keeling) Islands"); - else if(cs == "CO") fullString = tr("Colombia"); - else if(cs == "KM") fullString = tr("Comoros"); - else if(cs == "CG") fullString = tr("Congo"); - else if(cs == "CD") fullString = tr("Congo, The Democratic Republic Of The"); - else if(cs == "CK") fullString = tr("Cook Islands"); - else if(cs == "CR") fullString = tr("Costa Rica"); - else if(cs == "CI") fullString = tr("Cote D'Ivoire"); - else if(cs == "HR") fullString = tr("Croatia"); - else if(cs == "CU") fullString = tr("Cuba"); - else if(cs == "CY") fullString = tr("Cyprus"); - else if(cs == "CZ") fullString = tr("Czech Republic"); - else if(cs == "DK") fullString = tr("Denmark"); - else if(cs == "DJ") fullString = tr("Djibouti"); - else if(cs == "DM") fullString = tr("Dominica"); - else if(cs == "DO") fullString = tr("Dominican Republic"); - else if(cs == "EC") fullString = tr("Ecuador"); - else if(cs == "EG") fullString = tr("Egypt"); - else if(cs == "SV") fullString = tr("El Salvador"); - else if(cs == "GQ") fullString = tr("Equatorial Guinea"); - else if(cs == "ER") fullString = tr("Eritrea"); - else if(cs == "EE") fullString = tr("Estonia"); - else if(cs == "ET") fullString = tr("Ethiopia"); - else if(cs == "FK") fullString = tr("Falkland Islands (Malvinas)"); - else if(cs == "FO") fullString = tr("Faroe Islands"); - else if(cs == "FJ") fullString = tr("Fiji"); - else if(cs == "FI") fullString = tr("Finland"); - else if(cs == "FR") fullString = tr("France"); - else if(cs == "GF") fullString = tr("French Guiana"); - else if(cs == "PF") fullString = tr("French Polynesia"); - else if(cs == "TF") fullString = tr("French Southern Territories"); - else if(cs == "GA") fullString = tr("Gabon"); - else if(cs == "GM") fullString = tr("Gambia"); - else if(cs == "GE") fullString = tr("Georgia"); - else if(cs == "DE") fullString = tr("Germany"); - else if(cs == "GH") fullString = tr("Ghana"); - else if(cs == "GI") fullString = tr("Gibraltar"); - else if(cs == "GR") fullString = tr("Greece"); - else if(cs == "GL") fullString = tr("Greenland"); - else if(cs == "GD") fullString = tr("Grenada"); - else if(cs == "GP") fullString = tr("Guadeloupe"); - else if(cs == "GU") fullString = tr("Guam"); - else if(cs == "GT") fullString = tr("Guatemala"); - else if(cs == "GG") fullString = tr("Guernsey"); - else if(cs == "GN") fullString = tr("Guinea"); - else if(cs == "GW") fullString = tr("Guinea-Bissau"); - else if(cs == "GY") fullString = tr("Guyana"); - else if(cs == "HT") fullString = tr("Haiti"); - else if(cs == "HM") fullString = tr("Heard Island And Mcdonald Islands"); - else if(cs == "VA") fullString = tr("Holy See (Vatican City State)"); - else if(cs == "HN") fullString = tr("Honduras"); - else if(cs == "HK") fullString = tr("Hong Kong"); - else if(cs == "HU") fullString = tr("Hungary"); - else if(cs == "IS") fullString = tr("Iceland"); - else if(cs == "IN") fullString = tr("India"); - else if(cs == "ID") fullString = tr("Indonesia"); - else if(cs == "IR") fullString = tr("Iran, Islamic Republic Of"); - else if(cs == "IQ") fullString = tr("Iraq"); - else if(cs == "IE") fullString = tr("Ireland"); - else if(cs == "IM") fullString = tr("Isle Of Man"); - else if(cs == "IL") fullString = tr("Israel"); - else if(cs == "IT") fullString = tr("Italy"); - else if(cs == "JM") fullString = tr("Jamaica"); - else if(cs == "JP") fullString = tr("Japan"); - else if(cs == "JE") fullString = tr("Jersey"); - else if(cs == "JO") fullString = tr("Jordan"); - else if(cs == "KZ") fullString = tr("Kazakhstan"); - else if(cs == "KE") fullString = tr("Kenya"); - else if(cs == "KI") fullString = tr("Kiribati"); - else if(cs == "KP") fullString = tr("Korea, Democratic People'S Republic Of"); - else if(cs == "KR") fullString = tr("Korea, Republic Of"); - else if(cs == "KW") fullString = tr("Kuwait"); - else if(cs == "KG") fullString = tr("Kyrgyzstan"); - else if(cs == "LA") fullString = tr("Lao People'S Democratic Republic"); - else if(cs == "LV") fullString = tr("Latvia"); - else if(cs == "LB") fullString = tr("Lebanon"); - else if(cs == "LS") fullString = tr("Lesotho"); - else if(cs == "LR") fullString = tr("Liberia"); - else if(cs == "LY") fullString = tr("Libyan Arab Jamahiriya"); - else if(cs == "LI") fullString = tr("Liechtenstein"); - else if(cs == "LT") fullString = tr("Lithuania"); - else if(cs == "LU") fullString = tr("Luxembourg"); - else if(cs == "MO") fullString = tr("Macao"); - else if(cs == "MK") fullString = tr("Macedonia, The Former Yugoslav Republic Of"); - else if(cs == "MG") fullString = tr("Madagascar"); - else if(cs == "MW") fullString = tr("Malawi"); - else if(cs == "MY") fullString = tr("Malaysia"); - else if(cs == "MV") fullString = tr("Maldives"); - else if(cs == "ML") fullString = tr("Mali"); - else if(cs == "MT") fullString = tr("Malta"); - else if(cs == "MH") fullString = tr("Marshall Islands"); - else if(cs == "MQ") fullString = tr("Martinique"); - else if(cs == "MR") fullString = tr("Mauritania"); - else if(cs == "MU") fullString = tr("Mauritius"); - else if(cs == "YT") fullString = tr("Mayotte"); - else if(cs == "MX") fullString = tr("Mexico"); - else if(cs == "FM") fullString = tr("Micronesia, Federated States Of"); - else if(cs == "MD") fullString = tr("Moldova, Republic Of"); - else if(cs == "MC") fullString = tr("Monaco"); - else if(cs == "MN") fullString = tr("Mongolia"); - else if(cs == "MS") fullString = tr("Montserrat"); - else if(cs == "MA") fullString = tr("Morocco"); - else if(cs == "MZ") fullString = tr("Mozambique"); - else if(cs == "MM") fullString = tr("Myanmar"); - else if(cs == "NA") fullString = tr("Namibia"); - else if(cs == "NR") fullString = tr("Nauru"); - else if(cs == "NP") fullString = tr("Nepal"); - else if(cs == "NL") fullString = tr("Netherlands"); - else if(cs == "AN") fullString = tr("Netherlands Antilles"); - else if(cs == "NC") fullString = tr("New Caledonia"); - else if(cs == "NZ") fullString = tr("New Zealand"); - else if(cs == "NI") fullString = tr("Nicaragua"); - else if(cs == "NE") fullString = tr("Niger"); - else if(cs == "NG") fullString = tr("Nigeria"); - else if(cs == "NU") fullString = tr("Niue"); - else if(cs == "NF") fullString = tr("Norfolk Island"); - else if(cs == "MP") fullString = tr("Northern Mariana Islands"); - else if(cs == "NO") fullString = tr("Norway"); - else if(cs == "OM") fullString = tr("Oman"); - else if(cs == "PK") fullString = tr("Pakistan"); - else if(cs == "PW") fullString = tr("Palau"); - else if(cs == "PS") fullString = tr("Palestinian Territory, Occupied"); - else if(cs == "PA") fullString = tr("Panama"); - else if(cs == "PG") fullString = tr("Papua New Guinea"); - else if(cs == "PY") fullString = tr("Paraguay"); - else if(cs == "PE") fullString = tr("Peru"); - else if(cs == "PH") fullString = tr("Philippines"); - else if(cs == "PN") fullString = tr("Pitcairn"); - else if(cs == "PL") fullString = tr("Poland"); - else if(cs == "PT") fullString = tr("Portugal"); - else if(cs == "PR") fullString = tr("Puerto Rico"); - else if(cs == "QA") fullString = tr("Qatar"); - else if(cs == "RE") fullString = tr("Reunion"); - else if(cs == "RO") fullString = tr("Romania"); - else if(cs == "RU") fullString = tr("Russian Federation"); - else if(cs == "RW") fullString = tr("Rwanda"); - else if(cs == "SH") fullString = tr("Saint Helena"); - else if(cs == "KN") fullString = tr("Saint Kitts And Nevis"); - else if(cs == "LC") fullString = tr("Saint Lucia"); - else if(cs == "PM") fullString = tr("Saint Pierre And Miquelon"); - else if(cs == "VC") fullString = tr("Saint Vincent And The Grenadines"); - else if(cs == "WS") fullString = tr("Samoa"); - else if(cs == "SM") fullString = tr("San Marino"); - else if(cs == "ST") fullString = tr("Sao Tome And Principe"); - else if(cs == "SA") fullString = tr("Saudi Arabia"); - else if(cs == "SN") fullString = tr("Senegal"); - else if(cs == "CS") fullString = tr("Serbia And Montenegro"); - else if(cs == "SC") fullString = tr("Seychelles"); - else if(cs == "SL") fullString = tr("Sierra Leone"); - else if(cs == "SG") fullString = tr("Singapore"); - else if(cs == "SK") fullString = tr("Slovakia"); - else if(cs == "SI") fullString = tr("Slovenia"); - else if(cs == "SB") fullString = tr("Solomon Islands"); - else if(cs == "SO") fullString = tr("Somalia"); - else if(cs == "ZA") fullString = tr("South Africa"); - else if(cs == "GS") fullString = tr("South Georgia And The South Sandwich Islands"); - else if(cs == "ES") fullString = tr("Spain"); - else if(cs == "LK") fullString = tr("Sri Lanka"); - else if(cs == "SD") fullString = tr("Sudan"); - else if(cs == "SR") fullString = tr("Suriname"); - else if(cs == "SJ") fullString = tr("Svalbard And Jan Mayen"); - else if(cs == "SZ") fullString = tr("Swaziland"); - else if(cs == "SE") fullString = tr("Sweden"); - else if(cs == "CH") fullString = tr("Switzerland"); - else if(cs == "SY") fullString = tr("Syrian Arab Republic"); - else if(cs == "TW") fullString = tr("Taiwan, Province Of China"); - else if(cs == "TJ") fullString = tr("Tajikistan"); - else if(cs == "TZ") fullString = tr("Tanzania, United Republic Of"); - else if(cs == "TH") fullString = tr("Thailand"); - else if(cs == "TL") fullString = tr("Timor-Leste"); - else if(cs == "TG") fullString = tr("Togo"); - else if(cs == "TK") fullString = tr("Tokelau"); - else if(cs == "TO") fullString = tr("Tonga"); - else if(cs == "TT") fullString = tr("Trinidad And Tobago"); - else if(cs == "TN") fullString = tr("Tunisia"); - else if(cs == "TR") fullString = tr("Turkey"); - else if(cs == "TM") fullString = tr("Turkmenistan"); - else if(cs == "TC") fullString = tr("Turks And Caicos Islands"); - else if(cs == "TV") fullString = tr("Tuvalu"); - else if(cs == "UG") fullString = tr("Uganda"); - else if(cs == "UA") fullString = tr("Ukraine"); - else if(cs == "AE") fullString = tr("United Arab Emirates"); - else if(cs == "GB") fullString = tr("United Kingdom"); - else if(cs == "US") fullString = tr("United States"); - else if(cs == "UM") fullString = tr("United States Minor Outlying Islands"); - else if(cs == "UY") fullString = tr("Uruguay"); - else if(cs == "UZ") fullString = tr("Uzbekistan"); - else if(cs == "VU") fullString = tr("Vanuatu"); - else if(cs == "VE") fullString = tr("Venezuela"); - else if(cs == "VN") fullString = tr("Viet Nam"); - else if(cs == "VG") fullString = tr("Virgin Islands, British"); - else if(cs == "VI") fullString = tr("Virgin Islands, U.S."); - else if(cs == "WF") fullString = tr("Wallis And Futuna"); - else if(cs == "EH") fullString = tr("Western Sahara"); - else if(cs == "YE") fullString = tr("Yemen"); - else if(cs == "ZM") fullString = tr("Zambia"); - else if(cs == "ZW") fullString = tr("Zimbabwe"); + // Initialise map of country strings, if needed. + if (countryStringMap.empty()) { + countryStringMap.insert(CountryStringMap::value_type("AF", tr("Afghanistan"))); + countryStringMap.insert(CountryStringMap::value_type("AX", tr("ALand Islands"))); + countryStringMap.insert(CountryStringMap::value_type("AL", tr("Albania"))); + countryStringMap.insert(CountryStringMap::value_type("DZ", tr("Algeria"))); + countryStringMap.insert(CountryStringMap::value_type("AS", tr("American Samoa"))); + countryStringMap.insert(CountryStringMap::value_type("AD", tr("Andorra"))); + countryStringMap.insert(CountryStringMap::value_type("AO", tr("Angola"))); + countryStringMap.insert(CountryStringMap::value_type("AI", tr("Anguilla"))); + countryStringMap.insert(CountryStringMap::value_type("AQ", tr("Antarctica"))); + countryStringMap.insert(CountryStringMap::value_type("AG", tr("Antigua And Barbuda"))); + countryStringMap.insert(CountryStringMap::value_type("AR", tr("Argentina"))); + countryStringMap.insert(CountryStringMap::value_type("AM", tr("Armenia"))); + countryStringMap.insert(CountryStringMap::value_type("AW", tr("Aruba"))); + countryStringMap.insert(CountryStringMap::value_type("AU", tr("Australia"))); + countryStringMap.insert(CountryStringMap::value_type("AT", tr("Austria"))); + countryStringMap.insert(CountryStringMap::value_type("AZ", tr("Azerbaijan"))); + countryStringMap.insert(CountryStringMap::value_type("BS", tr("Bahamas"))); + countryStringMap.insert(CountryStringMap::value_type("BH", tr("Bahrain"))); + countryStringMap.insert(CountryStringMap::value_type("BD", tr("Bangladesh"))); + countryStringMap.insert(CountryStringMap::value_type("BB", tr("Barbados"))); + countryStringMap.insert(CountryStringMap::value_type("BY", tr("Belarus"))); + countryStringMap.insert(CountryStringMap::value_type("BE", tr("Belgium"))); + countryStringMap.insert(CountryStringMap::value_type("BZ", tr("Belize"))); + countryStringMap.insert(CountryStringMap::value_type("BJ", tr("Benin"))); + countryStringMap.insert(CountryStringMap::value_type("BM", tr("Bermuda"))); + countryStringMap.insert(CountryStringMap::value_type("BT", tr("Bhutan"))); + countryStringMap.insert(CountryStringMap::value_type("BO", tr("Bolivia"))); + countryStringMap.insert(CountryStringMap::value_type("BA", tr("Bosnia And Herzegovina"))); + countryStringMap.insert(CountryStringMap::value_type("BW", tr("Botswana"))); + countryStringMap.insert(CountryStringMap::value_type("BV", tr("Bouvet Island"))); + countryStringMap.insert(CountryStringMap::value_type("BR", tr("Brazil"))); + countryStringMap.insert(CountryStringMap::value_type("IO", tr("British Indian Ocean Territory"))); + countryStringMap.insert(CountryStringMap::value_type("BN", tr("Brunei Darussalam"))); + countryStringMap.insert(CountryStringMap::value_type("BG", tr("Bulgaria"))); + countryStringMap.insert(CountryStringMap::value_type("BF", tr("Burkina Faso"))); + countryStringMap.insert(CountryStringMap::value_type("BI", tr("Burundi"))); + countryStringMap.insert(CountryStringMap::value_type("KH", tr("Cambodia"))); + countryStringMap.insert(CountryStringMap::value_type("CM", tr("Cameroon"))); + countryStringMap.insert(CountryStringMap::value_type("CA", tr("Canada"))); + countryStringMap.insert(CountryStringMap::value_type("CV", tr("Cape Verde"))); + countryStringMap.insert(CountryStringMap::value_type("KY", tr("Cayman Islands"))); + countryStringMap.insert(CountryStringMap::value_type("CF", tr("Central African Republic"))); + countryStringMap.insert(CountryStringMap::value_type("TD", tr("Chad"))); + countryStringMap.insert(CountryStringMap::value_type("CL", tr("Chile"))); + countryStringMap.insert(CountryStringMap::value_type("CN", tr("China"))); + countryStringMap.insert(CountryStringMap::value_type("CX", tr("Christmas Island"))); + countryStringMap.insert(CountryStringMap::value_type("CC", tr("Cocos (Keeling) Islands"))); + countryStringMap.insert(CountryStringMap::value_type("CO", tr("Colombia"))); + countryStringMap.insert(CountryStringMap::value_type("KM", tr("Comoros"))); + countryStringMap.insert(CountryStringMap::value_type("CG", tr("Congo"))); + countryStringMap.insert(CountryStringMap::value_type("CD", tr("Congo, The Democratic Republic Of The"))); + countryStringMap.insert(CountryStringMap::value_type("CK", tr("Cook Islands"))); + countryStringMap.insert(CountryStringMap::value_type("CR", tr("Costa Rica"))); + countryStringMap.insert(CountryStringMap::value_type("CI", tr("Cote D'Ivoire"))); + countryStringMap.insert(CountryStringMap::value_type("HR", tr("Croatia"))); + countryStringMap.insert(CountryStringMap::value_type("CU", tr("Cuba"))); + countryStringMap.insert(CountryStringMap::value_type("CY", tr("Cyprus"))); + countryStringMap.insert(CountryStringMap::value_type("CZ", tr("Czech Republic"))); + countryStringMap.insert(CountryStringMap::value_type("DK", tr("Denmark"))); + countryStringMap.insert(CountryStringMap::value_type("DJ", tr("Djibouti"))); + countryStringMap.insert(CountryStringMap::value_type("DM", tr("Dominica"))); + countryStringMap.insert(CountryStringMap::value_type("DO", tr("Dominican Republic"))); + countryStringMap.insert(CountryStringMap::value_type("EC", tr("Ecuador"))); + countryStringMap.insert(CountryStringMap::value_type("EG", tr("Egypt"))); + countryStringMap.insert(CountryStringMap::value_type("SV", tr("El Salvador"))); + countryStringMap.insert(CountryStringMap::value_type("GQ", tr("Equatorial Guinea"))); + countryStringMap.insert(CountryStringMap::value_type("ER", tr("Eritrea"))); + countryStringMap.insert(CountryStringMap::value_type("EE", tr("Estonia"))); + countryStringMap.insert(CountryStringMap::value_type("ET", tr("Ethiopia"))); + countryStringMap.insert(CountryStringMap::value_type("FK", tr("Falkland Islands (Malvinas)"))); + countryStringMap.insert(CountryStringMap::value_type("FO", tr("Faroe Islands"))); + countryStringMap.insert(CountryStringMap::value_type("FJ", tr("Fiji"))); + countryStringMap.insert(CountryStringMap::value_type("FI", tr("Finland"))); + countryStringMap.insert(CountryStringMap::value_type("FR", tr("France"))); + countryStringMap.insert(CountryStringMap::value_type("GF", tr("French Guiana"))); + countryStringMap.insert(CountryStringMap::value_type("PF", tr("French Polynesia"))); + countryStringMap.insert(CountryStringMap::value_type("TF", tr("French Southern Territories"))); + countryStringMap.insert(CountryStringMap::value_type("GA", tr("Gabon"))); + countryStringMap.insert(CountryStringMap::value_type("GM", tr("Gambia"))); + countryStringMap.insert(CountryStringMap::value_type("GE", tr("Georgia"))); + countryStringMap.insert(CountryStringMap::value_type("DE", tr("Germany"))); + countryStringMap.insert(CountryStringMap::value_type("GH", tr("Ghana"))); + countryStringMap.insert(CountryStringMap::value_type("GI", tr("Gibraltar"))); + countryStringMap.insert(CountryStringMap::value_type("GR", tr("Greece"))); + countryStringMap.insert(CountryStringMap::value_type("GL", tr("Greenland"))); + countryStringMap.insert(CountryStringMap::value_type("GD", tr("Grenada"))); + countryStringMap.insert(CountryStringMap::value_type("GP", tr("Guadeloupe"))); + countryStringMap.insert(CountryStringMap::value_type("GU", tr("Guam"))); + countryStringMap.insert(CountryStringMap::value_type("GT", tr("Guatemala"))); + countryStringMap.insert(CountryStringMap::value_type("GG", tr("Guernsey"))); + countryStringMap.insert(CountryStringMap::value_type("GN", tr("Guinea"))); + countryStringMap.insert(CountryStringMap::value_type("GW", tr("Guinea-Bissau"))); + countryStringMap.insert(CountryStringMap::value_type("GY", tr("Guyana"))); + countryStringMap.insert(CountryStringMap::value_type("HT", tr("Haiti"))); + countryStringMap.insert(CountryStringMap::value_type("HM", tr("Heard Island And Mcdonald Islands"))); + countryStringMap.insert(CountryStringMap::value_type("VA", tr("Holy See (Vatican City State)"))); + countryStringMap.insert(CountryStringMap::value_type("HN", tr("Honduras"))); + countryStringMap.insert(CountryStringMap::value_type("HK", tr("Hong Kong"))); + countryStringMap.insert(CountryStringMap::value_type("HU", tr("Hungary"))); + countryStringMap.insert(CountryStringMap::value_type("IS", tr("Iceland"))); + countryStringMap.insert(CountryStringMap::value_type("IN", tr("India"))); + countryStringMap.insert(CountryStringMap::value_type("ID", tr("Indonesia"))); + countryStringMap.insert(CountryStringMap::value_type("IR", tr("Iran, Islamic Republic Of"))); + countryStringMap.insert(CountryStringMap::value_type("IQ", tr("Iraq"))); + countryStringMap.insert(CountryStringMap::value_type("IE", tr("Ireland"))); + countryStringMap.insert(CountryStringMap::value_type("IM", tr("Isle Of Man"))); + countryStringMap.insert(CountryStringMap::value_type("IL", tr("Israel"))); + countryStringMap.insert(CountryStringMap::value_type("IT", tr("Italy"))); + countryStringMap.insert(CountryStringMap::value_type("JM", tr("Jamaica"))); + countryStringMap.insert(CountryStringMap::value_type("JP", tr("Japan"))); + countryStringMap.insert(CountryStringMap::value_type("JE", tr("Jersey"))); + countryStringMap.insert(CountryStringMap::value_type("JO", tr("Jordan"))); + countryStringMap.insert(CountryStringMap::value_type("KZ", tr("Kazakhstan"))); + countryStringMap.insert(CountryStringMap::value_type("KE", tr("Kenya"))); + countryStringMap.insert(CountryStringMap::value_type("KI", tr("Kiribati"))); + countryStringMap.insert(CountryStringMap::value_type("KP", tr("Korea, Democratic People'S Republic Of"))); + countryStringMap.insert(CountryStringMap::value_type("KR", tr("Korea, Republic Of"))); + countryStringMap.insert(CountryStringMap::value_type("KW", tr("Kuwait"))); + countryStringMap.insert(CountryStringMap::value_type("KG", tr("Kyrgyzstan"))); + countryStringMap.insert(CountryStringMap::value_type("LA", tr("Lao People'S Democratic Republic"))); + countryStringMap.insert(CountryStringMap::value_type("LV", tr("Latvia"))); + countryStringMap.insert(CountryStringMap::value_type("LB", tr("Lebanon"))); + countryStringMap.insert(CountryStringMap::value_type("LS", tr("Lesotho"))); + countryStringMap.insert(CountryStringMap::value_type("LR", tr("Liberia"))); + countryStringMap.insert(CountryStringMap::value_type("LY", tr("Libyan Arab Jamahiriya"))); + countryStringMap.insert(CountryStringMap::value_type("LI", tr("Liechtenstein"))); + countryStringMap.insert(CountryStringMap::value_type("LT", tr("Lithuania"))); + countryStringMap.insert(CountryStringMap::value_type("LU", tr("Luxembourg"))); + countryStringMap.insert(CountryStringMap::value_type("MO", tr("Macao"))); + countryStringMap.insert(CountryStringMap::value_type("MK", tr("Macedonia, The Former Yugoslav Republic Of"))); + countryStringMap.insert(CountryStringMap::value_type("MG", tr("Madagascar"))); + countryStringMap.insert(CountryStringMap::value_type("MW", tr("Malawi"))); + countryStringMap.insert(CountryStringMap::value_type("MY", tr("Malaysia"))); + countryStringMap.insert(CountryStringMap::value_type("MV", tr("Maldives"))); + countryStringMap.insert(CountryStringMap::value_type("ML", tr("Mali"))); + countryStringMap.insert(CountryStringMap::value_type("MT", tr("Malta"))); + countryStringMap.insert(CountryStringMap::value_type("MH", tr("Marshall Islands"))); + countryStringMap.insert(CountryStringMap::value_type("MQ", tr("Martinique"))); + countryStringMap.insert(CountryStringMap::value_type("MR", tr("Mauritania"))); + countryStringMap.insert(CountryStringMap::value_type("MU", tr("Mauritius"))); + countryStringMap.insert(CountryStringMap::value_type("YT", tr("Mayotte"))); + countryStringMap.insert(CountryStringMap::value_type("MX", tr("Mexico"))); + countryStringMap.insert(CountryStringMap::value_type("FM", tr("Micronesia, Federated States Of"))); + countryStringMap.insert(CountryStringMap::value_type("MD", tr("Moldova, Republic Of"))); + countryStringMap.insert(CountryStringMap::value_type("MC", tr("Monaco"))); + countryStringMap.insert(CountryStringMap::value_type("MN", tr("Mongolia"))); + countryStringMap.insert(CountryStringMap::value_type("MS", tr("Montserrat"))); + countryStringMap.insert(CountryStringMap::value_type("MA", tr("Morocco"))); + countryStringMap.insert(CountryStringMap::value_type("MZ", tr("Mozambique"))); + countryStringMap.insert(CountryStringMap::value_type("MM", tr("Myanmar"))); + countryStringMap.insert(CountryStringMap::value_type("NA", tr("Namibia"))); + countryStringMap.insert(CountryStringMap::value_type("NR", tr("Nauru"))); + countryStringMap.insert(CountryStringMap::value_type("NP", tr("Nepal"))); + countryStringMap.insert(CountryStringMap::value_type("NL", tr("Netherlands"))); + countryStringMap.insert(CountryStringMap::value_type("AN", tr("Netherlands Antilles"))); + countryStringMap.insert(CountryStringMap::value_type("NC", tr("New Caledonia"))); + countryStringMap.insert(CountryStringMap::value_type("NZ", tr("New Zealand"))); + countryStringMap.insert(CountryStringMap::value_type("NI", tr("Nicaragua"))); + countryStringMap.insert(CountryStringMap::value_type("NE", tr("Niger"))); + countryStringMap.insert(CountryStringMap::value_type("NG", tr("Nigeria"))); + countryStringMap.insert(CountryStringMap::value_type("NU", tr("Niue"))); + countryStringMap.insert(CountryStringMap::value_type("NF", tr("Norfolk Island"))); + countryStringMap.insert(CountryStringMap::value_type("MP", tr("Northern Mariana Islands"))); + countryStringMap.insert(CountryStringMap::value_type("NO", tr("Norway"))); + countryStringMap.insert(CountryStringMap::value_type("OM", tr("Oman"))); + countryStringMap.insert(CountryStringMap::value_type("PK", tr("Pakistan"))); + countryStringMap.insert(CountryStringMap::value_type("PW", tr("Palau"))); + countryStringMap.insert(CountryStringMap::value_type("PS", tr("Palestinian Territory, Occupied"))); + countryStringMap.insert(CountryStringMap::value_type("PA", tr("Panama"))); + countryStringMap.insert(CountryStringMap::value_type("PG", tr("Papua New Guinea"))); + countryStringMap.insert(CountryStringMap::value_type("PY", tr("Paraguay"))); + countryStringMap.insert(CountryStringMap::value_type("PE", tr("Peru"))); + countryStringMap.insert(CountryStringMap::value_type("PH", tr("Philippines"))); + countryStringMap.insert(CountryStringMap::value_type("PN", tr("Pitcairn"))); + countryStringMap.insert(CountryStringMap::value_type("PL", tr("Poland"))); + countryStringMap.insert(CountryStringMap::value_type("PT", tr("Portugal"))); + countryStringMap.insert(CountryStringMap::value_type("PR", tr("Puerto Rico"))); + countryStringMap.insert(CountryStringMap::value_type("QA", tr("Qatar"))); + countryStringMap.insert(CountryStringMap::value_type("RE", tr("Reunion"))); + countryStringMap.insert(CountryStringMap::value_type("RO", tr("Romania"))); + countryStringMap.insert(CountryStringMap::value_type("RU", tr("Russian Federation"))); + countryStringMap.insert(CountryStringMap::value_type("RW", tr("Rwanda"))); + countryStringMap.insert(CountryStringMap::value_type("SH", tr("Saint Helena"))); + countryStringMap.insert(CountryStringMap::value_type("KN", tr("Saint Kitts And Nevis"))); + countryStringMap.insert(CountryStringMap::value_type("LC", tr("Saint Lucia"))); + countryStringMap.insert(CountryStringMap::value_type("PM", tr("Saint Pierre And Miquelon"))); + countryStringMap.insert(CountryStringMap::value_type("VC", tr("Saint Vincent And The Grenadines"))); + countryStringMap.insert(CountryStringMap::value_type("WS", tr("Samoa"))); + countryStringMap.insert(CountryStringMap::value_type("SM", tr("San Marino"))); + countryStringMap.insert(CountryStringMap::value_type("ST", tr("Sao Tome And Principe"))); + countryStringMap.insert(CountryStringMap::value_type("SA", tr("Saudi Arabia"))); + countryStringMap.insert(CountryStringMap::value_type("SN", tr("Senegal"))); + countryStringMap.insert(CountryStringMap::value_type("CS", tr("Serbia And Montenegro"))); + countryStringMap.insert(CountryStringMap::value_type("SC", tr("Seychelles"))); + countryStringMap.insert(CountryStringMap::value_type("SL", tr("Sierra Leone"))); + countryStringMap.insert(CountryStringMap::value_type("SG", tr("Singapore"))); + countryStringMap.insert(CountryStringMap::value_type("SK", tr("Slovakia"))); + countryStringMap.insert(CountryStringMap::value_type("SI", tr("Slovenia"))); + countryStringMap.insert(CountryStringMap::value_type("SB", tr("Solomon Islands"))); + countryStringMap.insert(CountryStringMap::value_type("SO", tr("Somalia"))); + countryStringMap.insert(CountryStringMap::value_type("ZA", tr("South Africa"))); + countryStringMap.insert(CountryStringMap::value_type("GS", tr("South Georgia And The South Sandwich Islands"))); + countryStringMap.insert(CountryStringMap::value_type("ES", tr("Spain"))); + countryStringMap.insert(CountryStringMap::value_type("LK", tr("Sri Lanka"))); + countryStringMap.insert(CountryStringMap::value_type("SD", tr("Sudan"))); + countryStringMap.insert(CountryStringMap::value_type("SR", tr("Suriname"))); + countryStringMap.insert(CountryStringMap::value_type("SJ", tr("Svalbard And Jan Mayen"))); + countryStringMap.insert(CountryStringMap::value_type("SZ", tr("Swaziland"))); + countryStringMap.insert(CountryStringMap::value_type("SE", tr("Sweden"))); + countryStringMap.insert(CountryStringMap::value_type("CH", tr("Switzerland"))); + countryStringMap.insert(CountryStringMap::value_type("SY", tr("Syrian Arab Republic"))); + countryStringMap.insert(CountryStringMap::value_type("TW", tr("Taiwan, Province Of China"))); + countryStringMap.insert(CountryStringMap::value_type("TJ", tr("Tajikistan"))); + countryStringMap.insert(CountryStringMap::value_type("TZ", tr("Tanzania, United Republic Of"))); + countryStringMap.insert(CountryStringMap::value_type("TH", tr("Thailand"))); + countryStringMap.insert(CountryStringMap::value_type("TL", tr("Timor-Leste"))); + countryStringMap.insert(CountryStringMap::value_type("TG", tr("Togo"))); + countryStringMap.insert(CountryStringMap::value_type("TK", tr("Tokelau"))); + countryStringMap.insert(CountryStringMap::value_type("TO", tr("Tonga"))); + countryStringMap.insert(CountryStringMap::value_type("TT", tr("Trinidad And Tobago"))); + countryStringMap.insert(CountryStringMap::value_type("TN", tr("Tunisia"))); + countryStringMap.insert(CountryStringMap::value_type("TR", tr("Turkey"))); + countryStringMap.insert(CountryStringMap::value_type("TM", tr("Turkmenistan"))); + countryStringMap.insert(CountryStringMap::value_type("TC", tr("Turks And Caicos Islands"))); + countryStringMap.insert(CountryStringMap::value_type("TV", tr("Tuvalu"))); + countryStringMap.insert(CountryStringMap::value_type("UG", tr("Uganda"))); + countryStringMap.insert(CountryStringMap::value_type("UA", tr("Ukraine"))); + countryStringMap.insert(CountryStringMap::value_type("AE", tr("United Arab Emirates"))); + countryStringMap.insert(CountryStringMap::value_type("GB", tr("United Kingdom"))); + countryStringMap.insert(CountryStringMap::value_type("US", tr("United States"))); + countryStringMap.insert(CountryStringMap::value_type("UM", tr("United States Minor Outlying Islands"))); + countryStringMap.insert(CountryStringMap::value_type("UY", tr("Uruguay"))); + countryStringMap.insert(CountryStringMap::value_type("UZ", tr("Uzbekistan"))); + countryStringMap.insert(CountryStringMap::value_type("VU", tr("Vanuatu"))); + countryStringMap.insert(CountryStringMap::value_type("VE", tr("Venezuela"))); + countryStringMap.insert(CountryStringMap::value_type("VN", tr("Viet Nam"))); + countryStringMap.insert(CountryStringMap::value_type("VG", tr("Virgin Islands, British"))); + countryStringMap.insert(CountryStringMap::value_type("VI", tr("Virgin Islands, U.S."))); + countryStringMap.insert(CountryStringMap::value_type("WF", tr("Wallis And Futuna"))); + countryStringMap.insert(CountryStringMap::value_type("EH", tr("Western Sahara"))); + countryStringMap.insert(CountryStringMap::value_type("YE", tr("Yemen"))); + countryStringMap.insert(CountryStringMap::value_type("ZM", tr("Zambia"))); + countryStringMap.insert(CountryStringMap::value_type("ZW", tr("Zimbabwe"))); + } + QString fullString(""); + if(!cs.isEmpty()) { + CountryStringMap::const_iterator pos = countryStringMap.find(cs); + if (pos != countryStringMap.end()) { + fullString = pos->second; + } + } return fullString; } diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h index 040b3ea8..80eb222d 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h @@ -17,12 +17,11 @@ #include #include -#include - #include #include "createinternetgamedialogimpl.h" #include "sdlplayer.h" #include "gametableimpl.h" +#include class Session; class ConfigFile; @@ -145,6 +144,8 @@ private: bool isGameAdministrator; bool inGame; bool guestMode; + typedef std::map CountryStringMap; + CountryStringMap countryStringMap; QString myAppDataPath; QMessageBox *waitStartGameMsgBox;