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/effects/qgraphicseffect.h | 10 +++++----- src/widgets/effects/qgraphicseffect_p.h | 4 ++-- src/widgets/effects/qpixmapfilter.cpp | 8 ++++---- src/widgets/effects/qpixmapfilter_p.h | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/widgets/effects') diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h index 6ddb6ae92c..0ee6b26463 100644 --- a/src/widgets/effects/qgraphicseffect.h +++ b/src/widgets/effects/qgraphicseffect.h @@ -63,7 +63,7 @@ class QPixmap; class QGraphicsEffectSource; class QGraphicsEffectPrivate; -class Q_GUI_EXPORT QGraphicsEffect : public QObject +class Q_WIDGETS_EXPORT QGraphicsEffect : public QObject { Q_OBJECT Q_FLAGS(ChangeFlags) @@ -127,7 +127,7 @@ public: Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsEffect::ChangeFlags) class QGraphicsColorizeEffectPrivate; -class Q_GUI_EXPORT QGraphicsColorizeEffect: public QGraphicsEffect +class Q_WIDGETS_EXPORT QGraphicsColorizeEffect: public QGraphicsEffect { Q_OBJECT Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) @@ -156,7 +156,7 @@ private: }; class QGraphicsBlurEffectPrivate; -class Q_GUI_EXPORT QGraphicsBlurEffect: public QGraphicsEffect +class Q_WIDGETS_EXPORT QGraphicsBlurEffect: public QGraphicsEffect { Q_OBJECT Q_FLAGS(BlurHint BlurHints) @@ -196,7 +196,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsBlurEffect::BlurHints) class QGraphicsDropShadowEffectPrivate; -class Q_GUI_EXPORT QGraphicsDropShadowEffect: public QGraphicsEffect +class Q_WIDGETS_EXPORT QGraphicsDropShadowEffect: public QGraphicsEffect { Q_OBJECT Q_PROPERTY(QPointF offset READ offset WRITE setOffset NOTIFY offsetChanged) @@ -252,7 +252,7 @@ private: }; class QGraphicsOpacityEffectPrivate; -class Q_GUI_EXPORT QGraphicsOpacityEffect: public QGraphicsEffect +class Q_WIDGETS_EXPORT QGraphicsOpacityEffect: public QGraphicsEffect { Q_OBJECT Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) diff --git a/src/widgets/effects/qgraphicseffect_p.h b/src/widgets/effects/qgraphicseffect_p.h index 6a94db005e..ac15f04d05 100644 --- a/src/widgets/effects/qgraphicseffect_p.h +++ b/src/widgets/effects/qgraphicseffect_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE class QGraphicsEffectSourcePrivate; -class Q_GUI_EXPORT QGraphicsEffectSource : public QObject +class Q_WIDGETS_EXPORT QGraphicsEffectSource : public QObject { Q_OBJECT public: @@ -145,7 +145,7 @@ private: mutable QPixmapCache::Key m_cacheKey; }; -class Q_GUI_EXPORT QGraphicsEffectPrivate : public QObjectPrivate +class Q_WIDGETS_EXPORT QGraphicsEffectPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QGraphicsEffect) public: diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp index 0414a88bd1..922b45cb61 100644 --- a/src/widgets/effects/qpixmapfilter.cpp +++ b/src/widgets/effects/qpixmapfilter.cpp @@ -781,7 +781,7 @@ void expblur(QImage &img, qreal radius, bool improvedQuality = false, int transp #define AVG(a,b) ( ((((a)^(b)) & 0xfefefefeUL) >> 1) + ((a)&(b)) ) #define AVG16(a,b) ( ((((a)^(b)) & 0xf7deUL) >> 1) + ((a)&(b)) ) -Q_GUI_EXPORT QImage qt_halfScaled(const QImage &source) +Q_WIDGETS_EXPORT QImage qt_halfScaled(const QImage &source) { if (source.width() < 2 || source.height() < 2) return QImage(); @@ -869,7 +869,7 @@ Q_GUI_EXPORT QImage qt_halfScaled(const QImage &source) return dest; } -Q_GUI_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, bool quality, bool alphaOnly, int transposed = 0) +Q_WIDGETS_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, bool quality, bool alphaOnly, int transposed = 0) { if (blurImage.format() != QImage::Format_ARGB32_Premultiplied && blurImage.format() != QImage::Format_RGB32) @@ -896,7 +896,7 @@ Q_GUI_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, boo } } -Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0) +Q_WIDGETS_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0) { if (blurImage.format() == QImage::Format_Indexed8) expblur<12, 10, true>(blurImage, radius, quality, transposed); @@ -904,7 +904,7 @@ Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, in expblur<12, 10, false>(blurImage, radius, quality, transposed); } -Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); +Q_WIDGETS_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); /*! \internal diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h index 67d5a07153..5b06656b17 100644 --- a/src/widgets/effects/qpixmapfilter_p.h +++ b/src/widgets/effects/qpixmapfilter_p.h @@ -69,7 +69,7 @@ class QPixmapData; class QPixmapFilterPrivate; -class Q_GUI_EXPORT QPixmapFilter : public QObject +class Q_WIDGETS_EXPORT QPixmapFilter : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QPixmapFilter) @@ -98,7 +98,7 @@ protected: class QPixmapConvolutionFilterPrivate; -class Q_GUI_EXPORT QPixmapConvolutionFilter : public QPixmapFilter +class Q_WIDGETS_EXPORT QPixmapConvolutionFilter : public QPixmapFilter { Q_OBJECT Q_DECLARE_PRIVATE(QPixmapConvolutionFilter) @@ -122,7 +122,7 @@ private: class QPixmapBlurFilterPrivate; -class Q_GUI_EXPORT QPixmapBlurFilter : public QPixmapFilter +class Q_WIDGETS_EXPORT QPixmapBlurFilter : public QPixmapFilter { Q_OBJECT Q_DECLARE_PRIVATE(QPixmapBlurFilter) @@ -146,7 +146,7 @@ private: class QPixmapColorizeFilterPrivate; -class Q_GUI_EXPORT QPixmapColorizeFilter : public QPixmapFilter +class Q_WIDGETS_EXPORT QPixmapColorizeFilter : public QPixmapFilter { Q_OBJECT Q_DECLARE_PRIVATE(QPixmapColorizeFilter) @@ -165,7 +165,7 @@ public: class QPixmapDropShadowFilterPrivate; -class Q_GUI_EXPORT QPixmapDropShadowFilter : public QPixmapFilter +class Q_WIDGETS_EXPORT QPixmapDropShadowFilter : public QPixmapFilter { Q_OBJECT Q_DECLARE_PRIVATE(QPixmapDropShadowFilter) -- cgit v1.2.3