From c97f4ab8840337b5529b52fa1b369c55d5a2fee9 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 31 Jul 2016 14:24:11 +0000 Subject: [PATCH] cleanup QGraphicsItem derived classes Signed-off-by: Ivailo Monev --- src/gui/graphicsview/qgraphicsitem.cpp | 144 ------------------------- src/gui/graphicsview/qgraphicsitem.h | 72 ------------- 2 files changed, 216 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 176fec36a..335c5be72 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -8102,14 +8102,6 @@ void QAbstractGraphicsShapeItem::setBrush(const QBrush &brush) update(); } -/*! - \reimp -*/ -bool QAbstractGraphicsShapeItem::isObscuredBy(const QGraphicsItem *item) const -{ - return QGraphicsItem::isObscuredBy(item); -} - /*! \reimp */ @@ -8272,22 +8264,6 @@ void QGraphicsPathItem::paint(QPainter *painter, const QStyleOptionGraphicsItem qt_graphicsItem_highlightSelected(this, painter, option); } -/*! - \reimp -*/ -bool QGraphicsPathItem::isObscuredBy(const QGraphicsItem *item) const -{ - return QAbstractGraphicsShapeItem::isObscuredBy(item); -} - -/*! - \reimp -*/ -QPainterPath QGraphicsPathItem::opaqueArea() const -{ - return QAbstractGraphicsShapeItem::opaqueArea(); -} - /*! \reimp */ @@ -8516,22 +8492,6 @@ void QGraphicsRectItem::paint(QPainter *painter, const QStyleOptionGraphicsItem qt_graphicsItem_highlightSelected(this, painter, option); } -/*! - \reimp -*/ -bool QGraphicsRectItem::isObscuredBy(const QGraphicsItem *item) const -{ - return QAbstractGraphicsShapeItem::isObscuredBy(item); -} - -/*! - \reimp -*/ -QPainterPath QGraphicsRectItem::opaqueArea() const -{ - return QAbstractGraphicsShapeItem::opaqueArea(); -} - /*! \reimp */ @@ -8831,22 +8791,6 @@ void QGraphicsEllipseItem::paint(QPainter *painter, const QStyleOptionGraphicsIt qt_graphicsItem_highlightSelected(this, painter, option); } -/*! - \reimp -*/ -bool QGraphicsEllipseItem::isObscuredBy(const QGraphicsItem *item) const -{ - return QAbstractGraphicsShapeItem::isObscuredBy(item); -} - -/*! - \reimp -*/ -QPainterPath QGraphicsEllipseItem::opaqueArea() const -{ - return QAbstractGraphicsShapeItem::opaqueArea(); -} - /*! \reimp */ @@ -9065,22 +9009,6 @@ void QGraphicsPolygonItem::paint(QPainter *painter, const QStyleOptionGraphicsIt qt_graphicsItem_highlightSelected(this, painter, option); } -/*! - \reimp -*/ -bool QGraphicsPolygonItem::isObscuredBy(const QGraphicsItem *item) const -{ - return QAbstractGraphicsShapeItem::isObscuredBy(item); -} - -/*! - \reimp -*/ -QPainterPath QGraphicsPolygonItem::opaqueArea() const -{ - return QAbstractGraphicsShapeItem::opaqueArea(); -} - /*! \reimp */ @@ -9328,22 +9256,6 @@ void QGraphicsLineItem::paint(QPainter *painter, const QStyleOptionGraphicsItem qt_graphicsItem_highlightSelected(this, painter, option); } -/*! - \reimp -*/ -bool QGraphicsLineItem::isObscuredBy(const QGraphicsItem *item) const -{ - return QGraphicsItem::isObscuredBy(item); -} - -/*! - \reimp -*/ -QPainterPath QGraphicsLineItem::opaqueArea() const -{ - return QGraphicsItem::opaqueArea(); -} - /*! \reimp */ @@ -9669,14 +9581,6 @@ void QGraphicsPixmapItem::paint(QPainter *painter, const QStyleOptionGraphicsIte qt_graphicsItem_highlightSelected(this, painter, option); } -/*! - \reimp -*/ -bool QGraphicsPixmapItem::isObscuredBy(const QGraphicsItem *item) const -{ - return QGraphicsItem::isObscuredBy(item); -} - /*! \reimp */ @@ -10017,22 +9921,6 @@ void QGraphicsTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem qt_graphicsItem_highlightSelected(this, painter, option); } -/*! - \reimp -*/ -bool QGraphicsTextItem::isObscuredBy(const QGraphicsItem *item) const -{ - return QGraphicsItem::isObscuredBy(item); -} - -/*! - \reimp -*/ -QPainterPath QGraphicsTextItem::opaqueArea() const -{ - return QGraphicsItem::opaqueArea(); -} - /*! \reimp */ @@ -10851,22 +10739,6 @@ void QGraphicsSimpleTextItem::paint(QPainter *painter, const QStyleOptionGraphic qt_graphicsItem_highlightSelected(this, painter, option); } -/*! - \reimp -*/ -bool QGraphicsSimpleTextItem::isObscuredBy(const QGraphicsItem *item) const -{ - return QAbstractGraphicsShapeItem::isObscuredBy(item); -} - -/*! - \reimp -*/ -QPainterPath QGraphicsSimpleTextItem::opaqueArea() const -{ - return QAbstractGraphicsShapeItem::opaqueArea(); -} - /*! \reimp */ @@ -11129,22 +11001,6 @@ void QGraphicsItemGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem } } -/*! - \reimp -*/ -bool QGraphicsItemGroup::isObscuredBy(const QGraphicsItem *item) const -{ - return QGraphicsItem::isObscuredBy(item); -} - -/*! - \reimp -*/ -QPainterPath QGraphicsItemGroup::opaqueArea() const -{ - return QGraphicsItem::opaqueArea(); -} - /*! \reimp */ diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index 3c3ff096f..ebaa8a124 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -66,7 +66,6 @@ class QGraphicsItemGroup; class QGraphicsObject; class QGraphicsSceneContextMenuEvent; class QGraphicsSceneDragDropEvent; -class QGraphicsSceneEvent; class QGraphicsSceneHoverEvent; class QGraphicsSceneMouseEvent; class QGraphicsSceneWheelEvent; @@ -76,7 +75,6 @@ class QGraphicsWidget; class QInputMethodEvent; class QKeyEvent; class QMatrix; -class QMenu; class QPainter; class QPen; class QPointF; @@ -162,10 +160,8 @@ public: }; QGraphicsItem(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); virtual ~QGraphicsItem(); @@ -605,10 +601,8 @@ class Q_GUI_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem { public: QAbstractGraphicsShapeItem(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); ~QAbstractGraphicsShapeItem(); @@ -618,7 +612,6 @@ public: QBrush brush() const; void setBrush(const QBrush &brush); - bool isObscuredBy(const QGraphicsItem *item) const; QPainterPath opaqueArea() const; protected: @@ -635,16 +628,12 @@ class Q_GUI_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem { public: QGraphicsPathItem(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsPathItem(const QPainterPath &path, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); ~QGraphicsPathItem(); @@ -657,9 +646,6 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; - enum { Type = 2 }; int type() const; @@ -678,22 +664,16 @@ class Q_GUI_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem { public: QGraphicsRectItem(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); ~QGraphicsRectItem(); @@ -707,9 +687,6 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; - enum { Type = 3 }; int type() const; @@ -731,22 +708,16 @@ class Q_GUI_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem { public: QGraphicsEllipseItem(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); ~QGraphicsEllipseItem(); @@ -766,9 +737,6 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; - enum { Type = 4 }; int type() const; @@ -790,17 +758,13 @@ class Q_GUI_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem { public: QGraphicsPolygonItem(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsPolygonItem(const QPolygonF &polygon, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); ~QGraphicsPolygonItem(); @@ -816,9 +780,6 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; - enum { Type = 5 }; int type() const; @@ -837,22 +798,16 @@ class Q_GUI_EXPORT QGraphicsLineItem : public QGraphicsItem { public: QGraphicsLineItem(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); ~QGraphicsLineItem(); @@ -870,9 +825,6 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; - enum { Type = 6 }; int type() const; @@ -897,16 +849,12 @@ public: }; QGraphicsPixmapItem(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); ~QGraphicsPixmapItem(); @@ -926,7 +874,6 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - bool isObscuredBy(const QGraphicsItem *item) const; QPainterPath opaqueArea() const; enum { Type = 7 }; @@ -959,16 +906,12 @@ class Q_GUI_EXPORT QGraphicsTextItem : public QGraphicsObject public: QGraphicsTextItem(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsTextItem(const QString &text, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); ~QGraphicsTextItem(); @@ -990,9 +933,6 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; - enum { Type = 8 }; int type() const; @@ -1060,16 +1000,12 @@ class Q_GUI_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem { public: QGraphicsSimpleTextItem(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); QGraphicsSimpleTextItem(const QString &text, QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); ~QGraphicsSimpleTextItem(); @@ -1085,9 +1021,6 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; - enum { Type = 9 }; int type() const; @@ -1106,10 +1039,8 @@ class Q_GUI_EXPORT QGraphicsItemGroup : public QGraphicsItem { public: QGraphicsItemGroup(QGraphicsItem *parent = 0 -#ifndef Q_QDOC // ### obsolete argument , QGraphicsScene *scene = 0 -#endif ); ~QGraphicsItemGroup(); @@ -1119,9 +1050,6 @@ public: QRectF boundingRect() const; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; - enum { Type = 10 }; int type() const;