From 7ccfd4799ee069541d382aea6e2227121270d30c Mon Sep 17 00:00:00 2001 From: Bill King Date: Fri, 11 Jun 2010 13:40:32 +1000 Subject: [PATCH] Fix missing constructor initialisations where it affects codepaths. --- .../components/propertyeditor/propertyeditorvalue.cpp | 2 +- src/plugins/qmldesigner/designercore/model/internalnode.cpp | 4 +++- src/plugins/qmldesigner/designersettings.cpp | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index 4d3661216c6..59bfd5db13c 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -229,7 +229,7 @@ PropertyEditorNodeWrapper::PropertyEditorNodeWrapper(PropertyEditorValue* parent connect(m_editorValue, SIGNAL(modelNodeChanged()), this, SLOT(update())); } -PropertyEditorNodeWrapper::PropertyEditorNodeWrapper(QObject *parent) : QObject(parent) +PropertyEditorNodeWrapper::PropertyEditorNodeWrapper(QObject *parent) : QObject(parent), m_editorValue(NULL) { } diff --git a/src/plugins/qmldesigner/designercore/model/internalnode.cpp b/src/plugins/qmldesigner/designercore/model/internalnode.cpp index 21183fdaab2..9d4d5ac0ff9 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/internalnode.cpp @@ -48,7 +48,9 @@ namespace Internal { */ InternalNode::InternalNode() : - m_valid(false) + m_valid(false), + m_majorVersion(0), + m_minorVersion(0) { } diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp index 68dcb7fa968..dbc7341cf55 100644 --- a/src/plugins/qmldesigner/designersettings.cpp +++ b/src/plugins/qmldesigner/designersettings.cpp @@ -35,8 +35,11 @@ using namespace QmlDesigner; DesignerSettings::DesignerSettings() - : openDesignMode(QmlDesigner::Constants::QML_OPENDESIGNMODE_DEFAULT) + : openDesignMode(QmlDesigner::Constants::QML_OPENDESIGNMODE_DEFAULT), + itemSpacing(0), + snapMargin(0) {} + void DesignerSettings::fromSettings(QSettings *settings) { settings->beginGroup(QLatin1String(QmlDesigner::Constants::QML_SETTINGS_GROUP));