Remove leftover code from merge conflict.

2 files changed, 0 insertions, 192 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index f9d63fb..b0b940b 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -401,77 +401,11 @@ public:
     // Optional stacking order
     int globalStackingOrder;
 
-    struct DecomposedTransform;
-    DecomposedTransform *decomposedTransform() const
-    {
-        QGraphicsItemPrivate *that = const_cast<QGraphicsItemPrivate *>(this);
-        DecomposedTransform *decomposed;
-        if (hasDecomposedTransform) {
-            decomposed = qVariantValue<DecomposedTransform *>(extra(ExtraDecomposedTransform));
-        } else {
-            decomposed = new DecomposedTransform;
-            that->setExtra(ExtraDecomposedTransform, qVariantFromValue<DecomposedTransform *>(decomposed));
-            that->hasDecomposedTransform = 1;
-            if (!dirtyTransformComponents)
-                decomposed->reset();
-        }
-        if (dirtyTransformComponents) {
-            decomposed->initFrom(q_ptr->transform());
-            that->dirtyTransformComponents = 0;
-        }
-        return decomposed;
-    }
-
-    struct DecomposedTransform {
-        qreal xScale;
-        qreal yScale;
-        qreal xRotation;
-        qreal yRotation;
-        qreal zRotation;
-        qreal horizontalShear;
-        qreal verticalShear;
-        qreal xOrigin;
-        qreal yOrigin;
-
-        inline void reset()
-        {
-            xScale = 1.0;
-            yScale = 1.0;
-            xRotation = 0.0;
-            yRotation = 0.0;
-            zRotation = 0.0;
-            horizontalShear = 0.0;
-            verticalShear = 0.0;
-            xOrigin = 0.0;
-            yOrigin = 0.0;
-        }
-
-        inline void initFrom(const QTransform &x)
-        {
-            reset();
-            // ### decompose transform
-            Q_UNUSED(x);
-        }
-
-        inline void generateTransform(QTransform *x) const
-        {
-            x->translate(xOrigin, yOrigin);
-            x->rotate(xRotation, Qt::XAxis);
-            x->rotate(yRotation, Qt::YAxis);
-            x->rotate(zRotation, Qt::ZAxis);
-            x->shear(horizontalShear, verticalShear);
-            x->scale(xScale, yScale);
-            x->translate(-xOrigin, -yOrigin);
-        }
-    };
-
     QGraphicsItem *q_ptr;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QGraphicsItemPrivate::DecomposedTransform *)
-
 #endif // QT_NO_GRAPHICSVIEW
 
 #endif
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 8afdeb4..9cfd897 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -219,8 +219,6 @@ private slots:
     void updateCachedItemAfterMove();
     void deviceTransform_data();
     void deviceTransform();
-    void setTransformProperties_data();
-    void setTransformProperties();
 
     // task specific tests below me
     void task141694_textItemEnsureVisible();
@@ -6428,129 +6426,5 @@ void tst_QGraphicsItem::deviceTransform()
     QCOMPARE(rect3->deviceTransform(deviceX).map(QPointF(50, 50)), mapResult3);
 }
 
-void tst_QGraphicsItem::setTransformProperties_data()
-{
-    QTest::addColumn<QPointF>("origin");
-    QTest::addColumn<qreal>("rotationX");
-    QTest::addColumn<qreal>("rotationY");
-    QTest::addColumn<qreal>("rotationZ");
-    QTest::addColumn<qreal>("scaleX");
-    QTest::addColumn<qreal>("scaleY");
-    QTest::addColumn<qreal>("shearX");
-    QTest::addColumn<qreal>("shearY");
-
-    QTest::newRow("nothing") << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0)
-                                          << qreal(1) << qreal(1) << qreal(0.0) << qreal(0.0);
-
-    QTest::newRow("rotationZ") << QPointF() << qreal(0.0) << qreal(0.0) << qreal(42.2)
-                                          << qreal(1) << qreal(1) << qreal(0.0) << qreal(0.0);
-
-    QTest::newRow("rotationXY") << QPointF() << qreal(12.5) << qreal(53.6) << qreal(0.0)
-                                          << qreal(1) << qreal(1) << qreal(0.0) << qreal(0.0);
-
-    QTest::newRow("rotationXYZ") << QPointF() << qreal(-25) << qreal(12) << qreal(556)
-                                          << qreal(1) << qreal(1) << qreal(0.0) << qreal(0.0);
-
-    QTest::newRow("rotationXYZ dicentred") << QPointF(-53, 25.2) 
-                                << qreal(-2578.2) << qreal(4565.2) << qreal(56)
-                                << qreal(1) << qreal(1) << qreal(0.0) << qreal(0.0);
-
-    QTest::newRow("Scale")    << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0)
-                                          << qreal(6) << qreal(0.5) << qreal(0.0) << qreal(0.0);
-
-    QTest::newRow("Shear")    << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0)
-                                          << qreal(1) << qreal(1) << qreal(2.2) << qreal(0.5);
-
-    QTest::newRow("Scale and Shear")    << QPointF() << qreal(0.0) << qreal(0.0) << qreal(0.0)
-                                          << qreal(5.2) << qreal(2.1) << qreal(5.2) << qreal(5.5);
-
-    QTest::newRow("Everything")  << QPointF() << qreal(41) << qreal(-23) << qreal(0.56)
-                                        << qreal(8.2) << qreal(-0.2) << qreal(-12) << qreal(-0.8);
-
-    QTest::newRow("Everything dicentred")  << QPointF(qreal(22.3), qreal(-56.2)) << qreal(-175) << qreal(196) << qreal(-1260)
-                                        << qreal(4) << qreal(2) << qreal(2.56) << qreal(0.8);
-}
-
-void tst_QGraphicsItem::setTransformProperties()
-{
-    QFETCH(QPointF,origin);
-    QFETCH(qreal,rotationX);
-    QFETCH(qreal,rotationY);
-    QFETCH(qreal,rotationZ);
-    QFETCH(qreal,scaleX);
-    QFETCH(qreal,scaleY);
-    QFETCH(qreal,shearX);
-    QFETCH(qreal,shearY);
-
-    QTransform result;
-    result.translate(origin.x(), origin.y());
-    result.rotate(rotationX, Qt::XAxis);
-    result.rotate(rotationY, Qt::YAxis);
-    result.rotate(rotationZ, Qt::ZAxis);
-    result.shear(shearX, shearY);
-    result.scale(scaleX, scaleY);
-    result.translate(-origin.x(), -origin.y());
-
-    QGraphicsScene scene;
-    QGraphicsRectItem *item = new QGraphicsRectItem(QRectF(0, 0, 100, 100));
-    scene.addItem(item);
-    item->setPos(100, 100);
-
-    item->setRotation(rotationX, rotationY, rotationZ);
-    item->setScale(scaleX, scaleY);
-    item->setShear(shearX, shearY);
-    item->setTransformOrigin(origin);
-
-    QCOMPARE(item->xRotation(), rotationX);
-    QCOMPARE(item->yRotation(), rotationY);
-    QCOMPARE(item->zRotation(), rotationZ);
-    QCOMPARE(item->xScale(), scaleX);
-    QCOMPARE(item->yScale(), scaleY);
-    QCOMPARE(item->horizontalShear(), shearX);
-    QCOMPARE(item->verticalShear(), shearY);
-    QCOMPARE(item->transformOrigin(), origin);
-
-    QCOMPARE(result, item->transform());
-
-    //-----------------------------------------------------------------
-    //Change the rotation Z
-    item->setZRotation(45);
-    QTransform result2;
-    result2.translate(origin.x(), origin.y());
-    result2.rotate(rotationX, Qt::XAxis);
-    result2.rotate(rotationY, Qt::YAxis);
-    result2.rotate(45, Qt::ZAxis);
-    result2.shear(shearX, shearY);
-    result2.scale(scaleX, scaleY);
-    result2.translate(-origin.x(), -origin.y());
-
-    QCOMPARE(item->xRotation(), rotationX);
-    QCOMPARE(item->yRotation(), rotationY);
-    QCOMPARE(item->zRotation(), 45.0);
-    QCOMPARE(item->xScale(), scaleX);
-    QCOMPARE(item->yScale(), scaleY);
-    QCOMPARE(item->horizontalShear(), shearX);
-    QCOMPARE(item->verticalShear(), shearY);
-    QCOMPARE(item->transformOrigin(), origin);
-
-    QCOMPARE(result2, item->transform());
-
-    //-----------------------------------------------------------------
-    // calling setTransform() should reset the properties to their default
-    item->setTransform(result);
-
-    QCOMPARE(item->xRotation(), 0.0);
-    QCOMPARE(item->yRotation(), 0.0);
-    QCOMPARE(item->zRotation(), 0.0);
-    QCOMPARE(item->xScale(), 1.0);
-    QCOMPARE(item->yScale(), 1.0);
-    QCOMPARE(item->horizontalShear(), 0.0);
-    QCOMPARE(item->verticalShear(), 0.0);
-    QCOMPARE(item->transformOrigin(), QPointF(0,0));
-
-    QCOMPARE(result, item->transform());
-}
-
-
 QTEST_MAIN(tst_QGraphicsItem)
 #include "tst_qgraphicsitem.moc"