From 4fd17b660492ba9d216c935146345f5d295063cc Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 1 Aug 2018 12:18:11 +0200 Subject: [PATCH] QmlDesigner: Fix clazy warning Use nullptr Change-Id: I787794c67e89af7bc7a2d82def580bea3c8f2653 Reviewed-by: Alessandro Portale --- .../qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h | 2 +- .../components/propertyeditor/propertyeditorvalue.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h index dafcbaa268c..07c5d50b6e5 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h @@ -163,7 +163,7 @@ public: void setInLayoutable(bool isInLayoutable); virtual void refreshLayoutable(); - bool hasBindingForProperty(const PropertyName &propertyName, bool *hasChanged = 0) const; + bool hasBindingForProperty(const PropertyName &propertyName, bool *hasChanged = nullptr) const; QQmlContext *context() const; QQmlEngine *engine() const; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index 7fcae031fcd..df58f309ec9 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -358,7 +358,7 @@ PropertyEditorNodeWrapper::PropertyEditorNodeWrapper(PropertyEditorValue* parent connect(m_editorValue, &PropertyEditorValue::modelNodeChanged, this, &PropertyEditorNodeWrapper::update); } -PropertyEditorNodeWrapper::PropertyEditorNodeWrapper(QObject *parent) : QObject(parent), m_editorValue(NULL) +PropertyEditorNodeWrapper::PropertyEditorNodeWrapper(QObject *parent) : QObject(parent), m_editorValue(nullptr) { }