diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-02-03 16:18:20 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-02-28 08:57:57 +0100 |
| commit | 1ba46c9b632731d7d7e791de2b203d0d933245b9 (patch) | |
| tree | a7933031bde57f582181c2e9c185989ebdbb9470 /src/corelib/kernel | |
| parent | d2068b24e4b2e96832af154d02e19b5333880c21 (diff) | |
Get rid of QMatrix
Task-number: QTBUG-81628
Change-Id: Iad66bfdf49b9ee65558a451108c086fc40dc3884
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 4c1f9f20f7..da4d98955d 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -367,7 +367,6 @@ Q_GLOBAL_STATIC(QMetaTypeCustomRegistery, customTypeRegistery) \value QPixmap QPixmap \value QLocale QLocale \value QBitmap QBitmap - \value QMatrix QMatrix \value QTransform QTransform \value QMatrix4x4 QMatrix4x4 \value QVector2D QVector2D diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 32d45b34ff..b9ab0cbca6 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -176,7 +176,6 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId(); F(QPen, 76, QPen) \ F(QTextLength, 77, QTextLength) \ F(QTextFormat, 78, QTextFormat) \ - F(QMatrix, 79, QMatrix) \ F(QTransform, 80, QTransform) \ F(QMatrix4x4, 81, QMatrix4x4) \ F(QVector2D, 82, QVector2D) \ @@ -473,7 +472,7 @@ public: QFont = 64, QPixmap = 65, QBrush = 66, QColor = 67, QPalette = 68, QIcon = 69, QImage = 70, QPolygon = 71, QRegion = 72, QBitmap = 73, QCursor = 74, QKeySequence = 75, QPen = 76, QTextLength = 77, QTextFormat = 78, - QMatrix = 79, QTransform = 80, QMatrix4x4 = 81, QVector2D = 82, + QTransform = 80, QMatrix4x4 = 81, QVector2D = 82, QVector3D = 83, QVector4D = 84, QQuaternion = 85, QPolygonF = 86, QColorSpace = 87, // Widget types diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index f339ff66cd..7d93dde022 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1669,7 +1669,6 @@ Q_CORE_EXPORT void QVariantPrivate::registerHandler(const int /* Modules::Names \value Locale a QLocale \value LongLong a \l qlonglong \value Map a QVariantMap - \value Matrix a QMatrix \value Transform a QTransform \value Matrix4x4 a QMatrix4x4 \value Palette a QPalette @@ -2486,7 +2485,7 @@ void QVariant::load(QDataStream &s) typeId = QMetaType::QSizePolicy; } else if (typeId > 75 && typeId <= 86) { // and as a result these types received lower ids too - // QKeySequence QPen QTextLength QTextFormat QMatrix QTransform QMatrix4x4 QVector2D QVector3D QVector4D QQuaternion + // QKeySequence QPen QTextLength QTextFormat QTransform QMatrix4x4 QVector2D QVector3D QVector4D QQuaternion typeId -=1; } } diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 5f0fdd4bf5..cf95f12689 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -72,7 +72,6 @@ class QEasingCurve; class QLine; class QLineF; class QLocale; -class QMatrix; class QTransform; class QStringList; class QTime; @@ -190,7 +189,6 @@ class Q_CORE_EXPORT QVariant Pen = QMetaType::QPen, TextLength = QMetaType::QTextLength, TextFormat = QMetaType::QTextFormat, - Matrix = QMetaType::QMatrix, Transform = QMetaType::QTransform, Matrix4x4 = QMetaType::QMatrix4x4, Vector2D = QMetaType::QVector2D, |