diff options
author | Harald Fernengel <harald@trolltech.com> | 2009-08-06 10:04:36 (GMT) |
---|---|---|
committer | Harald Fernengel <harald@trolltech.com> | 2009-08-06 10:04:36 (GMT) |
commit | e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7 (patch) | |
tree | c01e05d0ea5a42fa1ab5f2f5e686806bcd8e5280 /src/gui/graphicsview/qgraphicsitem.h | |
parent | 7588eaee83776b510eabdb9206e3cabcb3ee9dc2 (diff) | |
download | Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.zip Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.tar.gz Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.tar.bz2 |
Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE
Rationale: We're using template magic now to get the private
pointer in qglobal.h, so no need to have two macros. Also
keeps backward compatibility with outside (KDE) code.
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.h')
-rw-r--r-- | src/gui/graphicsview/qgraphicsitem.h | 20 |
1 files changed, 10 insertions, 10 deletions
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) |