Fix Qt 5 to-do's in QGraphicsProxyWidget

[profile/ivi/qtbase.git] / src / widgets / graphicsview / qgraphicsitem_p.h

diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h
index aebb22a..77b54c1 100644 (file)
--- a/src/widgets/graphicsview/qgraphicsitem_p.h
+++ b/src/widgets/graphicsview/qgraphicsitem_p.h
@@ -145,7 +145,7 @@ public:
         QPoint cacheIndent;
         QPixmapCache::Key key;
     };
-    QMap<QPaintDevice *, DeviceData> deviceData;
+    QHash<QPaintDevice *, DeviceData> deviceData;
 
     // List of logical exposed rects
     QVector<QRectF> exposed;
@@ -273,8 +273,6 @@ public:
     void combineTransformFromParent(QTransform *x, const QTransform *viewTransform = 0) const;
     virtual void updateSceneTransformFromParent();
 
-    // ### Qt 5: Remove. Workaround for reimplementation added after Qt 4.4.
-    virtual QVariant inputMethodQueryHelper(Qt::InputMethodQuery query) const;
     static bool movableAncestorIsSelected(const QGraphicsItem *item);
 
     virtual void setPosHelper(const QPointF &pos);
@@ -508,7 +506,7 @@ public:
 
     QRectF childrenBoundingRect;
     QRectF needsRepaint;
-    QMap<QWidget *, QRect> paintedViewBoundingRects;
+    QHash<QWidget *, QRect> paintedViewBoundingRects;
     QPointF pos;
     qreal z;
     qreal opacity;