diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-01-30 14:55:50 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-03-26 06:44:36 +0000 |
| commit | 9a9195c8060d904dfad4ad9f51b5575d434a6037 (patch) | |
| tree | 6991ebd3672835ad9cb60191f1f341f028b3d19a /src/corelib/tools/qtimezoneprivate_win.cpp | |
| parent | 59928d23fc22d916dea32f02d810b8b24b74922d (diff) | |
Make QLocalePrivate::codeTo*() take QStringViews
... and remove now-superfluous overloads.
Adapt the sole user of the (QChar*, int) overload to construct a
QStringView first, which removes the ugly cast at the call site.
Change-Id: Ie5249d4b1b82d471896548e8a7d83c130ae28130
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/tools/qtimezoneprivate_win.cpp')
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qtimezoneprivate_win.cpp b/src/corelib/tools/qtimezoneprivate_win.cpp index 16dfaefb74..c6d59be3d8 100644 --- a/src/corelib/tools/qtimezoneprivate_win.cpp +++ b/src/corelib/tools/qtimezoneprivate_win.cpp @@ -386,7 +386,7 @@ static QLocale::Country userCountry() const GEOID id = GetUserGeoID(GEOCLASS_NATION); wchar_t code[3]; const int size = GetGeoInfo(id, GEO_ISO2, code, 3, 0); - return (size == 3) ? QLocalePrivate::codeToCountry(reinterpret_cast<const QChar*>(code), size) + return (size == 3) ? QLocalePrivate::codeToCountry(QStringView(code, size)) : QLocale::AnyCountry; } |