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/serialization/qjsonobject.h | |
| 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/serialization/qjsonobject.h')
| -rw-r--r-- | src/corelib/serialization/qjsonobject.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index 5d7fb227a7..f5f4d1f47e 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -52,11 +52,9 @@ public: inline qsizetype length() const { return size(); } bool isEmpty() const; -#if QT_STRINGVIEW_LEVEL < 2 QJsonValue value(const QString &key) const; QJsonValue operator[] (const QString &key) const; QJsonValueRef operator[] (const QString &key); -#endif QJsonValue value(QStringView key) const; QJsonValue value(QLatin1StringView key) const; QJsonValue operator[] (QStringView key) const { return value(key); } @@ -64,11 +62,9 @@ public: QJsonValueRef operator[] (QStringView key); QJsonValueRef operator[] (QLatin1StringView key); -#if QT_STRINGVIEW_LEVEL < 2 void remove(const QString &key); QJsonValue take(const QString &key); bool contains(const QString &key) const; -#endif void remove(QStringView key); void remove(QLatin1StringView key); QJsonValue take(QStringView key); @@ -219,12 +215,10 @@ public: // more Qt typedef iterator Iterator; typedef const_iterator ConstIterator; -#if QT_STRINGVIEW_LEVEL < 2 iterator find(const QString &key); const_iterator find(const QString &key) const { return constFind(key); } const_iterator constFind(const QString &key) const; iterator insert(const QString &key, const QJsonValue &value); -#endif iterator find(QStringView key); iterator find(QLatin1StringView key); const_iterator find(QStringView key) const { return constFind(key); } |