From 819f9ca965279562f34895dab405f28162c0b8ab Mon Sep 17 00:00:00 2001 From: Olli Werwolff Date: Wed, 8 Jun 2011 09:51:07 +0200 Subject: Use Q_WIDGETS_EXPORT for widgets library Reviewed-by: Lars Knoll --- src/widgets/graphicsview/qgraphicsanchorlayout.h | 4 +-- src/widgets/graphicsview/qgraphicsgridlayout.h | 2 +- src/widgets/graphicsview/qgraphicsitem.h | 34 +++++++++++------------ src/widgets/graphicsview/qgraphicsitem_p.h | 2 +- src/widgets/graphicsview/qgraphicsitemanimation.h | 2 +- src/widgets/graphicsview/qgraphicslayout.h | 2 +- src/widgets/graphicsview/qgraphicslayoutitem.h | 2 +- src/widgets/graphicsview/qgraphicslinearlayout.h | 2 +- src/widgets/graphicsview/qgraphicsproxywidget.cpp | 2 +- src/widgets/graphicsview/qgraphicsproxywidget.h | 2 +- src/widgets/graphicsview/qgraphicsscene.h | 2 +- src/widgets/graphicsview/qgraphicssceneevent.h | 18 ++++++------ src/widgets/graphicsview/qgraphicstransform.h | 6 ++-- src/widgets/graphicsview/qgraphicsview.h | 2 +- src/widgets/graphicsview/qgraphicsview_p.h | 2 +- src/widgets/graphicsview/qgraphicswidget.h | 2 +- 16 files changed, 43 insertions(+), 43 deletions(-) (limited to 'src/widgets/graphicsview') diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index d27ee6b0b8..4e57dbccf9 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h @@ -58,7 +58,7 @@ class QGraphicsAnchorPrivate; class QGraphicsAnchorLayout; class QGraphicsAnchorLayoutPrivate; -class Q_GUI_EXPORT QGraphicsAnchor : public QObject +class Q_WIDGETS_EXPORT QGraphicsAnchor : public QObject { Q_OBJECT Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET unsetSpacing) @@ -79,7 +79,7 @@ private: friend struct AnchorData; }; -class Q_GUI_EXPORT QGraphicsAnchorLayout : public QGraphicsLayout +class Q_WIDGETS_EXPORT QGraphicsAnchorLayout : public QGraphicsLayout { public: QGraphicsAnchorLayout(QGraphicsLayoutItem *parent = 0); diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index 11a3bef5ad..c6bc2229b6 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.h +++ b/src/widgets/graphicsview/qgraphicsgridlayout.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QGraphicsGridLayoutPrivate; -class Q_GUI_EXPORT QGraphicsGridLayout : public QGraphicsLayout +class Q_WIDGETS_EXPORT QGraphicsGridLayout : public QGraphicsLayout { public: QGraphicsGridLayout(QGraphicsLayoutItem *parent = 0); diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index a3443826c7..1e4cbaced6 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -86,7 +86,7 @@ class QRectF; class QStyleOptionGraphicsItem; class QGraphicsItemPrivate; -class Q_GUI_EXPORT QGraphicsItem +class Q_WIDGETS_EXPORT QGraphicsItem { public: enum GraphicsItemFlag { @@ -544,7 +544,7 @@ inline QRectF QGraphicsItem::mapRectFromScene(qreal ax, qreal ay, qreal w, qreal { return mapRectFromScene(QRectF(ax, ay, w, h)); } -class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem +class Q_WIDGETS_EXPORT QGraphicsObject : public QObject, public QGraphicsItem { Q_OBJECT Q_PROPERTY(QGraphicsObject * parent READ parentObject WRITE setParentItem NOTIFY parentChanged DESIGNABLE false) @@ -607,7 +607,7 @@ private: class QAbstractGraphicsShapeItemPrivate; -class Q_GUI_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem +class Q_WIDGETS_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem { public: QAbstractGraphicsShapeItem(QGraphicsItem *parent = 0 @@ -637,7 +637,7 @@ private: }; class QGraphicsPathItemPrivate; -class Q_GUI_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem +class Q_WIDGETS_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem { public: QGraphicsPathItem(QGraphicsItem *parent = 0 @@ -680,7 +680,7 @@ private: }; class QGraphicsRectItemPrivate; -class Q_GUI_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem +class Q_WIDGETS_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem { public: QGraphicsRectItem(QGraphicsItem *parent = 0 @@ -733,7 +733,7 @@ inline void QGraphicsRectItem::setRect(qreal ax, qreal ay, qreal w, qreal h) { setRect(QRectF(ax, ay, w, h)); } class QGraphicsEllipseItemPrivate; -class Q_GUI_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem +class Q_WIDGETS_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem { public: QGraphicsEllipseItem(QGraphicsItem *parent = 0 @@ -792,7 +792,7 @@ inline void QGraphicsEllipseItem::setRect(qreal ax, qreal ay, qreal w, qreal h) { setRect(QRectF(ax, ay, w, h)); } class QGraphicsPolygonItemPrivate; -class Q_GUI_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem +class Q_WIDGETS_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem { public: QGraphicsPolygonItem(QGraphicsItem *parent = 0 @@ -839,7 +839,7 @@ private: }; class QGraphicsLineItemPrivate; -class Q_GUI_EXPORT QGraphicsLineItem : public QGraphicsItem +class Q_WIDGETS_EXPORT QGraphicsLineItem : public QGraphicsItem { public: QGraphicsLineItem(QGraphicsItem *parent = 0 @@ -893,7 +893,7 @@ private: }; class QGraphicsPixmapItemPrivate; -class Q_GUI_EXPORT QGraphicsPixmapItem : public QGraphicsItem +class Q_WIDGETS_EXPORT QGraphicsPixmapItem : public QGraphicsItem { public: enum ShapeMode { @@ -957,7 +957,7 @@ inline void QGraphicsPixmapItem::setOffset(qreal ax, qreal ay) class QGraphicsTextItemPrivate; class QTextDocument; class QTextCursor; -class Q_GUI_EXPORT QGraphicsTextItem : public QGraphicsObject +class Q_WIDGETS_EXPORT QGraphicsTextItem : public QGraphicsObject { Q_OBJECT QDOC_PROPERTY(bool openExternalLinks READ openExternalLinks WRITE setOpenExternalLinks) @@ -1062,7 +1062,7 @@ private: }; class QGraphicsSimpleTextItemPrivate; -class Q_GUI_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem +class Q_WIDGETS_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem { public: QGraphicsSimpleTextItem(QGraphicsItem *parent = 0 @@ -1108,7 +1108,7 @@ private: }; class QGraphicsItemGroupPrivate; -class Q_GUI_EXPORT QGraphicsItemGroup : public QGraphicsItem +class Q_WIDGETS_EXPORT QGraphicsItemGroup : public QGraphicsItem { public: QGraphicsItemGroup(QGraphicsItem *parent = 0 @@ -1149,11 +1149,11 @@ template inline T qgraphicsitem_cast(const QGraphicsItem *item) } #ifndef QT_NO_DEBUG_STREAM -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem *item); -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsObject *item); -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemChange change); -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlag flag); -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlags flags); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem *item); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsObject *item); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemChange change); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlag flag); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlags flags); #endif QT_END_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index afcb294442..3cd77f3cdb 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -155,7 +155,7 @@ public: void purge(); }; -class Q_GUI_EXPORT QGraphicsItemPrivate +class Q_WIDGETS_EXPORT QGraphicsItemPrivate { Q_DECLARE_PUBLIC(QGraphicsItem) public: diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h index e4296cbb7b..a6425a50e4 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.h +++ b/src/widgets/graphicsview/qgraphicsitemanimation.h @@ -59,7 +59,7 @@ class QTimeLine; template struct QPair; class QGraphicsItemAnimationPrivate; -class Q_GUI_EXPORT QGraphicsItemAnimation : public QObject +class Q_WIDGETS_EXPORT QGraphicsItemAnimation : public QObject { Q_OBJECT public: diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index 8ddeccf126..6b19f0e622 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -56,7 +56,7 @@ class QGraphicsLayoutPrivate; class QGraphicsLayoutItem; class QGraphicsWidget; -class Q_GUI_EXPORT QGraphicsLayout : public QGraphicsLayoutItem +class Q_WIDGETS_EXPORT QGraphicsLayout : public QGraphicsLayoutItem { public: QGraphicsLayout(QGraphicsLayoutItem *parent = 0); diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 1842bb44fc..c617959a06 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QGraphicsLayoutItemPrivate; class QGraphicsItem; -class Q_GUI_EXPORT QGraphicsLayoutItem +class Q_WIDGETS_EXPORT QGraphicsLayoutItem { public: QGraphicsLayoutItem(QGraphicsLayoutItem *parent = 0, bool isLayout = false); diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index 0b07c8f073..5d2d5c309f 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.h +++ b/src/widgets/graphicsview/qgraphicslinearlayout.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QGraphicsLinearLayoutPrivate; -class Q_GUI_EXPORT QGraphicsLinearLayout : public QGraphicsLayout +class Q_WIDGETS_EXPORT QGraphicsLinearLayout : public QGraphicsLayout { public: QGraphicsLinearLayout(QGraphicsLayoutItem *parent = 0); diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp index da00e9fccf..127578c7c9 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp +++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp @@ -189,7 +189,7 @@ QT_BEGIN_NAMESPACE */ extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); -Q_GUI_EXPORT extern bool qt_tab_all_widgets; +Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets; /*! \internal diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index 30f232e686..9f0a711c46 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QGraphicsProxyWidgetPrivate; -class Q_GUI_EXPORT QGraphicsProxyWidget : public QGraphicsWidget +class Q_WIDGETS_EXPORT QGraphicsProxyWidget : public QGraphicsWidget { Q_OBJECT public: diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index 5aff805b76..7895584827 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -98,7 +98,7 @@ class QStyle; class QStyleOptionGraphicsItem; class QGraphicsScenePrivate; -class Q_GUI_EXPORT QGraphicsScene : public QObject +class Q_WIDGETS_EXPORT QGraphicsScene : public QObject { Q_OBJECT Q_PROPERTY(QBrush backgroundBrush READ backgroundBrush WRITE setBackgroundBrush) diff --git a/src/widgets/graphicsview/qgraphicssceneevent.h b/src/widgets/graphicsview/qgraphicssceneevent.h index cbc211c542..f3677fbef8 100644 --- a/src/widgets/graphicsview/qgraphicssceneevent.h +++ b/src/widgets/graphicsview/qgraphicssceneevent.h @@ -64,7 +64,7 @@ class QSizeF; class QWidget; class QGraphicsSceneEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneEvent : public QEvent +class Q_WIDGETS_EXPORT QGraphicsSceneEvent : public QEvent { public: QGraphicsSceneEvent(Type type); @@ -82,7 +82,7 @@ private: }; class QGraphicsSceneMouseEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent { public: QGraphicsSceneMouseEvent(Type type = None); @@ -130,7 +130,7 @@ private: }; class QGraphicsSceneWheelEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent { public: QGraphicsSceneWheelEvent(Type type = None); @@ -163,7 +163,7 @@ private: }; class QGraphicsSceneContextMenuEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneContextMenuEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneContextMenuEvent : public QGraphicsSceneEvent { public: enum Reason { Mouse, Keyboard, Other }; @@ -192,7 +192,7 @@ private: }; class QGraphicsSceneHoverEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent { public: QGraphicsSceneHoverEvent(Type type = None); @@ -225,7 +225,7 @@ private: }; class QGraphicsSceneHelpEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent { public: QGraphicsSceneHelpEvent(Type type = None); @@ -243,7 +243,7 @@ private: }; class QGraphicsSceneDragDropEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent { public: QGraphicsSceneDragDropEvent(Type type = None); @@ -286,7 +286,7 @@ private: }; class QGraphicsSceneResizeEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent { Q_DECLARE_PRIVATE(QGraphicsSceneResizeEvent) Q_DISABLE_COPY(QGraphicsSceneResizeEvent) @@ -302,7 +302,7 @@ public: }; class QGraphicsSceneMoveEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent { Q_DECLARE_PRIVATE(QGraphicsSceneMoveEvent) Q_DISABLE_COPY(QGraphicsSceneMoveEvent) diff --git a/src/widgets/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h index a686edebc7..4bceecc47c 100644 --- a/src/widgets/graphicsview/qgraphicstransform.h +++ b/src/widgets/graphicsview/qgraphicstransform.h @@ -57,7 +57,7 @@ QT_MODULE(Gui) class QGraphicsItem; class QGraphicsTransformPrivate; -class Q_GUI_EXPORT QGraphicsTransform : public QObject +class Q_WIDGETS_EXPORT QGraphicsTransform : public QObject { Q_OBJECT public: @@ -80,7 +80,7 @@ private: class QGraphicsScalePrivate; -class Q_GUI_EXPORT QGraphicsScale : public QGraphicsTransform +class Q_WIDGETS_EXPORT QGraphicsScale : public QGraphicsTransform { Q_OBJECT @@ -119,7 +119,7 @@ private: class QGraphicsRotationPrivate; -class Q_GUI_EXPORT QGraphicsRotation : public QGraphicsTransform +class Q_WIDGETS_EXPORT QGraphicsRotation : public QGraphicsTransform { Q_OBJECT diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index 1f03199ddc..19b5753938 100644 --- a/src/widgets/graphicsview/qgraphicsview.h +++ b/src/widgets/graphicsview/qgraphicsview.h @@ -61,7 +61,7 @@ class QPolygonF; class QStyleOptionGraphicsItem; class QGraphicsViewPrivate; -class Q_GUI_EXPORT QGraphicsView : public QAbstractScrollArea +class Q_WIDGETS_EXPORT QGraphicsView : public QAbstractScrollArea { Q_OBJECT Q_FLAGS(QPainter::RenderHints CacheMode OptimizationFlags) diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h index 441fc7606d..535679f1d8 100644 --- a/src/widgets/graphicsview/qgraphicsview_p.h +++ b/src/widgets/graphicsview/qgraphicsview_p.h @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE -class Q_GUI_EXPORT QGraphicsViewPrivate : public QAbstractScrollAreaPrivate +class Q_WIDGETS_EXPORT QGraphicsViewPrivate : public QAbstractScrollAreaPrivate { Q_DECLARE_PUBLIC(QGraphicsView) public: diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index 0ead1996a8..8222886411 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -66,7 +66,7 @@ class QStyleOption; class QGraphicsWidgetPrivate; -class Q_GUI_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLayoutItem +class Q_WIDGETS_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLayoutItem { Q_OBJECT Q_INTERFACES(QGraphicsItem QGraphicsLayoutItem) -- cgit v1.2.3