whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QLocale: Remove dead code 

The code using it got removed in qttools commit 01da5d9a

Change-Id: I14d36ac939f2647139fcc42591a044a03e707553
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Kai Köhne 2020-12-11 17:41:32 +01:00
parent 7114b6d23c
commit 05ec5a47ab
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/text/qlocale.cpp
View File

@ -565,16 +565,6 @@ bool qt_splitLocaleName(QStringView name, QStringView *lang, QStringView *script
return state != LangState;
}
// TODO: kill this ! Still in use by qttools, patch submitted (2020 October).
void QLocalePrivate::getLangAndCountry(const QString &name, QLocale::Language &lang,
QLocale::Script &script, QLocale::Country &land)
{
const auto id = QLocaleId::fromName(name);
lang = QLocale::Language(id.language_id);
script = QLocale::Script(id.script_id);
land = QLocale::Country(id.country_id);
}
QLocaleId QLocaleId::fromName(const QString &name)
{
QStringView lang;

2
src/corelib/text/qlocale_p.h
View File

@ -418,8 +418,6 @@ public:
static QLocale::Language codeToLanguage(QStringView code) noexcept;
static QLocale::Script codeToScript(QStringView code) noexcept;
static QLocale::Country codeToCountry(QStringView code) noexcept;
static void getLangAndCountry(const QString &name, QLocale::Language &lang,
QLocale::Script &script, QLocale::Country &cntry);
QLocale::MeasurementSystem measurementSystem() const;