Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup QGraphicsItem derived classes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-07-31 14:24:11 +00:00
parent 8042c6793f
commit c97f4ab884
2 changed files with 0 additions and 216 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
src/gui/graphicsview/qgraphicsitem.cpp
View file

@ -8102,14 +8102,6 @@ void QAbstractGraphicsShapeItem::setBrush(const QBrush &brush)
update(); update();
} }
/*!
\reimp
*/
bool QAbstractGraphicsShapeItem::isObscuredBy(const QGraphicsItem *item) const
{
return QGraphicsItem::isObscuredBy(item);
}
/*! /*!
\reimp \reimp
*/ */
@ -8272,22 +8264,6 @@ void QGraphicsPathItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
qt_graphicsItem_highlightSelected(this, painter, option); 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 \reimp
*/ */
@ -8516,22 +8492,6 @@ void QGraphicsRectItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
qt_graphicsItem_highlightSelected(this, painter, option); 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 \reimp
*/ */
@ -8831,22 +8791,6 @@ void QGraphicsEllipseItem::paint(QPainter *painter, const QStyleOptionGraphicsIt
qt_graphicsItem_highlightSelected(this, painter, option); 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 \reimp
*/ */
@ -9065,22 +9009,6 @@ void QGraphicsPolygonItem::paint(QPainter *painter, const QStyleOptionGraphicsIt
qt_graphicsItem_highlightSelected(this, painter, option); 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 \reimp
*/ */
@ -9328,22 +9256,6 @@ void QGraphicsLineItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
qt_graphicsItem_highlightSelected(this, painter, option); 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 \reimp
*/ */
@ -9669,14 +9581,6 @@ void QGraphicsPixmapItem::paint(QPainter *painter, const QStyleOptionGraphicsIte
qt_graphicsItem_highlightSelected(this, painter, option); qt_graphicsItem_highlightSelected(this, painter, option);
} }
/*!
\reimp
*/
bool QGraphicsPixmapItem::isObscuredBy(const QGraphicsItem *item) const
{
return QGraphicsItem::isObscuredBy(item);
}
/*! /*!
\reimp \reimp
*/ */
@ -10017,22 +9921,6 @@ void QGraphicsTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
qt_graphicsItem_highlightSelected(this, painter, option); 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 \reimp
*/ */
@ -10851,22 +10739,6 @@ void QGraphicsSimpleTextItem::paint(QPainter *painter, const QStyleOptionGraphic
qt_graphicsItem_highlightSelected(this, painter, option); 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 \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 \reimp
*/ */

72
src/gui/graphicsview/qgraphicsitem.h
View file

@ -66,7 +66,6 @@ class QGraphicsItemGroup;
class QGraphicsObject; class QGraphicsObject;
class QGraphicsSceneContextMenuEvent; class QGraphicsSceneContextMenuEvent;
class QGraphicsSceneDragDropEvent; class QGraphicsSceneDragDropEvent;
class QGraphicsSceneEvent;
class QGraphicsSceneHoverEvent; class QGraphicsSceneHoverEvent;
class QGraphicsSceneMouseEvent; class QGraphicsSceneMouseEvent;
class QGraphicsSceneWheelEvent; class QGraphicsSceneWheelEvent;
@ -76,7 +75,6 @@ class QGraphicsWidget;
class QInputMethodEvent; class QInputMethodEvent;
class QKeyEvent; class QKeyEvent;
class QMatrix; class QMatrix;
class QMenu;
class QPainter; class QPainter;
class QPen; class QPen;
class QPointF; class QPointF;
@ -162,10 +160,8 @@ public:
}; };
QGraphicsItem(QGraphicsItem *parent = 0 QGraphicsItem(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
virtual ~QGraphicsItem(); virtual ~QGraphicsItem();
@ -605,10 +601,8 @@ class Q_GUI_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem
{ {
public: public:
QAbstractGraphicsShapeItem(QGraphicsItem *parent = 0 QAbstractGraphicsShapeItem(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
~QAbstractGraphicsShapeItem(); ~QAbstractGraphicsShapeItem();
@ -618,7 +612,6 @@ public:
QBrush brush() const; QBrush brush() const;
void setBrush(const QBrush &brush); void setBrush(const QBrush &brush);
bool isObscuredBy(const QGraphicsItem *item) const;
QPainterPath opaqueArea() const; QPainterPath opaqueArea() const;
protected: protected:
@ -635,16 +628,12 @@ class Q_GUI_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem
{ {
public: public:
QGraphicsPathItem(QGraphicsItem *parent = 0 QGraphicsPathItem(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsPathItem(const QPainterPath &path, QGraphicsItem *parent = 0 QGraphicsPathItem(const QPainterPath &path, QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
~QGraphicsPathItem(); ~QGraphicsPathItem();
@ -657,9 +646,6 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
bool isObscuredBy(const QGraphicsItem *item) const;
QPainterPath opaqueArea() const;
enum { Type = 2 }; enum { Type = 2 };
int type() const; int type() const;
@ -678,22 +664,16 @@ class Q_GUI_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem
{ {
public: public:
QGraphicsRectItem(QGraphicsItem *parent = 0 QGraphicsRectItem(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent = 0 QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = 0 QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
~QGraphicsRectItem(); ~QGraphicsRectItem();
@ -707,9 +687,6 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
bool isObscuredBy(const QGraphicsItem *item) const;
QPainterPath opaqueArea() const;
enum { Type = 3 }; enum { Type = 3 };
int type() const; int type() const;
@ -731,22 +708,16 @@ class Q_GUI_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem
{ {
public: public:
QGraphicsEllipseItem(QGraphicsItem *parent = 0 QGraphicsEllipseItem(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *parent = 0 QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = 0 QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
~QGraphicsEllipseItem(); ~QGraphicsEllipseItem();
@ -766,9 +737,6 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
bool isObscuredBy(const QGraphicsItem *item) const;
QPainterPath opaqueArea() const;
enum { Type = 4 }; enum { Type = 4 };
int type() const; int type() const;
@ -790,17 +758,13 @@ class Q_GUI_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem
{ {
public: public:
QGraphicsPolygonItem(QGraphicsItem *parent = 0 QGraphicsPolygonItem(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsPolygonItem(const QPolygonF &polygon, QGraphicsPolygonItem(const QPolygonF &polygon,
QGraphicsItem *parent = 0 QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
~QGraphicsPolygonItem(); ~QGraphicsPolygonItem();
@ -816,9 +780,6 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
bool isObscuredBy(const QGraphicsItem *item) const;
QPainterPath opaqueArea() const;
enum { Type = 5 }; enum { Type = 5 };
int type() const; int type() const;
@ -837,22 +798,16 @@ class Q_GUI_EXPORT QGraphicsLineItem : public QGraphicsItem
{ {
public: public:
QGraphicsLineItem(QGraphicsItem *parent = 0 QGraphicsLineItem(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent = 0 QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGraphicsItem *parent = 0 QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
~QGraphicsLineItem(); ~QGraphicsLineItem();
@ -870,9 +825,6 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
bool isObscuredBy(const QGraphicsItem *item) const;
QPainterPath opaqueArea() const;
enum { Type = 6 }; enum { Type = 6 };
int type() const; int type() const;
@ -897,16 +849,12 @@ public:
}; };
QGraphicsPixmapItem(QGraphicsItem *parent = 0 QGraphicsPixmapItem(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = 0 QGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
~QGraphicsPixmapItem(); ~QGraphicsPixmapItem();
@ -926,7 +874,6 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
bool isObscuredBy(const QGraphicsItem *item) const;
QPainterPath opaqueArea() const; QPainterPath opaqueArea() const;
enum { Type = 7 }; enum { Type = 7 };
@ -959,16 +906,12 @@ class Q_GUI_EXPORT QGraphicsTextItem : public QGraphicsObject
public: public:
QGraphicsTextItem(QGraphicsItem *parent = 0 QGraphicsTextItem(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsTextItem(const QString &text, QGraphicsItem *parent = 0 QGraphicsTextItem(const QString &text, QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
~QGraphicsTextItem(); ~QGraphicsTextItem();
@ -990,9 +933,6 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
bool isObscuredBy(const QGraphicsItem *item) const;
QPainterPath opaqueArea() const;
enum { Type = 8 }; enum { Type = 8 };
int type() const; int type() const;
@ -1060,16 +1000,12 @@ class Q_GUI_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem
{ {
public: public:
QGraphicsSimpleTextItem(QGraphicsItem *parent = 0 QGraphicsSimpleTextItem(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
QGraphicsSimpleTextItem(const QString &text, QGraphicsItem *parent = 0 QGraphicsSimpleTextItem(const QString &text, QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
~QGraphicsSimpleTextItem(); ~QGraphicsSimpleTextItem();
@ -1085,9 +1021,6 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
bool isObscuredBy(const QGraphicsItem *item) const;
QPainterPath opaqueArea() const;
enum { Type = 9 }; enum { Type = 9 };
int type() const; int type() const;
@ -1106,10 +1039,8 @@ class Q_GUI_EXPORT QGraphicsItemGroup : public QGraphicsItem
{ {
public: public:
QGraphicsItemGroup(QGraphicsItem *parent = 0 QGraphicsItemGroup(QGraphicsItem *parent = 0
#ifndef Q_QDOC
// ### obsolete argument // ### obsolete argument
, QGraphicsScene *scene = 0 , QGraphicsScene *scene = 0
#endif
); );
~QGraphicsItemGroup(); ~QGraphicsItemGroup();
@ -1119,9 +1050,6 @@ public:
QRectF boundingRect() const; QRectF boundingRect() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
bool isObscuredBy(const QGraphicsItem *item) const;
QPainterPath opaqueArea() const;
enum { Type = 10 }; enum { Type = 10 };
int type() const; int type() const;