diff options
Diffstat (limited to 'src/gui/graphicsview')
-rw-r--r-- | src/gui/graphicsview/qgraphicsgridlayout.h | 2 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicsitem.h | 20 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicslayout.h | 2 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicslayoutitem.h | 2 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicslinearlayout.h | 2 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicsscene.h | 2 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h | 2 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicssceneevent.h | 18 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicssceneindex_p.h | 2 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicstransform.h | 8 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicsview.h | 2 |
11 files changed, 31 insertions, 31 deletions
diff --git a/src/gui/graphicsview/qgraphicsgridlayout.h b/src/gui/graphicsview/qgraphicsgridlayout.h index faa91b3..b9db03e 100644 --- a/src/gui/graphicsview/qgraphicsgridlayout.h +++ b/src/gui/graphicsview/qgraphicsgridlayout.h @@ -127,7 +127,7 @@ public: private: Q_DISABLE_COPY(QGraphicsGridLayout) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsGridLayout) + Q_DECLARE_PRIVATE(QGraphicsGridLayout) }; inline void QGraphicsGridLayout::addItem(QGraphicsLayoutItem *aitem, int arow, int acolumn, Qt::Alignment aalignment) diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index 6f9222e..465525f 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -431,7 +431,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsItem) + Q_DECLARE_PRIVATE(QGraphicsItem) friend class QGraphicsItemGroup; friend class QGraphicsScene; friend class QGraphicsScenePrivate; @@ -571,7 +571,7 @@ protected: private: Q_DISABLE_COPY(QAbstractGraphicsShapeItem) - Q_DECLARE_SCOPED_PRIVATE(QAbstractGraphicsShapeItem) + Q_DECLARE_PRIVATE(QAbstractGraphicsShapeItem) }; class QGraphicsPathItemPrivate; @@ -614,7 +614,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsPathItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsPathItem) + Q_DECLARE_PRIVATE(QGraphicsPathItem) }; class QGraphicsRectItemPrivate; @@ -664,7 +664,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsRectItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsRectItem) + Q_DECLARE_PRIVATE(QGraphicsRectItem) }; inline void QGraphicsRectItem::setRect(qreal ax, qreal ay, qreal w, qreal h) @@ -723,7 +723,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsEllipseItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsEllipseItem) + Q_DECLARE_PRIVATE(QGraphicsEllipseItem) }; inline void QGraphicsEllipseItem::setRect(qreal ax, qreal ay, qreal w, qreal h) @@ -773,7 +773,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsPolygonItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsPolygonItem) + Q_DECLARE_PRIVATE(QGraphicsPolygonItem) }; class QGraphicsLineItemPrivate; @@ -827,7 +827,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsLineItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsLineItem) + Q_DECLARE_PRIVATE(QGraphicsLineItem) }; class QGraphicsPixmapItemPrivate; @@ -886,7 +886,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsPixmapItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsPixmapItem) + Q_DECLARE_PRIVATE(QGraphicsPixmapItem) }; inline void QGraphicsPixmapItem::setOffset(qreal ax, qreal ay) @@ -1042,7 +1042,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsSimpleTextItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSimpleTextItem) + Q_DECLARE_PRIVATE(QGraphicsSimpleTextItem) }; class QGraphicsItemGroupPrivate; @@ -1071,7 +1071,7 @@ public: private: Q_DISABLE_COPY(QGraphicsItemGroup) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsItemGroup) + Q_DECLARE_PRIVATE(QGraphicsItemGroup) }; template <class T> inline T qgraphicsitem_cast(QGraphicsItem *item) diff --git a/src/gui/graphicsview/qgraphicslayout.h b/src/gui/graphicsview/qgraphicslayout.h index d2c45ab..7c758bc 100644 --- a/src/gui/graphicsview/qgraphicslayout.h +++ b/src/gui/graphicsview/qgraphicslayout.h @@ -81,7 +81,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsLayout) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsLayout) + Q_DECLARE_PRIVATE(QGraphicsLayout) friend class QGraphicsWidget; }; diff --git a/src/gui/graphicsview/qgraphicslayoutitem.h b/src/gui/graphicsview/qgraphicslayoutitem.h index 156c843..60f894f 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem.h +++ b/src/gui/graphicsview/qgraphicslayoutitem.h @@ -117,7 +117,7 @@ protected: private: QSizeF *effectiveSizeHints(const QSizeF &constraint) const; - Q_DECLARE_SCOPED_PRIVATE(QGraphicsLayoutItem) + Q_DECLARE_PRIVATE(QGraphicsLayoutItem) friend class QGraphicsLayout; }; diff --git a/src/gui/graphicsview/qgraphicslinearlayout.h b/src/gui/graphicsview/qgraphicslinearlayout.h index 91335db..f469680 100644 --- a/src/gui/graphicsview/qgraphicslinearlayout.h +++ b/src/gui/graphicsview/qgraphicslinearlayout.h @@ -108,7 +108,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsLinearLayout) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsLinearLayout) + Q_DECLARE_PRIVATE(QGraphicsLinearLayout) }; #endif diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h index c2f7a22..c0c6e75 100644 --- a/src/gui/graphicsview/qgraphicsscene.h +++ b/src/gui/graphicsview/qgraphicsscene.h @@ -291,7 +291,7 @@ Q_SIGNALS: void selectionChanged(); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsScene) + Q_DECLARE_PRIVATE(QGraphicsScene) Q_DISABLE_COPY(QGraphicsScene) Q_PRIVATE_SLOT(d_func(), void _q_emitUpdated()) Q_PRIVATE_SLOT(d_func(), void _q_polishItems()) diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h index 01a8957..2293a8e 100644 --- a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -100,7 +100,7 @@ protected: void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const QVariant &value); private : - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneBspTreeIndex) + Q_DECLARE_PRIVATE(QGraphicsSceneBspTreeIndex) Q_DISABLE_COPY(QGraphicsSceneBspTreeIndex) Q_PRIVATE_SLOT(d_func(), void _q_updateSortCache()) Q_PRIVATE_SLOT(d_func(), void _q_updateIndex()) diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/gui/graphicsview/qgraphicssceneevent.h index 0445810..ea17f9d 100644 --- a/src/gui/graphicsview/qgraphicssceneevent.h +++ b/src/gui/graphicsview/qgraphicssceneevent.h @@ -76,7 +76,7 @@ public: protected: QGraphicsSceneEvent(QGraphicsSceneEventPrivate &dd, Type type = None); QScopedPointer<QGraphicsSceneEventPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneEvent) }; class QGraphicsSceneMouseEventPrivate; @@ -123,7 +123,7 @@ public: void setModifiers(Qt::KeyboardModifiers modifiers); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneMouseEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneMouseEvent) }; class QGraphicsSceneWheelEventPrivate; @@ -155,7 +155,7 @@ public: void setOrientation(Qt::Orientation orientation); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneWheelEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneWheelEvent) }; class QGraphicsSceneContextMenuEventPrivate; @@ -183,7 +183,7 @@ public: void setReason(Reason reason); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneContextMenuEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneContextMenuEvent) }; class QGraphicsSceneHoverEventPrivate; @@ -215,7 +215,7 @@ public: void setModifiers(Qt::KeyboardModifiers modifiers); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneHoverEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneHoverEvent) }; class QGraphicsSceneHelpEventPrivate; @@ -232,7 +232,7 @@ public: void setScreenPos(const QPoint &pos); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneHelpEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneHelpEvent) }; class QGraphicsSceneDragDropEventPrivate; @@ -274,13 +274,13 @@ public: void setMimeData(const QMimeData *data); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneDragDropEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneDragDropEvent) }; class QGraphicsSceneResizeEventPrivate; class Q_GUI_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent { - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneResizeEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneResizeEvent) public: QGraphicsSceneResizeEvent(); ~QGraphicsSceneResizeEvent(); @@ -295,7 +295,7 @@ public: class QGraphicsSceneMoveEventPrivate; class Q_GUI_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent { - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneMoveEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneMoveEvent) public: QGraphicsSceneMoveEvent(); ~QGraphicsSceneMoveEvent(); diff --git a/src/gui/graphicsview/qgraphicssceneindex_p.h b/src/gui/graphicsview/qgraphicssceneindex_p.h index d3dfcc8..37dffb8 100644 --- a/src/gui/graphicsview/qgraphicssceneindex_p.h +++ b/src/gui/graphicsview/qgraphicssceneindex_p.h @@ -122,7 +122,7 @@ protected: friend class QGraphicsSceneBspTreeIndex; private: Q_DISABLE_COPY(QGraphicsSceneIndex) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneIndex) + Q_DECLARE_PRIVATE(QGraphicsSceneIndex) }; class QGraphicsSceneIndexPrivate : public QObjectPrivate diff --git a/src/gui/graphicsview/qgraphicstransform.h b/src/gui/graphicsview/qgraphicstransform.h index fb3a392..d7c07d0 100644 --- a/src/gui/graphicsview/qgraphicstransform.h +++ b/src/gui/graphicsview/qgraphicstransform.h @@ -74,7 +74,7 @@ protected: private: friend class QGraphicsItem; friend class QGraphicsItemPrivate; - Q_DECLARE_SCOPED_PRIVATE(QGraphicsTransform) + Q_DECLARE_PRIVATE(QGraphicsTransform) }; class QGraphicsScalePrivate; @@ -106,7 +106,7 @@ Q_SIGNALS: void scaleChanged(); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsScale) + Q_DECLARE_PRIVATE(QGraphicsScale) }; class QGraphicsRotationPrivate; @@ -136,7 +136,7 @@ Q_SIGNALS: protected: QGraphicsRotation(QGraphicsRotationPrivate &p, QObject *parent); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsRotation) + Q_DECLARE_PRIVATE(QGraphicsRotation) }; class QGraphicsRotation3DPrivate; @@ -159,7 +159,7 @@ Q_SIGNALS: void axisChanged(); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsRotation3D) + Q_DECLARE_PRIVATE(QGraphicsRotation3D) }; QT_END_NAMESPACE diff --git a/src/gui/graphicsview/qgraphicsview.h b/src/gui/graphicsview/qgraphicsview.h index 425f174..1285e45 100644 --- a/src/gui/graphicsview/qgraphicsview.h +++ b/src/gui/graphicsview/qgraphicsview.h @@ -269,7 +269,7 @@ protected: const QStyleOptionGraphicsItem options[]); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsView) + Q_DECLARE_PRIVATE(QGraphicsView) Q_DISABLE_COPY(QGraphicsView) #ifndef QT_NO_CURSOR Q_PRIVATE_SLOT(d_func(), void _q_setViewportCursor(const QCursor &)) |