diff options
Diffstat (limited to 'src/imports/shapes')
-rw-r--r-- | src/imports/shapes/plugin.cpp | 2 | ||||
-rw-r--r-- | src/imports/shapes/qquickshapegenericrenderer.cpp | 6 | ||||
-rw-r--r-- | src/imports/shapes/qquickshapenvprrenderer.cpp | 2 | ||||
-rw-r--r-- | src/imports/shapes/qquickshapesoftwarerenderer.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/shapes/plugin.cpp b/src/imports/shapes/plugin.cpp index 74731aa35f..f0e66479b6 100644 --- a/src/imports/shapes/plugin.cpp +++ b/src/imports/shapes/plugin.cpp @@ -58,7 +58,7 @@ class QmlShapesPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QmlShapesPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QmlShapesPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri) override { Q_ASSERT(QByteArray(uri) == QByteArray("QtQuick.Shapes")); diff --git a/src/imports/shapes/qquickshapegenericrenderer.cpp b/src/imports/shapes/qquickshapegenericrenderer.cpp index 8131f02f1a..411252a906 100644 --- a/src/imports/shapes/qquickshapegenericrenderer.cpp +++ b/src/imports/shapes/qquickshapegenericrenderer.cpp @@ -448,14 +448,14 @@ void QQuickShapeGenericRenderer::triangulateStroke(const QPainterPath &path, stroker.setInvScale(inverseScale); if (pen.style() == Qt::SolidLine) { - stroker.process(vp, pen, clip, 0); + stroker.process(vp, pen, clip, nullptr); } else { QDashedStrokeProcessor dashStroker; dashStroker.setInvScale(inverseScale); - dashStroker.process(vp, pen, clip, 0); + dashStroker.process(vp, pen, clip, nullptr); QVectorPath dashStroke(dashStroker.points(), dashStroker.elementCount(), dashStroker.elementTypes(), 0); - stroker.process(dashStroke, pen, clip, 0); + stroker.process(dashStroke, pen, clip, nullptr); } if (!stroker.vertexCount()) { diff --git a/src/imports/shapes/qquickshapenvprrenderer.cpp b/src/imports/shapes/qquickshapenvprrenderer.cpp index 88f367fe70..51af0d8961 100644 --- a/src/imports/shapes/qquickshapenvprrenderer.cpp +++ b/src/imports/shapes/qquickshapenvprrenderer.cpp @@ -986,7 +986,7 @@ void QQuickNvprBlitter::texturedQuad(GLuint textureId, const QSize &size, m_program->enableAttributeArray(0); m_program->enableAttributeArray(1); - f->glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), 0); + f->glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr); f->glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), (const void *) (2 * sizeof(GLfloat))); f->glBindTexture(GL_TEXTURE_2D, textureId); diff --git a/src/imports/shapes/qquickshapesoftwarerenderer.cpp b/src/imports/shapes/qquickshapesoftwarerenderer.cpp index ed13afbc7e..0f5c3604b5 100644 --- a/src/imports/shapes/qquickshapesoftwarerenderer.cpp +++ b/src/imports/shapes/qquickshapesoftwarerenderer.cpp @@ -266,7 +266,7 @@ void QQuickShapeSoftwareRenderNode::render(const RenderState *state) QSGRenderNode::StateFlags QQuickShapeSoftwareRenderNode::changedStates() const { - return 0; + return nullptr; } QSGRenderNode::RenderingFlags QQuickShapeSoftwareRenderNode::flags() const |