From 93b25618ccdb0b970cd79e448d70052876784c15 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@theqtcompany.com>
Date: Thu, 28 Apr 2016 12:20:19 +0200
Subject: [PATCH] QmlDesigner: modernize and beautify code

Change-Id: I937ce76ca96f4d2f3af2febd9448749f69513b02
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
---
 .../designercore/include/rewriterview.h       | 25 +++++++---------
 .../designercore/model/modeltotextmerger.cpp  |  8 ++---
 .../designercore/model/modeltotextmerger.h    |  9 +-----
 .../designercore/model/rewriterview.cpp       | 30 +++++++++----------
 .../designercore/model/texttomodelmerger.cpp  |  2 ++
 5 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index 3a295467185..8a319b6e343 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -26,24 +26,19 @@
 #pragma once
 
 #include "qmldesignercorelib_global.h"
-#include "abstractview.h"
 #include "exception.h"
-#include <modelnodepositionstorage.h>
-#include <QMap>
+#include "abstractview.h"
+
+#include <QScopedPointer>
 #include <QUrl>
 
-#include <modelnode.h>
-#include <QScopedPointer>
-
 namespace QmlJS {
-
 class DiagnosticMessage;
 class LookupContext;
 class Document;
 class ScopeChain;
 }
 
-
 namespace QmlDesigner {
 
 class TextModifier;
@@ -140,8 +135,7 @@ public:
     void reactivateTextMofifierChangeSignals();
     void deactivateTextMofifierChangeSignals();
 
-    Internal::ModelNodePositionStorage *positionStorage() const
-    { return m_positionStorage; }
+    Internal::ModelNodePositionStorage *positionStorage() const;
 
     QList<RewriterError> warnings() const;
     QList<RewriterError> errors() const;
@@ -201,19 +195,20 @@ protected: // functions
     void applyChanges();
 
 private: //variables
+    TextModifier *m_textModifier = nullptr;
+    int transactionLevel = 0;
+    bool m_modificationGroupActive = false;
+    bool m_checkErrors = true;
+
     DifferenceHandling m_differenceHandling;
-    bool m_modificationGroupActive;
-    Internal::ModelNodePositionStorage *m_positionStorage;
+    QScopedPointer<Internal::ModelNodePositionStorage> m_positionStorage;
     QScopedPointer<Internal::ModelToTextMerger> m_modelToTextMerger;
     QScopedPointer<Internal::TextToModelMerger> m_textToModelMerger;
-    TextModifier *m_textModifier;
     QList<RewriterError> m_errors;
     QList<RewriterError> m_warnings;
-    int transactionLevel;
     RewriterTransaction m_removeDefaultPropertyTransaction;
     QString m_rewritingErrorMessage;
     QString lastCorrectQmlSource;
-    bool m_checkErrors;
 };
 
 } //QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
index 7ee9595df28..b9b12934f20 100644
--- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
@@ -27,15 +27,15 @@
 #include "modelnodepositionrecalculator.h"
 #include "qmltextgenerator.h"
 #include "rewriteactioncompressor.h"
-#include "rewriterview.h"
 
-#include <nodelistproperty.h>
+#include <rewriterview.h>
+#include <abstractproperty.h>
 #include <nodeproperty.h>
+#include <nodeabstractproperty.h>
+
 #include <qmljs/parser/qmljsengine_p.h>
 #include <utils/algorithm.h>
 
-#include <QDebug>
-
 namespace {
     enum {
         DebugRewriteActions = 0
diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h
index 7405fcbca0b..e51bb8084bd 100644
--- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h
+++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h
@@ -25,15 +25,8 @@
 
 #pragma once
 
-#include "qmldesignercorelib_global.h"
-#include <modelnode.h>
-#include "abstractview.h"
-#include "nodeabstractproperty.h"
-#include "variantproperty.h"
-#include "bindingproperty.h"
+#include <abstractview.h>
 #include "rewriteaction.h"
-#include <filemanager/qmlrefactoring.h>
-#include <QMap>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index 8b886e513c5..3376e7e52d0 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -25,19 +25,19 @@
 
 #include "rewriterview.h"
 
+#include "texttomodelmerger.h"
+#include "modeltotextmerger.h"
+
+#include <variantproperty.h>
+#include <bindingproperty.h>
+#include <rewritingexception.h>
+#include <signalhandlerproperty.h>
 #include <filemanager/astobjecttextextractor.h>
 #include <filemanager/objectlengthcalculator.h>
 #include <filemanager/firstdefinitionfinder.h>
 #include <customnotifications.h>
-
-
-#include "rewritingexception.h"
-#include "texttomodelmerger.h"
-#include "modelnodepositionstorage.h"
-#include "modeltotextmerger.h"
-#include "nodelistproperty.h"
-#include "signalhandlerproperty.h"
-
+#include <modelnodepositionstorage.h>
+#include <modelnode.h>
 
 #include <qmljs/parser/qmljsengine_p.h>
 
@@ -119,19 +119,14 @@ QString RewriterError::toString() const
 RewriterView::RewriterView(DifferenceHandling differenceHandling, QObject *parent):
         AbstractView(parent),
         m_differenceHandling(differenceHandling),
-        m_modificationGroupActive(false),
         m_positionStorage(new ModelNodePositionStorage),
         m_modelToTextMerger(new Internal::ModelToTextMerger(this)),
-        m_textToModelMerger(new Internal::TextToModelMerger(this)),
-        m_textModifier(0),
-        transactionLevel(0),
-        m_checkErrors(true)
+        m_textToModelMerger(new Internal::TextToModelMerger(this))
 {
 }
 
 RewriterView::~RewriterView()
 {
-    delete m_positionStorage;
 }
 
 Internal::ModelToTextMerger *RewriterView::modelToTextMerger() const
@@ -474,6 +469,11 @@ void RewriterView::applyChanges()
     }
 }
 
+Internal::ModelNodePositionStorage *RewriterView::positionStorage() const
+{
+    return m_positionStorage.data();
+}
+
 QList<RewriterError> RewriterView::warnings() const
 {
     return m_warnings;
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 983e9f104ea..1b581c1aeb6 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -24,6 +24,8 @@
 ****************************************************************************/
 
 #include "texttomodelmerger.h"
+
+#include "modelnodepositionstorage.h"
 #include "abstractproperty.h"
 #include "bindingproperty.h"
 #include "filemanager/firstdefinitionfinder.h"