diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp index 37cbebee5..0c6091a35 100644 --- a/cockatrice/src/client/settings/cache_settings.cpp +++ b/cockatrice/src/client/settings/cache_settings.cpp @@ -1064,28 +1064,257 @@ void SettingsCache::setClientVersion(const QString &_clientVersion) QStringList SettingsCache::getCountries() const { - static QStringList countries = - QStringList() << "ad" << "ae" << "af" << "ag" << "ai" << "al" << "am" << "ao" << "aq" << "ar" << "as" << "at" - << "au" << "aw" << "ax" << "az" << "ba" << "bb" << "bd" << "be" << "bf" << "bg" << "bh" << "bi" - << "bj" << "bl" << "bm" << "bn" << "bo" << "bq" << "br" << "bs" << "bt" << "bv" << "bw" << "by" - << "bz" << "ca" << "cc" << "cd" << "cf" << "cg" << "ch" << "ci" << "ck" << "cl" << "cm" << "cn" - << "co" << "cr" << "cu" << "cv" << "cw" << "cx" << "cy" << "cz" << "de" << "dj" << "dk" << "dm" - << "do" << "dz" << "ec" << "ee" << "eg" << "eh" << "er" << "es" << "et" << "eu" << "fi" << "fj" - << "fk" << "fm" << "fo" << "fr" << "ga" << "gb" << "gd" << "ge" << "gf" << "gg" << "gh" << "gi" - << "gl" << "gm" << "gn" << "gp" << "gq" << "gr" << "gs" << "gt" << "gu" << "gw" << "gy" << "hk" - << "hm" << "hn" << "hr" << "ht" << "hu" << "id" << "ie" << "il" << "im" << "in" << "io" << "iq" - << "ir" << "is" << "it" << "je" << "jm" << "jo" << "jp" << "ke" << "kg" << "kh" << "ki" << "km" - << "kn" << "kp" << "kr" << "kw" << "ky" << "kz" << "la" << "lb" << "lc" << "li" << "lk" << "lr" - << "ls" << "lt" << "lu" << "lv" << "ly" << "ma" << "mc" << "md" << "me" << "mf" << "mg" << "mh" - << "mk" << "ml" << "mm" << "mn" << "mo" << "mp" << "mq" << "mr" << "ms" << "mt" << "mu" << "mv" - << "mw" << "mx" << "my" << "mz" << "na" << "nc" << "ne" << "nf" << "ng" << "ni" << "nl" << "no" - << "np" << "nr" << "nu" << "nz" << "om" << "pa" << "pe" << "pf" << "pg" << "ph" << "pk" << "pl" - << "pm" << "pn" << "pr" << "ps" << "pt" << "pw" << "py" << "qa" << "re" << "ro" << "rs" << "ru" - << "rw" << "sa" << "sb" << "sc" << "sd" << "se" << "sg" << "sh" << "si" << "sj" << "sk" << "sl" - << "sm" << "sn" << "so" << "sr" << "ss" << "st" << "sv" << "sx" << "sy" << "sz" << "tc" << "td" - << "tf" << "tg" << "th" << "tj" << "tk" << "tl" << "tm" << "tn" << "to" << "tr" << "tt" << "tv" - << "tw" << "tz" << "ua" << "ug" << "um" << "us" << "uy" << "uz" << "va" << "vc" << "ve" << "vg" - << "vi" << "vn" << "vu" << "wf" << "ws" << "xk" << "ye" << "yt" << "za" << "zm" << "zw"; + static QStringList countries = QStringList() << "ad" + << "ae" + << "af" + << "ag" + << "ai" + << "al" + << "am" + << "ao" + << "aq" + << "ar" + << "as" + << "at" + << "au" + << "aw" + << "ax" + << "az" + << "ba" + << "bb" + << "bd" + << "be" + << "bf" + << "bg" + << "bh" + << "bi" + << "bj" + << "bl" + << "bm" + << "bn" + << "bo" + << "bq" + << "br" + << "bs" + << "bt" + << "bv" + << "bw" + << "by" + << "bz" + << "ca" + << "cc" + << "cd" + << "cf" + << "cg" + << "ch" + << "ci" + << "ck" + << "cl" + << "cm" + << "cn" + << "co" + << "cr" + << "cu" + << "cv" + << "cw" + << "cx" + << "cy" + << "cz" + << "de" + << "dj" + << "dk" + << "dm" + << "do" + << "dz" + << "ec" + << "ee" + << "eg" + << "eh" + << "er" + << "es" + << "et" + << "eu" + << "fi" + << "fj" + << "fk" + << "fm" + << "fo" + << "fr" + << "ga" + << "gb" + << "gd" + << "ge" + << "gf" + << "gg" + << "gh" + << "gi" + << "gl" + << "gm" + << "gn" + << "gp" + << "gq" + << "gr" + << "gs" + << "gt" + << "gu" + << "gw" + << "gy" + << "hk" + << "hm" + << "hn" + << "hr" + << "ht" + << "hu" + << "id" + << "ie" + << "il" + << "im" + << "in" + << "io" + << "iq" + << "ir" + << "is" + << "it" + << "je" + << "jm" + << "jo" + << "jp" + << "ke" + << "kg" + << "kh" + << "ki" + << "km" + << "kn" + << "kp" + << "kr" + << "kw" + << "ky" + << "kz" + << "la" + << "lb" + << "lc" + << "li" + << "lk" + << "lr" + << "ls" + << "lt" + << "lu" + << "lv" + << "ly" + << "ma" + << "mc" + << "md" + << "me" + << "mf" + << "mg" + << "mh" + << "mk" + << "ml" + << "mm" + << "mn" + << "mo" + << "mp" + << "mq" + << "mr" + << "ms" + << "mt" + << "mu" + << "mv" + << "mw" + << "mx" + << "my" + << "mz" + << "na" + << "nc" + << "ne" + << "nf" + << "ng" + << "ni" + << "nl" + << "no" + << "np" + << "nr" + << "nu" + << "nz" + << "om" + << "pa" + << "pe" + << "pf" + << "pg" + << "ph" + << "pk" + << "pl" + << "pm" + << "pn" + << "pr" + << "ps" + << "pt" + << "pw" + << "py" + << "qa" + << "re" + << "ro" + << "rs" + << "ru" + << "rw" + << "sa" + << "sb" + << "sc" + << "sd" + << "se" + << "sg" + << "sh" + << "si" + << "sj" + << "sk" + << "sl" + << "sm" + << "sn" + << "so" + << "sr" + << "ss" + << "st" + << "sv" + << "sx" + << "sy" + << "sz" + << "tc" + << "td" + << "tf" + << "tg" + << "th" + << "tj" + << "tk" + << "tl" + << "tm" + << "tn" + << "to" + << "tr" + << "tt" + << "tv" + << "tw" + << "tz" + << "ua" + << "ug" + << "um" + << "us" + << "uy" + << "uz" + << "va" + << "vc" + << "ve" + << "vg" + << "vi" + << "vn" + << "vu" + << "wf" + << "ws" + << "xk" + << "ye" + << "yt" + << "za" + << "zm" + << "zw"; return countries; } diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp index 9b90fd803..ed32b356c 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp @@ -263,7 +263,13 @@ void DlgConnect::updateDisplayInfo(const QString &saveName) QStringList _data = uci.getServerInfo(saveName); if (_data.isEmpty()) { - _data << "" << "" << "" << "" << "" << "" << ""; + _data << "" + << "" + << "" + << "" + << "" + << "" + << ""; } bool savePasswordStatus = (_data.at(5) == "1"); diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp index d6183b877..6a8754a79 100644 --- a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp +++ b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp @@ -39,11 +39,13 @@ void HandlePublicServers::actFinishParsingDownloadedData() QVariantMap jsonMap = jsonResponse.toVariant().toMap(); updateServerINISettings(jsonMap); } else { - qDebug() << "[PUBLIC SERVER HANDLER]" << "JSON Parsing Error:" << parseError.errorString(); + qDebug() << "[PUBLIC SERVER HANDLER]" + << "JSON Parsing Error:" << parseError.errorString(); emit sigPublicServersDownloadedUnsuccessfully(errorCode); } } else { - qDebug() << "[PUBLIC SERVER HANDLER]" << "Error Downloading Public Servers" << errorCode; + qDebug() << "[PUBLIC SERVER HANDLER]" + << "Error Downloading Public Servers" << errorCode; emit sigPublicServersDownloadedUnsuccessfully(errorCode); } diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp index 6eea220bb..20d0aced8 100644 --- a/libcockatrice_card/libcockatrice/card/set/card_set.cpp +++ b/libcockatrice_card/libcockatrice/card/set/card_set.cpp @@ -33,9 +33,28 @@ QString CardSet::getCorrectedShortName() const { // For Windows machines. QSet invalidFileNames; - invalidFileNames << "CON" << "PRN" << "AUX" << "NUL" << "COM1" << "COM2" << "COM3" << "COM4" << "COM5" << "COM6" - << "COM7" << "COM8" << "COM9" << "LPT1" << "LPT2" << "LPT3" << "LPT4" << "LPT5" << "LPT6" << "LPT7" - << "LPT8" << "LPT9"; + invalidFileNames << "CON" + << "PRN" + << "AUX" + << "NUL" + << "COM1" + << "COM2" + << "COM3" + << "COM4" + << "COM5" + << "COM6" + << "COM7" + << "COM8" + << "COM9" + << "LPT1" + << "LPT2" + << "LPT3" + << "LPT4" + << "LPT5" + << "LPT6" + << "LPT7" + << "LPT8" + << "LPT9"; return invalidFileNames.contains(shortName) ? shortName + "_" : shortName; }