diff options
author | Zhang Hao <zhanghao@uniontech.com> | 2021-10-14 20:51:22 +0800 |
---|---|---|
committer | Zhang Hao <zhanghao@uniontech.com> | 2021-10-15 08:57:00 +0800 |
commit | 4527dc65e56b460bc2c640988cebaf8286582021 (patch) | |
tree | a370561e517dc9eae86ae77dcddd116ffa69c747 /src | |
parent | ff38fa4b1e4e58996afea0851aa1ee17d30bd5e7 (diff) | |
download | qtsvg-4527dc65e56b460bc2c640988cebaf8286582021.tar.gz |
Replace 0 with nullptr
We know that c++11 uses nullptr to replace 0,
so we replace 0 with nullptr in the project.
Change-Id: I81eb8c13339bf235ca5eab719526680e31fa26ed
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/svg/qsvggenerator.cpp | 2 | ||||
-rw-r--r-- | src/svg/qsvghandler.cpp | 6 | ||||
-rw-r--r-- | src/svg/qsvgnode.cpp | 2 | ||||
-rw-r--r-- | src/svg/qsvgstructure.cpp | 2 | ||||
-rw-r--r-- | src/svg/qsvgstyle.cpp | 2 | ||||
-rw-r--r-- | src/svg/qsvgstyle_p.h | 4 | ||||
-rw-r--r-- | src/svg/qsvgtinydocument.cpp | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index 7306551..a00bb72 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -90,7 +90,7 @@ public: { size = QSize(); viewBox = QRectF(); - outputDevice = 0; + outputDevice = nullptr; resolution = 72; attributes.document_title = QLatin1String("Qt SVG Document"); diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index fc8a71d..db29211 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -1339,7 +1339,7 @@ static void parseFont(QSvgNode *node, return; QSvgTinyDocument *doc = node->document(); - QSvgFontStyle *fontStyle = 0; + QSvgFontStyle *fontStyle = nullptr; if (!attributes.fontFamily.isEmpty()) { QSvgFont *svgFont = doc->svgFont(attributes.fontFamily.toString()); if (svgFont) @@ -3394,7 +3394,7 @@ static QSvgNode *createUseNode(QSvgNode *parent, QString linkId = attributes.value(QLatin1String("xlink:href")).toString().remove(0, 1); const QStringView xStr = attributes.value(QLatin1String("x")); const QStringView yStr = attributes.value(QLatin1String("y")); - QSvgStructureNode *group = 0; + QSvgStructureNode *group = nullptr; if (linkId.isEmpty()) linkId = attributes.value(QLatin1String("href")).toString().remove(0, 1); @@ -3714,7 +3714,7 @@ void QSvgHandler::parse() bool QSvgHandler::startElement(const QString &localName, const QXmlStreamAttributes &attributes) { - QSvgNode *node = 0; + QSvgNode *node = nullptr; pushColorCopy(); diff --git a/src/svg/qsvgnode.cpp b/src/svg/qsvgnode.cpp index 29fd4e5..a638fe8 100644 --- a/src/svg/qsvgnode.cpp +++ b/src/svg/qsvgnode.cpp @@ -239,7 +239,7 @@ QRectF QSvgNode::transformedBounds() const QSvgTinyDocument * QSvgNode::document() const { - QSvgTinyDocument *doc = 0; + QSvgTinyDocument *doc = nullptr; QSvgNode *node = const_cast<QSvgNode*>(this); while (node && node->type() != QSvgNode::DOC) { node = node->parent(); diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp index 89c9e4e..572b161 100644 --- a/src/svg/qsvgstructure.cpp +++ b/src/svg/qsvgstructure.cpp @@ -372,7 +372,7 @@ QRectF QSvgStructureNode::bounds(QPainter *p, QSvgExtraStates &states) const QSvgNode * QSvgStructureNode::previousSiblingNode(QSvgNode *n) const { - QSvgNode *prev = 0; + QSvgNode *prev = nullptr; QList<QSvgNode*>::const_iterator itr = m_renderers.constBegin(); for (; itr != m_renderers.constEnd(); ++itr) { QSvgNode *node = *itr; diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index aa10a05..2df8110 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -158,7 +158,7 @@ void QSvgFillStyle::setFillStyle(QSvgFillStyleProperty* style) void QSvgFillStyle::setBrush(QBrush brush) { m_fill = std::move(brush); - m_style = 0; + m_style = nullptr; m_fillSet = 1; } diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index 8664f7a..28cab14 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -70,7 +70,7 @@ class QSvgTinyDocument; template <class T> class QSvgRefCounter { public: - QSvgRefCounter() { t = 0; } + QSvgRefCounter() { t = nullptr; } QSvgRefCounter(T *_t) { t = _t; @@ -424,7 +424,7 @@ public: void setStroke(QBrush brush) { m_stroke.setBrush(brush); - m_style = 0; + m_style = nullptr; m_strokeSet = 1; } diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp index 63d0797..8e7a32e 100644 --- a/src/svg/qsvgtinydocument.cpp +++ b/src/svg/qsvgtinydocument.cpp @@ -202,7 +202,7 @@ QSvgTinyDocument * QSvgTinyDocument::load(const QString &fileName) return load(qt_inflateSvgzDataFrom(&file)); } - QSvgTinyDocument *doc = 0; + QSvgTinyDocument *doc = nullptr; QSvgHandler handler(&file); if (handler.ok()) { doc = handler.document(); @@ -248,7 +248,7 @@ QSvgTinyDocument * QSvgTinyDocument::load(QXmlStreamReader *contents) { QSvgHandler handler(contents); - QSvgTinyDocument *doc = 0; + QSvgTinyDocument *doc = nullptr; if (handler.ok()) { doc = handler.document(); doc->m_animationDuration = handler.animationDuration(); |