QmlDesigner: Move unrelated files out of model

Move them to their own sub directories.

Change-Id: I643cf18a862cdbea868e25070e3015ed7e739d46
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

src/plugins/qmldesigner/CMakeLists.txt

@@ -93,10 +93,6 @@ add_qtc_library(QmlDesignerCore STATIC
   PUBLIC_INCLUDES
     ${CMAKE_CURRENT_LIST_DIR}/designercore
     ${CMAKE_CURRENT_LIST_DIR}/designercore/include
-  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/designercore
-  SOURCES
-    rewritertransaction.cpp rewritertransaction.h
-
 )
 
 extend_qtc_library(QmlDesignerCore
@@ -104,6 +100,10 @@ extend_qtc_library(QmlDesignerCore
   SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/designercore/designercoreutils
   SOURCES
     generatedcomponentutils.cpp generatedcomponentutils.h
+    modelmerger.cpp modelmerger.h
+    modelutils.cpp modelutils.h
+    skipiterator.h
+    stylesheetmerger.cpp stylesheetmerger.h
     uniquename.cpp uniquename.h
 )
 
@@ -285,9 +285,7 @@ extend_qtc_library(QmlDesignerCore
     invalidslideindexexception.h
     mathutils.h
     modelfwd.h
-    modelmerger.h
     modelnode.h
-    modelnodepositionstorage.h
     module.h
     nodeabstractproperty.h
     nodeinstance.h
@@ -311,9 +309,9 @@ extend_qtc_library(QmlDesignerCore
     qmltimelinekeyframegroup.h
     removebasestateexception.h
     rewritingexception.h
+    rewritertransaction.h
     signalhandlerproperty.h
     stringutils.h
-    stylesheetmerger.h
     synchronousimagecache.h
     variantproperty.h
 )
@@ -370,7 +368,6 @@ extend_qtc_library(QmlDesignerCore
     annotation.cpp
     auxiliarypropertystorageview.cpp auxiliarypropertystorageview.h
     bindingproperty.cpp
-    componenttextmodifier.cpp
     documentmessage.cpp
     import.cpp
     internalbindingproperty.cpp
@@ -391,25 +388,46 @@ extend_qtc_library(QmlDesignerCore
     internalvariantproperty.h
     model.cpp
     model_p.h
-    modelmerger.cpp
     modelnode.cpp
-    modelnodepositionrecalculator.cpp
-    modelnodepositionrecalculator.h
-    modelnodepositionstorage.cpp
     modelresourcemanagementinterface.h
     modelresourcemanagementfwd.h
     modelresourcemanagement.cpp modelresourcemanagement.h
-    modeltotextmerger.cpp
-    modeltotextmerger.h
-    modelutils.cpp
-    modelutils.h
     nodeabstractproperty.cpp
     nodelistproperty.cpp
     nodeproperty.cpp
+    signalhandlerproperty.cpp
+    variantproperty.cpp
+)
+
+extend_qtc_library(QmlDesignerCore
+  INCLUDES ${CMAKE_CURRENT_LIST_DIR}/designercore/rewriter
+  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/designercore/rewriter
+  SOURCES
+    componenttextmodifier.cpp
+    modelnodepositionrecalculator.cpp
+    modelnodepositionrecalculator.h
+    modelnodepositionstorage.cpp
+    modelnodepositionstorage.h
+    modeltotextmerger.cpp
+    modeltotextmerger.h
     plaintexteditmodifier.cpp
     propertycontainer.cpp
     propertynode.cpp
     propertyparser.cpp
+    rewriteaction.cpp
+    rewriteaction.h
+    rewriteactioncompressor.cpp
+    rewriteactioncompressor.h
+    rewritertransaction.cpp
+    rewriterview.cpp
+    textmodifier.cpp
+    texttomodelmerger.cpp
+    texttomodelmerger.h
+)
+extend_qtc_library(QmlDesignerCore
+  INCLUDES ${CMAKE_CURRENT_LIST_DIR}/designercore/qmltools
+  SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/designercore/qmltools
+  SOURCES
     qml3dnode.cpp
     qmlanchors.cpp
     qmlchangeset.cpp
@@ -423,18 +441,6 @@ extend_qtc_library(QmlDesignerCore
     qmltimeline.cpp
     qmltimelinekeyframegroup.cpp
     qmlvisualnode.cpp
-    rewriteaction.cpp
-    rewriteaction.h
-    rewriteactioncompressor.cpp
-    rewriteactioncompressor.h
-    rewriterview.cpp
-    signalhandlerproperty.cpp
-    skipiterator.h
-    stylesheetmerger.cpp
-    textmodifier.cpp
-    texttomodelmerger.cpp
-    texttomodelmerger.h
-    variantproperty.cpp
 )
 
 extend_qtc_library(QmlDesignerCore
@@ -959,7 +965,7 @@ extend_qtc_plugin(QmlDesigner
   SOURCES_PREFIX designercore
   PUBLIC_INCLUDES designercore
   SOURCES
-    model/basetexteditmodifier.cpp
+    rewriter/basetexteditmodifier.cpp
 )
 
 extend_qtc_plugin(QmlDesigner

src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp

@@ -5,7 +5,7 @@
 #include "exportnotification.h"
 
 #include <designdocument.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <nodemetainfo.h>
 #include <qmldesignerplugin.h>
 #include <qmlitemnode.h>

src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp

@@ -27,7 +27,7 @@
 
 #include <actioneditor.h>
 #include <documentmanager.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <viewmanager.h>
 #include <qmldesignerplugin.h>
 

src/plugins/qmldesigner/components/componentcore/groupitemaction.cpp

@@ -7,7 +7,7 @@
 #include "nodeabstractproperty.h"
 #include "nodelistproperty.h"
 
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <utils/algorithm.h>
 
 using namespace QmlDesigner;

src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp

@@ -4,7 +4,7 @@
 #include "modelnodecontextmenu_helper.h"
 
 #include <bindingproperty.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <modelnode.h>
 #include <nodemetainfo.h>
 #include <nodeproperty.h>

src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp

@@ -8,7 +8,7 @@
 #include <bindingproperty.h>
 #include <connectioneditorevaluator.h>
 #include <exception.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <modelnodeoperations.h>
 #include <nodeabstractproperty.h>
 #include <nodelistproperty.h>

src/plugins/qmldesigner/components/connectioneditor/propertytreemodel.cpp

@@ -7,7 +7,7 @@
 #include <bindingproperty.h>
 #include <designeralgorithm.h>
 #include <exception.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <nodeabstractproperty.h>
 #include <nodelistproperty.h>
 #include <nodemetainfo.h>

src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.cpp

@@ -11,7 +11,7 @@
 #include <qmldesignerplugin.h>
 #include <rewritingexception.h>
 
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <utils/async.h>
 

src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp

@@ -19,7 +19,7 @@
 #include <documentmanager.h>
 #include <enumeration.h>
 #include <externaldependenciesinterface.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <nodelistproperty.h>
 #include <qmldesignerconstants.h>
 #include <qmldesignerplugin.h>

src/plugins/qmldesigner/components/debugview/debugview.cpp

@@ -7,7 +7,7 @@
 #include <qmldesignerplugin.h>
 
 #include <bindingproperty.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <nodeabstractproperty.h>
 #include <nodelistproperty.h>
 #include <nodemetainfo.h>

src/plugins/qmldesigner/components/edit3d/bakelights.cpp

@@ -9,7 +9,7 @@
 #include <bakelightsdatamodel.h>
 #include <bindingproperty.h>
 #include <documentmanager.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <modelnode.h>
 #include <nodeabstractproperty.h>
 #include <nodeinstanceview.h>

src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp

@@ -15,7 +15,7 @@
 #include "qmlobjectnode.h"
 #include "variantproperty.h"
 
-#include <model/modelutils.h>
+#include <modelutils.h>
 
 #include <utils3d.h>
 

src/plugins/qmldesigner/components/edit3d/edit3dview.cpp

@@ -27,7 +27,7 @@
 #include "variantproperty.h"
 
 #include <auxiliarydataproperties.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <utils3d.h>
 
 #include <coreplugin/icore.h>

src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp

@@ -35,7 +35,7 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/icore.h>
 
-#include <model/modelutils.h>
+#include <modelutils.h>
 
 #include <utils/asset.h>
 #include <utils/qtcassert.h>

src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp

@@ -9,7 +9,7 @@
 #include "modelnodecontextmenu.h"
 #include "qmldesignerconstants.h"
 
-#include <model/modelutils.h>
+#include <modelutils.h>
 
 #include <QDebug>
 #include <QGraphicsSceneDragDropEvent>

src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp

@@ -10,7 +10,7 @@
 #include <designeractionmanager.h>
 #include <designericons.h>
 #include <model.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <nodeinstanceview.h>
 #include <nodemetainfo.h>
 #include <qmldesignerconstants.h>

src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp

@@ -15,7 +15,7 @@
 #include "rewritingexception.h"
 #include "viewmanager.h"
 
-#include <model/modelutils.h>
+#include <modelutils.h>
 
 #include <qmljs/qmljsmodelmanagerinterface.h>
 

src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp

@@ -21,7 +21,7 @@
 #endif
 #include <itemlibrarymodel.h>
 #include <model.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <rewritingexception.h>
 #include <qmldesignerconstants.h>
 #include <qmldesignerplugin.h>

src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp

@@ -9,7 +9,7 @@
 #include "navigatortreeview.h"
 #include "navigatorwidget.h"
 #include "choosefrompropertylistdialog.h"
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <dialogutils.h>
 #include <modelnodecontextmenu.h>
 #include <theme.h>

src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp

@@ -18,7 +18,7 @@
 #include <invalididexception.h>
 #include <itemlibraryentry.h>
 #include <materialutils.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <nodeabstractproperty.h>
 #include <nodehints.h>
 #include <nodelistproperty.h>

src/plugins/qmldesigner/components/navigator/navigatorview.cpp

@@ -14,7 +14,7 @@
 #include <designersettings.h>
 #include <designmodecontext.h>
 #include <itemlibraryentry.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <nodeinstanceview.h>
 #include <nodelistproperty.h>
 #include <nodeproperty.h>

src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp

@@ -15,7 +15,7 @@
 #include <qmltimeline.h>
 #include <qmltimelinekeyframegroup.h>
 
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <rewritingexception.h>
 
 #include <theme.h>

src/plugins/qmldesigner/components/transitioneditor/transitioneditorsectionitem.cpp

@@ -13,7 +13,7 @@
 
 #include <abstractview.h>
 #include <bindingproperty.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <variantproperty.h>
 #include <qmltimeline.h>
 #include <qmltimelinekeyframegroup.h>

src/plugins/qmldesigner/designercore/designercoreutils/uniquename.cpp

@@ -3,7 +3,7 @@
 
 #include "uniquename.h"
 
-#include <model/modelutils.h>
+#include <modelutils.h>
 
 #include <utils/span.h>
 

src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp

@@ -58,7 +58,7 @@
 #include <designersettings.h>
 #include <externaldependenciesinterface.h>
 #include <model.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <modelnode.h>
 #include <nodehints.h>
 #include <qmlitemnode.h>

src/plugins/qmldesigner/designercore/rewriter/propertycontainer.cpp

@@ -0,0 +1,95 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "propertycontainer.h"
+#include "propertyparser.h"
+#include <QVariant>
+#include <QString>
+#include <QDebug>
+
+namespace QmlDesigner {
+
+using namespace QmlDesigner::Internal;
+
+
+// Creates invalid PropertyContainer
+PropertyContainer::PropertyContainer() = default;
+
+PropertyContainer::PropertyContainer(const PropertyName &name, const QString &type, const QVariant &value)
+        : m_name(name), m_type(type), m_value(value)
+{
+    Q_ASSERT_X(!name.isEmpty(), Q_FUNC_INFO, "Name of property cannot be empty");
+    Q_ASSERT_X(!type.isEmpty(), Q_FUNC_INFO, "Type of property cannot be empty");
+}
+
+void PropertyContainer::set(const PropertyName &name, const QString &type, const QVariant &value)
+{
+    m_name = name;
+    m_type = type;
+    m_value = value;
+}
+
+bool PropertyContainer::isValid() const
+{
+    return !m_name.isEmpty() && m_value.isValid();
+}
+
+PropertyName PropertyContainer::name() const
+{
+    return m_name;
+}
+
+QVariant PropertyContainer::value() const
+{
+    if (m_value.typeId() == QVariant::String)
+        m_value = PropertyParser::read(m_type, m_value.toString());
+    return m_value;
+}
+
+
+void PropertyContainer::setValue(const QVariant &value)
+{
+    m_value = value;
+}
+
+QString PropertyContainer::type() const
+{
+    return m_type;
+}
+
+QDataStream &operator<<(QDataStream &stream, const PropertyContainer &propertyContainer)
+{
+    Q_ASSERT(!propertyContainer.name().isEmpty());
+    Q_ASSERT(!propertyContainer.type().isEmpty());
+    Q_ASSERT(propertyContainer.value().isValid());
+    stream << propertyContainer.name();
+    stream << propertyContainer.type();
+    stream << propertyContainer.value();
+
+
+    return stream;
+}
+
+QDataStream &operator>>(QDataStream &stream, PropertyContainer &propertyContainer)
+{
+
+    stream >> propertyContainer.m_name;
+    stream >> propertyContainer.m_type;
+    stream >> propertyContainer.m_value;
+
+    Q_ASSERT(!propertyContainer.name().isEmpty());
+
+    return stream;
+}
+
+QDebug operator<<(QDebug debug, const PropertyContainer &propertyContainer)
+{
+    debug << propertyContainer.m_name;
+    debug << propertyContainer.m_type;
+    debug << propertyContainer.m_value;
+
+    return debug.space();
+}
+
+} //namespace QmlDesigner
+

src/plugins/qmldesigner/designercore/rewriter/texttomodelmerger.cpp

@@ -22,7 +22,7 @@
 
 #include <externaldependenciesinterface.h>
 #include <import.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <projectstorage/modulescanner.h>
 #include <rewritingexception.h>
 

src/plugins/qmldesigner/documentmanager.cpp

@@ -6,7 +6,7 @@
 
 #include <auxiliarydataproperties.h>
 #include <bindingproperty.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <modelnode.h>
 #include <nodelistproperty.h>
 #include <nodemetainfo.h>

tests/auto/qml/qmldesigner/coretests/testrewriterview.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include <rewriter/modeltotextmerger.h>
 #include <rewriterview.h>
-#include <model/modeltotextmerger.h>
 
 namespace QmlDesigner {
 

tests/unit/tests/testdesignercore/CMakeLists.txt

@@ -106,9 +106,9 @@ add_qtc_library(TestDesignerCore OBJECT
     model/modelnode.cpp
     model/modelresourcemanagementinterface.h
     model/modelresourcemanagement.cpp model/modelresourcemanagement.h
-    model/modelutils.cpp model/modelutils.h
+    designercoreutils/modelutils.cpp designercoreutils/modelutils.h
-    model/propertycontainer.cpp
+    rewriter/propertycontainer.cpp
-    model/propertyparser.cpp
+    rewriter/propertyparser.cpp
     model/nodeabstractproperty.cpp
     model/nodelistproperty.cpp
     model/nodeproperty.cpp
@@ -149,8 +149,8 @@ add_qtc_library(TestDesignerCore OBJECT
     projectstorage/qmldocumentparserinterface.h
     projectstorage/qmltypesparserinterface.h
     tracing/qmldesignertracing.cpp tracing/qmldesignertracing.h
-    rewritertransaction.cpp
+    rewriter/rewritertransaction.cpp
-    rewritertransaction.h
+    include/rewritertransaction.h
     designercoreutils/uniquename.cpp
     designercoreutils/uniquename.h
 )

tests/unit/tests/unittests/designercoreutils/CMakeLists.txt

@@ -1,5 +1,6 @@
 # qmldesigner/designercore/model
 extend_qtc_test(unittest
   SOURCES
+    modelutils-test.cpp
     uniquename-test.cpp
 )

tests/unit/tests/unittests/designercoreutils/modelutils-test.cpp

@@ -6,7 +6,7 @@
 #include <mocks/abstractviewmock.h>
 #include <mocks/projectstoragemock.h>
 #include <mocks/sourcepathcachemock.h>
-#include <model/modelutils.h>
+#include <modelutils.h>
 #include <nodemetainfo.h>
 #include <nodeproperty.h>
 

tests/unit/tests/unittests/model/CMakeLists.txt

@@ -6,6 +6,5 @@ extend_qtc_test(unittest
     model-test.cpp
     modelnode-test.cpp
     modelresourcemanagement-test.cpp
-    modelutils-test.cpp
     nodelistproperty-test.cpp
 )