Make QGraphicsSvgItem a QGraphicsObject.

This item was inheriting from QObject and QGraphicsItem so there is
no point to not make it a QGraphicsObject. I have added some properties
that was specific to this class, i.e. elementId.

Reviewed-by: ogoffart
Reviewed-by: andreas
Reviewed-by: bnilsen

1 files changed, 4 insertions, 9 deletions

diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index 2d0e20b..e304c0c 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -41,7 +41,6 @@
 #ifndef QGRAPHICSSVGITEM_H
 #define QGRAPHICSSVGITEM_H
 
-#include <QtCore/qobject.h>
 #include <QtGui/qgraphicsitem.h>
 
 #ifndef QT_NO_GRAPHICSSVGITEM
@@ -55,10 +54,12 @@ QT_MODULE(Svg)
 class QSvgRenderer;
 class QGraphicsSvgItemPrivate;
 
-class Q_SVG_EXPORT QGraphicsSvgItem : public QObject, public QGraphicsItem
+class Q_SVG_EXPORT QGraphicsSvgItem : public QGraphicsObject
 {
     Q_OBJECT
     Q_INTERFACES(QGraphicsItem)
+    Q_PROPERTY(QString elementId READ elementId WRITE setElementId)
+    Q_PROPERTY(QSize maximumCacheSize READ maximumCacheSize WRITE setMaximumCacheSize)
 
 public:
     QGraphicsSvgItem(QGraphicsItem *parentItem=0);
@@ -87,13 +88,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QGraphicsSvgItem)
-
-    // Q_DECLARE_PRIVATE_WITH_BASE(QGraphicsSvgItem, QObject)
-    inline QGraphicsSvgItemPrivate *d_func()
-    { return reinterpret_cast<QGraphicsSvgItemPrivate *>(QObject::d_ptr.data()); }
-    inline const QGraphicsSvgItemPrivate *d_func() const
-    { return reinterpret_cast<const QGraphicsSvgItemPrivate *>(QObject::d_ptr.data()); }
-    friend class QGraphicsSvgItemPrivate;
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QGraphicsSvgItem)
 
     Q_PRIVATE_SLOT(d_func(), void _q_repaintItem())
 };