summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
diff options
context:
space:
mode:
authorHarald Fernengel <harald@trolltech.com>2009-08-03 13:12:46 (GMT)
committerHarald Fernengel <harald@trolltech.com>2009-08-03 13:12:46 (GMT)
commit41a83e1ff19ad1396e6001e6b0ac003c701ba55a (patch)
tree609e40eda10418bbf925002c36552074796b96b6 /src/gui/graphicsview
parentd1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db (diff)
downloadQt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.zip
Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.gz
Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.bz2
Squashed commit of the topic/exceptions branch.
Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
Diffstat (limited to 'src/gui/graphicsview')
-rw-r--r--src/gui/graphicsview/qgraphicsgridlayout.h2
-rw-r--r--src/gui/graphicsview/qgraphicsitem.h20
-rw-r--r--src/gui/graphicsview/qgraphicslayout.h2
-rw-r--r--src/gui/graphicsview/qgraphicslayoutitem.h2
-rw-r--r--src/gui/graphicsview/qgraphicslinearlayout.h2
-rw-r--r--src/gui/graphicsview/qgraphicsscene.h2
-rw-r--r--src/gui/graphicsview/qgraphicssceneevent.h20
-rw-r--r--src/gui/graphicsview/qgraphicsview.h2
8 files changed, 26 insertions, 26 deletions
diff --git a/src/gui/graphicsview/qgraphicsgridlayout.h b/src/gui/graphicsview/qgraphicsgridlayout.h
index b9db03e..faa91b3 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_PRIVATE(QGraphicsGridLayout)
+ Q_DECLARE_SCOPED_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 ac77dc2..0b93c27 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -437,7 +437,7 @@ protected:
private:
Q_DISABLE_COPY(QGraphicsItem)
- Q_DECLARE_PRIVATE(QGraphicsItem)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsItem)
friend class QGraphicsItemGroup;
friend class QGraphicsScene;
friend class QGraphicsScenePrivate;
@@ -559,7 +559,7 @@ protected:
private:
Q_DISABLE_COPY(QAbstractGraphicsShapeItem)
- Q_DECLARE_PRIVATE(QAbstractGraphicsShapeItem)
+ Q_DECLARE_SCOPED_PRIVATE(QAbstractGraphicsShapeItem)
};
class QGraphicsPathItemPrivate;
@@ -602,7 +602,7 @@ protected:
private:
Q_DISABLE_COPY(QGraphicsPathItem)
- Q_DECLARE_PRIVATE(QGraphicsPathItem)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsPathItem)
};
class QGraphicsRectItemPrivate;
@@ -652,7 +652,7 @@ protected:
private:
Q_DISABLE_COPY(QGraphicsRectItem)
- Q_DECLARE_PRIVATE(QGraphicsRectItem)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsRectItem)
};
inline void QGraphicsRectItem::setRect(qreal ax, qreal ay, qreal w, qreal h)
@@ -711,7 +711,7 @@ protected:
private:
Q_DISABLE_COPY(QGraphicsEllipseItem)
- Q_DECLARE_PRIVATE(QGraphicsEllipseItem)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsEllipseItem)
};
inline void QGraphicsEllipseItem::setRect(qreal ax, qreal ay, qreal w, qreal h)
@@ -761,7 +761,7 @@ protected:
private:
Q_DISABLE_COPY(QGraphicsPolygonItem)
- Q_DECLARE_PRIVATE(QGraphicsPolygonItem)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsPolygonItem)
};
class QGraphicsLineItemPrivate;
@@ -815,7 +815,7 @@ protected:
private:
Q_DISABLE_COPY(QGraphicsLineItem)
- Q_DECLARE_PRIVATE(QGraphicsLineItem)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsLineItem)
};
class QGraphicsPixmapItemPrivate;
@@ -874,7 +874,7 @@ protected:
private:
Q_DISABLE_COPY(QGraphicsPixmapItem)
- Q_DECLARE_PRIVATE(QGraphicsPixmapItem)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsPixmapItem)
};
inline void QGraphicsPixmapItem::setOffset(qreal ax, qreal ay)
@@ -1030,7 +1030,7 @@ protected:
private:
Q_DISABLE_COPY(QGraphicsSimpleTextItem)
- Q_DECLARE_PRIVATE(QGraphicsSimpleTextItem)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSimpleTextItem)
};
class QGraphicsItemGroupPrivate;
@@ -1059,7 +1059,7 @@ public:
private:
Q_DISABLE_COPY(QGraphicsItemGroup)
- Q_DECLARE_PRIVATE(QGraphicsItemGroup)
+ Q_DECLARE_SCOPED_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 7c758bc..d2c45ab 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_PRIVATE(QGraphicsLayout)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsLayout)
friend class QGraphicsWidget;
};
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.h b/src/gui/graphicsview/qgraphicslayoutitem.h
index 60f894f..156c843 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_PRIVATE(QGraphicsLayoutItem)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsLayoutItem)
friend class QGraphicsLayout;
};
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.h b/src/gui/graphicsview/qgraphicslinearlayout.h
index f469680..91335db 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_PRIVATE(QGraphicsLinearLayout)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsLinearLayout)
};
#endif
diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h
index 4d65b91..7c1160c 100644
--- a/src/gui/graphicsview/qgraphicsscene.h
+++ b/src/gui/graphicsview/qgraphicsscene.h
@@ -272,7 +272,7 @@ Q_SIGNALS:
void selectionChanged();
private:
- Q_DECLARE_PRIVATE(QGraphicsScene)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsScene)
Q_DISABLE_COPY(QGraphicsScene)
Q_PRIVATE_SLOT(d_func(), void _q_updateIndex())
Q_PRIVATE_SLOT(d_func(), void _q_emitUpdated())
diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/gui/graphicsview/qgraphicssceneevent.h
index c6a3eff..6850b3d 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_PRIVATE(QGraphicsSceneEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneEvent)
};
class QGraphicsSceneMouseEventPrivate;
@@ -123,7 +123,7 @@ public:
void setModifiers(Qt::KeyboardModifiers modifiers);
private:
- Q_DECLARE_PRIVATE(QGraphicsSceneMouseEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneMouseEvent)
};
class QGraphicsSceneWheelEventPrivate;
@@ -155,7 +155,7 @@ public:
void setOrientation(Qt::Orientation orientation);
private:
- Q_DECLARE_PRIVATE(QGraphicsSceneWheelEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneWheelEvent)
};
class QGraphicsSceneContextMenuEventPrivate;
@@ -183,7 +183,7 @@ public:
void setReason(Reason reason);
private:
- Q_DECLARE_PRIVATE(QGraphicsSceneContextMenuEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneContextMenuEvent)
};
class QGraphicsSceneHoverEventPrivate;
@@ -215,7 +215,7 @@ public:
void setModifiers(Qt::KeyboardModifiers modifiers);
private:
- Q_DECLARE_PRIVATE(QGraphicsSceneHoverEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneHoverEvent)
};
class QGraphicsSceneHelpEventPrivate;
@@ -232,7 +232,7 @@ public:
void setScreenPos(const QPoint &pos);
private:
- Q_DECLARE_PRIVATE(QGraphicsSceneHelpEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneHelpEvent)
};
class QGraphicsSceneDragDropEventPrivate;
@@ -274,13 +274,13 @@ public:
void setMimeData(const QMimeData *data);
private:
- Q_DECLARE_PRIVATE(QGraphicsSceneDragDropEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneDragDropEvent)
};
class QGraphicsSceneResizeEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent
{
- Q_DECLARE_PRIVATE(QGraphicsSceneResizeEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneResizeEvent)
public:
QGraphicsSceneResizeEvent();
~QGraphicsSceneResizeEvent();
@@ -295,7 +295,7 @@ public:
class QGraphicsSceneMoveEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent
{
- Q_DECLARE_PRIVATE(QGraphicsSceneMoveEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneMoveEvent)
public:
QGraphicsSceneMoveEvent();
~QGraphicsSceneMoveEvent();
@@ -312,7 +312,7 @@ class QGraphicsItem;
class QGraphicsSceneGestureEventPrivate;
class Q_GUI_EXPORT QGraphicsSceneGestureEvent : public QGraphicsSceneEvent
{
- Q_DECLARE_PRIVATE(QGraphicsSceneGestureEvent)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneGestureEvent)
public:
QGraphicsSceneGestureEvent();
~QGraphicsSceneGestureEvent();
diff --git a/src/gui/graphicsview/qgraphicsview.h b/src/gui/graphicsview/qgraphicsview.h
index 1285e45..425f174 100644
--- a/src/gui/graphicsview/qgraphicsview.h
+++ b/src/gui/graphicsview/qgraphicsview.h
@@ -269,7 +269,7 @@ protected:
const QStyleOptionGraphicsItem options[]);
private:
- Q_DECLARE_PRIVATE(QGraphicsView)
+ Q_DECLARE_SCOPED_PRIVATE(QGraphicsView)
Q_DISABLE_COPY(QGraphicsView)
#ifndef QT_NO_CURSOR
Q_PRIVATE_SLOT(d_func(), void _q_setViewportCursor(const QCursor &))