summaryrefslogtreecommitdiff
path: root/src/svg
diff options
context:
space:
mode:
Diffstat (limited to 'src/svg')
-rw-r--r--src/svg/qgraphicssvgitem.h6
-rw-r--r--src/svg/qsvggenerator.cpp3
-rw-r--r--src/svg/qsvgrenderer.h8
-rw-r--r--src/svg/qsvgwidget.h4
4 files changed, 10 insertions, 11 deletions
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index e849f7a..5102b91 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -61,8 +61,8 @@ class Q_SVG_EXPORT QGraphicsSvgItem : public QGraphicsObject
Q_PROPERTY(QSize maximumCacheSize READ maximumCacheSize WRITE setMaximumCacheSize)
public:
- QGraphicsSvgItem(QGraphicsItem *parentItem = Q_NULLPTR);
- QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem = Q_NULLPTR);
+ QGraphicsSvgItem(QGraphicsItem *parentItem = nullptr);
+ QGraphicsSvgItem(const QString &fileName, QGraphicsItem *parentItem = nullptr);
void setSharedRenderer(QSvgRenderer *renderer);
QSvgRenderer *renderer() const;
@@ -80,7 +80,7 @@ public:
void paint(QPainter *painter,
const QStyleOptionGraphicsItem *option,
- QWidget *widget = Q_NULLPTR) override;
+ QWidget *widget = nullptr) override;
enum { Type = 13 };
int type() const override;
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 8b9a9bd..424cc76 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -228,8 +228,7 @@ public:
QTextStream str(&d_func()->defs, QIODevice::Append);
str << "<mask id=\"" << maskId << "\" x=\"0\" y=\"0\" width=\"8\" height=\"8\" "
<< "stroke=\"none\" fill=\"#ffffff\" patternUnits=\"userSpaceOnUse\" >" << endl;
- const auto &rects = reg.rects();
- for (const QRect &r : rects)
+ for (QRect r : reg)
str << rct.arg(r.x()).arg(r.y()).arg(r.width()).arg(r.height()) << endl;
str << QStringLiteral("</mask>") << endl << endl;
d_func()->savedPatternMasks.append(maskId);
diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h
index 6538df0..4413509 100644
--- a/src/svg/qsvgrenderer.h
+++ b/src/svg/qsvgrenderer.h
@@ -65,10 +65,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 = 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(QObject *parent = nullptr);
+ QSvgRenderer(const QString &filename, QObject *parent = nullptr);
+ QSvgRenderer(const QByteArray &contents, QObject *parent = nullptr);
+ QSvgRenderer(QXmlStreamReader *contents, QObject *parent = nullptr);
~QSvgRenderer();
bool isValid() const;
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index 107c64d..8f6dd44 100644
--- a/src/svg/qsvgwidget.h
+++ b/src/svg/qsvgwidget.h
@@ -59,8 +59,8 @@ class Q_SVG_EXPORT QSvgWidget : public QWidget
{
Q_OBJECT
public:
- QSvgWidget(QWidget *parent = Q_NULLPTR);
- QSvgWidget(const QString &file, QWidget *parent = Q_NULLPTR);
+ QSvgWidget(QWidget *parent = nullptr);
+ QSvgWidget(const QString &file, QWidget *parent = nullptr);
~QSvgWidget();
QSvgRenderer *renderer() const;