Jsonwizard: Modernize JsonFieldPage elements

QTCREATORBUG-17190 is fixed by this since initialization is fixed as a side effect;-)

Task-number: QTCREATORBUG-17190
Change-Id: I9d1f81d6cca26fcdd9ba8a49ee66e05607d6cae1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp

@@ -304,9 +304,6 @@ void JsonFieldPage::Field::setIsCompleteExpando(const QVariant &v, const QString
 // LabelFieldData:
 // --------------------------------------------------------------------
 
-LabelField::LabelField() : m_wordWrap(false)
-{ }
-
 bool LabelField::parseData(const QVariant &data, QString *errorMessage)
 {
     if (data.type() != QVariant::Map) {
@@ -343,9 +340,6 @@ QWidget *LabelField::createWidget(const QString &displayName, JsonFieldPage *pag
 // SpacerFieldData:
 // --------------------------------------------------------------------
 
-SpacerField::SpacerField() : m_factor(1)
-{ }
-
 bool SpacerField::parseData(const QVariant &data, QString *errorMessage)
 {
     if (data.isNull())
@@ -388,9 +382,6 @@ QWidget *SpacerField::createWidget(const QString &displayName, JsonFieldPage *pa
 // LineEditFieldData:
 // --------------------------------------------------------------------
 
-LineEditField::LineEditField() : m_isModified(false), m_isValidating(false)
-{ }
-
 bool LineEditField::parseData(const QVariant &data, QString *errorMessage)
 {
     if (data.isNull())
@@ -502,9 +493,6 @@ void LineEditField::initializeData(MacroExpander *expander)
 // --------------------------------------------------------------------
 
 
-TextEditField::TextEditField() : m_acceptRichText(false)
-{ }
-
 bool TextEditField::parseData(const QVariant &data, QString *errorMessage)
 {
     if (data.isNull())
@@ -570,9 +558,6 @@ void TextEditField::initializeData(MacroExpander *expander)
 // PathChooserFieldData:
 // --------------------------------------------------------------------
 
-PathChooserField::PathChooserField() : m_kind(PathChooser::ExistingDirectory)
-{ }
-
 bool PathChooserField::parseData(const QVariant &data, QString *errorMessage)
 {
     if (data.isNull())
@@ -668,11 +653,6 @@ void PathChooserField::initializeData(MacroExpander *expander)
 // CheckBoxFieldData:
 // --------------------------------------------------------------------
 
-CheckBoxField::CheckBoxField() :
-    m_checkedValue(QLatin1String("0")),
-    m_uncheckedValue(QLatin1String("1"))
-{ }
-
 bool CheckBoxField::parseData(const QVariant &data, QString *errorMessage)
 {
     if (data.isNull())

src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h

@@ -63,36 +63,28 @@ public:
 
 class LabelField : public JsonFieldPage::Field
 {
-public:
-    LabelField();
-
 private:
     QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override;
     bool parseData(const QVariant &data, QString *errorMessage) override;
 
-    bool m_wordWrap;
+    bool m_wordWrap = false;
     QString m_text;
 };
 
 class SpacerField : public JsonFieldPage::Field
 {
 public:
-    SpacerField();
-
     bool suppressName() const override { return true; }
 
 private:
     bool parseData(const QVariant &data, QString *errorMessage) override;
     QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override;
 
-    int m_factor;
+    int m_factor = 1;
 };
 
 class LineEditField : public JsonFieldPage::Field
 {
-public:
-    LineEditField();
-
 private:
     bool parseData(const QVariant &data, QString *errorMessage) override;
     QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override;
@@ -102,10 +94,10 @@ private:
     bool validate(Utils::MacroExpander *expander, QString *message) override;
     void initializeData(Utils::MacroExpander *expander) override;
 
-    bool m_isModified;
+    bool m_isModified = false;
-    bool m_isValidating;
+    bool m_isValidating = false;
-    bool m_restoreLastHistoryItem;
+    bool m_restoreLastHistoryItem = false;
-    bool m_isPassword;
+    bool m_isPassword = false;
     QString m_placeholderText;
     QString m_defaultText;
     QString m_disabledText;
@@ -117,9 +109,6 @@ private:
 
 class TextEditField : public JsonFieldPage::Field
 {
-public:
-    TextEditField();
-
 private:
     bool parseData(const QVariant &data, QString *errorMessage) override;
     QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override;
@@ -130,7 +119,7 @@ private:
     void initializeData(Utils::MacroExpander *expander) override;
 
     QString m_defaultText;
-    bool m_acceptRichText;
+    bool m_acceptRichText = false;
     QString m_disabledText;
 
     mutable QString m_currentText;
@@ -138,9 +127,6 @@ private:
 
 class PathChooserField : public JsonFieldPage::Field
 {
-public:
-    PathChooserField();
-
 private:
     bool parseData(const QVariant &data, QString *errorMessage) override;
 
@@ -155,7 +141,7 @@ private:
     QString m_path;
     QString m_basePath;
     QString m_historyId;
-    Utils::PathChooser::Kind m_kind;
+    Utils::PathChooser::Kind m_kind = Utils::PathChooser::ExistingDirectory;
 
     QString m_currentPath;
 };
@@ -163,8 +149,6 @@ private:
 class CheckBoxField : public JsonFieldPage::Field
 {
 public:
-    CheckBoxField();
-
     bool suppressName() const override { return true; }
 
 private:
@@ -177,8 +161,8 @@ private:
     bool validate(Utils::MacroExpander *expander, QString *message) override;
     void initializeData(Utils::MacroExpander *expander) override;
 
-    QString m_checkedValue;
+    QString m_checkedValue = "0";
-    QString m_uncheckedValue;
+    QString m_uncheckedValue = "1";
     QVariant m_checkedExpression;
 
     bool m_isModified = false;
@@ -186,9 +170,6 @@ private:
 
 class ComboBoxField : public JsonFieldPage::Field
 {
-public:
-    ComboBoxField() = default;
-
 private:
     bool parseData(const QVariant &data, QString *errorMessage) override;