diff options
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index f48419c934..24c7bd44dd 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -184,7 +184,9 @@ class Q_CORE_EXPORT QVariant Region = QMetaType::QRegion, Bitmap = QMetaType::QBitmap, Cursor = QMetaType::QCursor, +#if QT_CONFIG(shortcut) KeySequence = QMetaType::QKeySequence, +#endif Pen = QMetaType::QPen, TextLength = QMetaType::QTextLength, TextFormat = QMetaType::QTextFormat, @@ -394,7 +396,7 @@ class Q_CORE_EXPORT QVariant struct Private { inline Private() noexcept : type(Invalid), is_shared(false), is_null(true) - { data.ptr = nullptr; } + {} // Internal constructor for initialized variants. explicit inline Private(uint variantType) noexcept @@ -410,6 +412,7 @@ class Q_CORE_EXPORT QVariant #endif union Data { + void *threeptr[3] = { nullptr, nullptr, nullptr }; char c; uchar uc; short s; @@ -463,16 +466,6 @@ class Q_CORE_EXPORT QVariant { return cmp(v); } inline bool operator!=(const QVariant &v) const { return !cmp(v); } -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED inline bool operator<(const QVariant &v) const - { return compare(v) < 0; } - QT_DEPRECATED inline bool operator<=(const QVariant &v) const - { return compare(v) <= 0; } - QT_DEPRECATED inline bool operator>(const QVariant &v) const - { return compare(v) > 0; } - QT_DEPRECATED inline bool operator>=(const QVariant &v) const - { return compare(v) >= 0; } -#endif protected: friend inline bool operator==(const QVariant &, const QVariantComparisonHelper &); @@ -491,7 +484,6 @@ public: Private d; void create(int type, const void *copy); bool cmp(const QVariant &other) const; - int compare(const QVariant &other) const; bool convert(const int t, void *ptr) const; // ### Qt6: drop const private: |