diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 11:49:52 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:55 +0000 |
| commit | 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 (patch) | |
| tree | 7f600686e4dd92681bec09ac745a9dcd4425844b /src/widgets/effects | |
| parent | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (diff) | |
Replace Q_NULLPTR with nullptr where possible
Remaining uses of Q_NULLPTR are in:
src/corelib/global/qcompilerdetection.h
(definition and documentation of Q_NULLPTR)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/widgets/effects')
| -rw-r--r-- | src/widgets/effects/qgraphicseffect.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h index ec5cf886a6..f7c0769778 100644 --- a/src/widgets/effects/qgraphicseffect.h +++ b/src/widgets/effects/qgraphicseffect.h @@ -79,7 +79,7 @@ public: PadToEffectiveBoundingRect }; - QGraphicsEffect(QObject *parent = Q_NULLPTR); + QGraphicsEffect(QObject *parent = nullptr); virtual ~QGraphicsEffect(); virtual QRectF boundingRectFor(const QRectF &sourceRect) const; @@ -95,7 +95,7 @@ Q_SIGNALS: void enabledChanged(bool enabled); protected: - QGraphicsEffect(QGraphicsEffectPrivate &d, QObject *parent = Q_NULLPTR); + QGraphicsEffect(QGraphicsEffectPrivate &d, QObject *parent = nullptr); virtual void draw(QPainter *painter) = 0; virtual void sourceChanged(ChangeFlags flags); void updateBoundingRect(); @@ -104,7 +104,7 @@ protected: QRectF sourceBoundingRect(Qt::CoordinateSystem system = Qt::LogicalCoordinates) const; void drawSource(QPainter *painter); QPixmap sourcePixmap(Qt::CoordinateSystem system = Qt::LogicalCoordinates, - QPoint *offset = Q_NULLPTR, + QPoint *offset = nullptr, PixmapPadMode mode = PadToEffectiveBoundingRect) const; private: @@ -129,7 +129,7 @@ class Q_WIDGETS_EXPORT QGraphicsColorizeEffect: public QGraphicsEffect Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(qreal strength READ strength WRITE setStrength NOTIFY strengthChanged) public: - QGraphicsColorizeEffect(QObject *parent = Q_NULLPTR); + QGraphicsColorizeEffect(QObject *parent = nullptr); ~QGraphicsColorizeEffect(); QColor color() const; @@ -167,7 +167,7 @@ public: Q_DECLARE_FLAGS(BlurHints, BlurHint) Q_FLAG(BlurHints) - QGraphicsBlurEffect(QObject *parent = Q_NULLPTR); + QGraphicsBlurEffect(QObject *parent = nullptr); ~QGraphicsBlurEffect(); QRectF boundingRectFor(const QRectF &rect) const override; @@ -202,7 +202,7 @@ class Q_WIDGETS_EXPORT QGraphicsDropShadowEffect: public QGraphicsEffect Q_PROPERTY(qreal blurRadius READ blurRadius WRITE setBlurRadius NOTIFY blurRadiusChanged) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) public: - QGraphicsDropShadowEffect(QObject *parent = Q_NULLPTR); + QGraphicsDropShadowEffect(QObject *parent = nullptr); ~QGraphicsDropShadowEffect(); QRectF boundingRectFor(const QRectF &rect) const override; @@ -255,7 +255,7 @@ class Q_WIDGETS_EXPORT QGraphicsOpacityEffect: public QGraphicsEffect Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) Q_PROPERTY(QBrush opacityMask READ opacityMask WRITE setOpacityMask NOTIFY opacityMaskChanged) public: - QGraphicsOpacityEffect(QObject *parent = Q_NULLPTR); + QGraphicsOpacityEffect(QObject *parent = nullptr); ~QGraphicsOpacityEffect(); qreal opacity() const; |