diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-02-15 11:48:32 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-16 03:21:03 +0000 |
| commit | 9cbb6130e7b461f0da5e621136f5787e26f4b344 (patch) | |
| tree | e02df4e37dbb6628fa978d82c6c53f70a2eb75ff /src | |
| parent | 5ad63ff05c06a353e142d41139760d37eb7db80e (diff) | |
QColor: eradicate QT_STRINGVIEW_LEVEL
It's not used and not useful.
Task-number: QTBUG-100861
Change-Id: I30f7f41311182f056f2f6d5a9b49385fb09d194e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit a24ef92468b5d482733b8258265474ca98646a1f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 4 | ||||
| -rw-r--r-- | src/gui/painting/qcolor.h | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index d4a995a381..c0a327f338 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -867,7 +867,6 @@ QString QColor::name(NameFormat format) const return QString(); } -#if QT_STRINGVIEW_LEVEL < 2 /*! Sets the RGB value of this QColor to \a name, which may be in one of these formats: @@ -896,7 +895,6 @@ void QColor::setNamedColor(const QString &name) { setColorFromString(qToStringViewIgnoringNull(name)); } -#endif /*! \overload @@ -918,7 +916,6 @@ void QColor::setNamedColor(QLatin1String name) setColorFromString(name); } -#if QT_STRINGVIEW_LEVEL < 2 /*! \since 4.7 @@ -934,7 +931,6 @@ bool QColor::isValidColor(const QString &name) { return isValidColor(qToStringViewIgnoringNull(name)); } -#endif /*! \overload diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index 06b264eacf..f43b9bc537 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -81,9 +81,7 @@ public: 0) {} QColor(QRgb rgb) noexcept; QColor(QRgba64 rgba64) noexcept; -#if QT_STRINGVIEW_LEVEL < 2 inline QColor(const QString& name); -#endif explicit inline QColor(QStringView name); inline QColor(const char *aname) : QColor(QLatin1String(aname)) {} inline QColor(QLatin1String name); @@ -95,9 +93,7 @@ public: QString name(NameFormat format = HexRgb) const; -#if QT_STRINGVIEW_LEVEL < 2 void setNamedColor(const QString& name); -#endif void setNamedColor(QStringView name); void setNamedColor(QLatin1String name); @@ -223,9 +219,7 @@ public: operator QVariant() const; -#if QT_STRINGVIEW_LEVEL < 2 static bool isValidColor(const QString &name); -#endif static bool isValidColor(QStringView) noexcept; static bool isValidColor(QLatin1String) noexcept; @@ -305,10 +299,8 @@ inline QColor::QColor(QLatin1String aname) inline QColor::QColor(QStringView aname) { setNamedColor(aname); } -#if QT_STRINGVIEW_LEVEL < 2 inline QColor::QColor(const QString& aname) { setNamedColor(aname); } -#endif inline bool QColor::isValid() const noexcept { return cspec != Invalid; } |