simplify and cleanup handling of transformations in QGraphicsItem

Removed some experimental code to handle scaling and rotating around
different axis. It cuased setTransform and transform not to behave
symmetrically and caused some performance regressions.

Additionally moved the QTransform out of the (relatively slow) extra
list and made it a pointer in QGraphicsItemPrivate.

Reviewed-by: Andreas

1 files changed, 4 insertions, 33 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index f6ee197..def773e 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -242,39 +242,10 @@ public:
     void setTransform(const QTransform &matrix, bool combine = false);
     void resetTransform();
 
-    void rotate(qreal angle);           // ### obsolete
-    void scale(qreal sx, qreal sy);     // ### obsolete
-    void shear(qreal sh, qreal sv);     // ### obsolete
-    void translate(qreal dx, qreal dy); // ### obsolete
-
-    qreal xRotation() const;
-    void setXRotation(qreal angle);
-
-    qreal yRotation() const;
-    void setYRotation(qreal angle);
-
-    qreal zRotation() const;
-    void setZRotation(qreal angle);
-    void setRotation(qreal x, qreal y, qreal z);
-
-    qreal xScale() const;
-    void setXScale(qreal factor);
-
-    qreal yScale() const;
-    void setYScale(qreal factor);
-    void setScale(qreal sx, qreal sy);
-
-    qreal horizontalShear() const;
-    void setHorizontalShear(qreal shear);
-
-    qreal verticalShear() const;
-    void setVerticalShear(qreal shear);
-    void setShear(qreal sh, qreal sv);
-
-    QPointF transformOrigin() const;
-    void setTransformOrigin(const QPointF &origin);
-    inline void setTransformOrigin(qreal x, qreal y)
-    { setTransformOrigin(QPointF(x,y)); }
+    void rotate(qreal angle);
+    void scale(qreal sx, qreal sy);
+    void shear(qreal sh, qreal sv);
+    void translate(qreal dx, qreal dy);
 
     virtual void advance(int phase);