diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-02-15 11:48:32 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-07-20 13:15:55 +0200 |
| commit | 16c453069f7b44ba7328a178b4b9ce99a150813e (patch) | |
| tree | 381cb018518643e8aa5d58c7c84f31a6af965746 /src/corelib/text/qlocale.cpp | |
| parent | ad17a1674c21223719ffcf54d35c1ea3eb2356cd (diff) | |
QtBase: eradicate QT_STRINGVIEW_LEVEL uses
It's not used and not useful.
The macro itself has to stay, for now, because Qt5Compat uses it, too.
Task-number: QTBUG-100861
Pick-to: 6.4 6.3 6.2
Change-Id: I5d0557a6c959d6facf6e47f26786a9d365339e95
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/text/qlocale.cpp')
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 0b229c97b4..536c5c3be5 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -1007,12 +1007,10 @@ QLocale::QLocale(QStringView name) { } -#if QT_STRINGVIEW_LEVEL < 2 /*! \fn QLocale::QLocale(const QString &name) \overload */ -#endif /*! Constructs a QLocale object initialized with the default locale. @@ -1582,7 +1580,6 @@ QString QLocale::scriptToString(QLocale::Script script) return QLatin1StringView(script_name_list + script_name_index[script]); } -#if QT_STRINGVIEW_LEVEL < 2 /*! \fn short QLocale::toShort(const QString &s, bool *ok) const @@ -1745,7 +1742,6 @@ QString QLocale::scriptToString(QLocale::Script script) \sa toFloat(), toInt(), toString() */ -#endif // QT_STRINGVIEW_LEVEL < 2 /*! Returns the short int represented by the localized string \a s. @@ -1987,7 +1983,6 @@ QString QLocale::toString(qulonglong i) const return d->m_data->unsLongLongToString(i, -1, 10, -1, flags); } -#if QT_STRINGVIEW_LEVEL < 2 /*! Returns a localized string representation of the given \a date in the specified \a format. @@ -2024,7 +2019,6 @@ QString QLocale::toString(QTime time, const QString &format) const \sa QDateTime::toString(), QDate::toString(), QTime::toString() */ -#endif /*! \since 5.14 |