summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-02 13:59:24 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-02 22:48:32 +0000
commita0363376cfbfd9359adbd2501dd087dfb0a4eb98 (patch)
tree180b75299eb15dabfd8650b95b12bb26bcb79f88
parent36a22f2c48f7df34c71b2177ff9c8b65daef614c (diff)
downloadqtsvg-a0363376cfbfd9359adbd2501dd087dfb0a4eb98.tar.gz
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Task-number: QTBUG-45291 Change-Id: I725682ffe00dab94f84b00eed3aa76377bb80519 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
-rw-r--r--src/svg/qgraphicssvgitem.h6
-rw-r--r--src/svg/qsvgrenderer.h8
-rw-r--r--src/svg/qsvgwidget.h4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index 541ddec..f3410d7 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -55,8 +55,8 @@ class Q_SVG_EXPORT QGraphicsSvgItem : public QGraphicsObject
Q_PROPERTY(QSize maximumCacheSize READ maximumCacheSize WRITE setMaximumCacheSize)
public:
- QGraphicsSvgItem(QGraphicsItem *parentItem=0);
- QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem=0);
+ QGraphicsSvgItem(QGraphicsItem *parentItem = Q_NULLPTR);
+ QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem = Q_NULLPTR);
void setSharedRenderer(QSvgRenderer *renderer);
QSvgRenderer *renderer() const;
@@ -74,7 +74,7 @@ public:
virtual void paint(QPainter *painter,
const QStyleOptionGraphicsItem *option,
- QWidget *widget=0);
+ QWidget *widget = Q_NULLPTR);
enum { Type = 13 };
virtual int type() const;
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index 7d29e6d..612b10d 100644
--- a/src/svg/qsvgrenderer.h
+++ b/src/svg/qsvgrenderer.h
@@ -59,10 +59,10 @@ class Q_SVG_EXPORT QSvgRenderer : public QObject
Q_PROPERTY(int framesPerSecond READ framesPerSecond WRITE setFramesPerSecond)
Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame)
public:
- QSvgRenderer(QObject *parent=0);
- QSvgRenderer(const QString &filename, QObject *parent=0);
- QSvgRenderer(const QByteArray &contents, QObject *parent=0);
- QSvgRenderer(QXmlStreamReader *contents, QObject *parent=0);
+ QSvgRenderer(QObject *parent = Q_NULLPTR);
+ QSvgRenderer(const QString &filename, QObject *parent = Q_NULLPTR);
+ QSvgRenderer(const QByteArray &contents, QObject *parent = Q_NULLPTR);
+ QSvgRenderer(QXmlStreamReader *contents, QObject *parent = Q_NULLPTR);
~QSvgRenderer();
bool isValid() const;
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index 86616e1..3b8c26a 100644
--- a/src/svg/qsvgwidget.h
+++ b/src/svg/qsvgwidget.h
@@ -53,8 +53,8 @@ class Q_SVG_EXPORT QSvgWidget : public QWidget
{
Q_OBJECT
public:
- QSvgWidget(QWidget *parent=0);
- QSvgWidget(const QString &file, QWidget *parent=0);
+ QSvgWidget(QWidget *parent = Q_NULLPTR);
+ QSvgWidget(const QString &file, QWidget *parent = Q_NULLPTR);
~QSvgWidget();
QSvgRenderer *renderer() const;