diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-02-15 11:48:32 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-02-16 04:20:51 +0100 |
| commit | a24ef92468b5d482733b8258265474ca98646a1f (patch) | |
| tree | 9365d4a0d81e22afb0a3beb15bf98ad087eefd44 /src/gui/painting/qcolor.h | |
| parent | 221df41572cc5bff108eb5809be4b081075a5cbb (diff) | |
QColor: eradicate QT_STRINGVIEW_LEVEL
It's not used and not useful.
Task-number: QTBUG-100861
Pick-to: 6.3 6.2
Change-Id: I30f7f41311182f056f2f6d5a9b49385fb09d194e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting/qcolor.h')
| -rw-r--r-- | src/gui/painting/qcolor.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index edeba6fe61..1e24825737 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -83,9 +83,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); @@ -97,9 +95,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); @@ -225,9 +221,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; @@ -307,10 +301,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; } |