From 16c453069f7b44ba7328a178b4b9ce99a150813e Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 15 Feb 2022 11:48:32 +0100 Subject: 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 Reviewed-by: Edward Welbourne --- src/corelib/serialization/qjsonobject.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/corelib/serialization/qjsonobject.h') diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index 5d7fb227a79..f5f4d1f47e6 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); } -- cgit v1.2.3