mixa/tdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced const char ptr with QString in country structs.

Browse Source
This commit is contained in:
23rd
2021-08-26 19:01:31 +03:00
parent c593f43629
commit 3e80c04da7
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/countries/countries_instance.cpp
View File

@@ -297,18 +297,14 @@ QString CountriesInstance::validPhoneCode(QString fullCode) {
QString CountriesInstance::countryNameByISO2(const QString &iso) {
const auto &listByISO2 = byISO2();
const auto i = listByISO2.constFind(iso);
return (i != listByISO2.cend())
? QString::fromUtf8((*i)->name)
: QString();
return (i != listByISO2.cend()) ? (*i)->name : QString();
}
QString CountriesInstance::countryISO2ByPhone(const QString &phone) {
const auto &listByCode = byCode();
const auto code = validPhoneCode(phone);
const auto i = listByCode.find(code);
return (i != listByCode.cend())
? QString::fromUtf8((*i)->iso2)
: QString();
return (i != listByCode.cend()) ? (*i)->iso2 : QString();
}
CountriesInstance &Instance() {

8
Telegram/SourceFiles/countries/countries_instance.h
View File

@@ -11,10 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Countries {
struct Info {
const char *name = nullptr;
const char *iso2 = nullptr;
const char *code = nullptr;
const char *alternativeName = nullptr;
QString name;
QString iso2;
QString code;
QString alternativeName;
};
class CountriesInstance final {