diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 11:49:14 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 13:35:32 +0100 |
commit | c0a8c84eb4bfa8be5fc77d44d25c1a523c022d5c (patch) | |
tree | 70a5c25ca8de2998ea84847f29cad40c11b64bf7 /src/quickshapes | |
parent | 662ab7ebdad0e6c32278f2fcf9a5e43a11681b09 (diff) |
Avoid initializing QFlags with 0 or nullptr in further cases
Amends 744e77b841878fb017c0f2d60607090008f28180.
Change-Id: I16e37aaf503eb62f67fca0e48be4c92c4a72ae46
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quickshapes')
-rw-r--r-- | src/quickshapes/qquickshape_p_p.h | 2 | ||||
-rw-r--r-- | src/quickshapes/qquickshapegenericrenderer.cpp | 6 | ||||
-rw-r--r-- | src/quickshapes/qquickshapesoftwarerenderer.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/quickshapes/qquickshape_p_p.h b/src/quickshapes/qquickshape_p_p.h index bfeb0d2f9f..e9b89d2ab3 100644 --- a/src/quickshapes/qquickshape_p_p.h +++ b/src/quickshapes/qquickshape_p_p.h @@ -89,7 +89,7 @@ public: virtual void beginSync(int totalCount) = 0; virtual void endSync(bool async) = 0; virtual void setAsyncCallback(void (*)(void *), void *) { } - virtual Flags flags() const { return 0; } + virtual Flags flags() const { return {}; } virtual void setPath(int index, const QQuickPath *path) = 0; virtual void setStrokeColor(int index, const QColor &color) = 0; virtual void setStrokeWidth(int index, qreal w) = 0; diff --git a/src/quickshapes/qquickshapegenericrenderer.cpp b/src/quickshapes/qquickshapegenericrenderer.cpp index 06cc442fc7..e0df739987 100644 --- a/src/quickshapes/qquickshapegenericrenderer.cpp +++ b/src/quickshapes/qquickshapegenericrenderer.cpp @@ -470,14 +470,14 @@ void QQuickShapeGenericRenderer::triangulateStroke(const QPainterPath &path, stroker.setInvScale(inverseScale); if (pen.style() == Qt::SolidLine) { - stroker.process(vp, pen, clip, nullptr); + stroker.process(vp, pen, clip, {}); } else { QDashedStrokeProcessor dashStroker; dashStroker.setInvScale(inverseScale); - dashStroker.process(vp, pen, clip, nullptr); + dashStroker.process(vp, pen, clip, {}); QVectorPath dashStroke(dashStroker.points(), dashStroker.elementCount(), dashStroker.elementTypes(), 0); - stroker.process(dashStroke, pen, clip, nullptr); + stroker.process(dashStroke, pen, clip, {}); } if (!stroker.vertexCount()) { diff --git a/src/quickshapes/qquickshapesoftwarerenderer.cpp b/src/quickshapes/qquickshapesoftwarerenderer.cpp index 0f5c3604b5..d6a9d85643 100644 --- a/src/quickshapes/qquickshapesoftwarerenderer.cpp +++ b/src/quickshapes/qquickshapesoftwarerenderer.cpp @@ -266,7 +266,7 @@ void QQuickShapeSoftwareRenderNode::render(const RenderState *state) QSGRenderNode::StateFlags QQuickShapeSoftwareRenderNode::changedStates() const { - return nullptr; + return {}; } QSGRenderNode::RenderingFlags QQuickShapeSoftwareRenderNode::flags() const |