From ae50f706bfb34d8008677498e0fd234356afd265 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Fri, 5 Jul 2024 20:01:02 +0200 Subject: [PATCH] QmlDesigner: Move unrelated files out of model Move them to their own sub directories. Change-Id: I643cf18a862cdbea868e25070e3015ed7e739d46 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/CMakeLists.txt | 64 +++++++------ .../assetexporterplugin/assetexporter.cpp | 2 +- .../componentcore/designeractionmanager.cpp | 2 +- .../componentcore/groupitemaction.cpp | 2 +- .../modelnodecontextmenu_helper.cpp | 2 +- .../connectioneditor/connectionmodel.cpp | 2 +- .../connectioneditor/propertytreemodel.cpp | 2 +- .../contentlibrarybundleimporter.cpp | 2 +- .../contentlibrary/contentlibraryview.cpp | 2 +- .../components/debugview/debugview.cpp | 2 +- .../components/edit3d/bakelights.cpp | 2 +- .../components/edit3d/bakelightsdatamodel.cpp | 2 +- .../components/edit3d/edit3dview.cpp | 2 +- .../components/edit3d/edit3dwidget.cpp | 2 +- .../formeditor/abstractformeditortool.cpp | 2 +- .../itemlibraryassetimportdialog.cpp | 2 +- .../itemlibrary/itemlibraryassetimporter.cpp | 2 +- .../itemlibrary/itemlibrarywidget.cpp | 2 +- .../components/navigator/nameitemdelegate.cpp | 2 +- .../navigator/navigatortreemodel.cpp | 2 +- .../components/navigator/navigatorview.cpp | 2 +- .../timelineeditor/timelinesectionitem.cpp | 2 +- .../transitioneditorsectionitem.cpp | 2 +- .../modelmerger.cpp | 0 .../modelmerger.h | 0 .../modelutils.cpp | 0 .../{model => designercoreutils}/modelutils.h | 0 .../skipiterator.h | 0 .../stylesheetmerger.cpp | 0 .../stylesheetmerger.h | 0 .../designercoreutils/uniquename.cpp | 2 +- .../{ => include}/rewritertransaction.h | 0 .../instances/nodeinstanceview.cpp | 2 +- .../{model => metainfo}/propertycontainer.cpp | 0 .../{model => qmltools}/qml3dnode.cpp | 0 .../{model => qmltools}/qmlanchors.cpp | 0 .../{model => qmltools}/qmlchangeset.cpp | 0 .../{model => qmltools}/qmlconnections.cpp | 0 .../{model => qmltools}/qmlitemnode.cpp | 0 .../qmlmodelnodefacade.cpp | 0 .../{model => qmltools}/qmlobjectnode.cpp | 0 .../{model => qmltools}/qmlstate.cpp | 0 .../{model => qmltools}/qmltextgenerator.cpp | 0 .../{model => qmltools}/qmltextgenerator.h | 0 .../{model => qmltools}/qmltimeline.cpp | 0 .../qmltimelinekeyframegroup.cpp | 0 .../{model => qmltools}/qmlvisualnode.cpp | 0 .../basetexteditmodifier.cpp | 0 .../componenttextmodifier.cpp | 0 .../modelnodepositionrecalculator.cpp | 0 .../modelnodepositionrecalculator.h | 0 .../modelnodepositionstorage.cpp | 0 .../modelnodepositionstorage.h | 0 .../{model => rewriter}/modeltotextmerger.cpp | 0 .../{model => rewriter}/modeltotextmerger.h | 0 .../plaintexteditmodifier.cpp | 0 .../rewriter/propertycontainer.cpp | 95 +++++++++++++++++++ .../{model => rewriter}/propertynode.cpp | 0 .../{model => rewriter}/propertyparser.cpp | 0 .../{model => rewriter}/rewriteaction.cpp | 0 .../{model => rewriter}/rewriteaction.h | 0 .../rewriteactioncompressor.cpp | 0 .../rewriteactioncompressor.h | 0 .../{ => rewriter}/rewritertransaction.cpp | 0 .../{model => rewriter}/rewriterview.cpp | 0 .../{model => rewriter}/textmodifier.cpp | 0 .../{model => rewriter}/texttomodelmerger.cpp | 2 +- .../{model => rewriter}/texttomodelmerger.h | 0 src/plugins/qmldesigner/documentmanager.cpp | 2 +- .../qmldesigner/coretests/testrewriterview.h | 2 +- .../tests/testdesignercore/CMakeLists.txt | 10 +- .../designercoreutils/CMakeLists.txt | 1 + .../modelutils-test.cpp | 2 +- .../unit/tests/unittests/model/CMakeLists.txt | 1 - 74 files changed, 164 insertions(+), 63 deletions(-) rename src/plugins/qmldesigner/designercore/{model => designercoreutils}/modelmerger.cpp (100%) rename src/plugins/qmldesigner/designercore/{include => designercoreutils}/modelmerger.h (100%) rename src/plugins/qmldesigner/designercore/{model => designercoreutils}/modelutils.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => designercoreutils}/modelutils.h (100%) rename src/plugins/qmldesigner/designercore/{model => designercoreutils}/skipiterator.h (100%) rename src/plugins/qmldesigner/designercore/{model => designercoreutils}/stylesheetmerger.cpp (100%) rename src/plugins/qmldesigner/designercore/{include => designercoreutils}/stylesheetmerger.h (100%) rename src/plugins/qmldesigner/designercore/{ => include}/rewritertransaction.h (100%) rename src/plugins/qmldesigner/designercore/{model => metainfo}/propertycontainer.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qml3dnode.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmlanchors.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmlchangeset.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmlconnections.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmlitemnode.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmlmodelnodefacade.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmlobjectnode.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmlstate.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmltextgenerator.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmltextgenerator.h (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmltimeline.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmltimelinekeyframegroup.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => qmltools}/qmlvisualnode.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/basetexteditmodifier.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/componenttextmodifier.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/modelnodepositionrecalculator.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/modelnodepositionrecalculator.h (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/modelnodepositionstorage.cpp (100%) rename src/plugins/qmldesigner/designercore/{include => rewriter}/modelnodepositionstorage.h (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/modeltotextmerger.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/modeltotextmerger.h (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/plaintexteditmodifier.cpp (100%) create mode 100644 src/plugins/qmldesigner/designercore/rewriter/propertycontainer.cpp rename src/plugins/qmldesigner/designercore/{model => rewriter}/propertynode.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/propertyparser.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/rewriteaction.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/rewriteaction.h (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/rewriteactioncompressor.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/rewriteactioncompressor.h (100%) rename src/plugins/qmldesigner/designercore/{ => rewriter}/rewritertransaction.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/rewriterview.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/textmodifier.cpp (100%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/texttomodelmerger.cpp (99%) rename src/plugins/qmldesigner/designercore/{model => rewriter}/texttomodelmerger.h (100%) rename tests/unit/tests/unittests/{model => designercoreutils}/modelutils-test.cpp (99%) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index a90f5c96477..2281b72110a 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/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 diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp index 2cc6606efa1..8caf85e36c6 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp @@ -5,7 +5,7 @@ #include "exportnotification.h" #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 535300da96f..9c2be3538aa 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/qmldesigner/components/componentcore/groupitemaction.cpp b/src/plugins/qmldesigner/components/componentcore/groupitemaction.cpp index fbf59457118..69fb52e264a 100644 --- a/src/plugins/qmldesigner/components/componentcore/groupitemaction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/groupitemaction.cpp @@ -7,7 +7,7 @@ #include "nodeabstractproperty.h" #include "nodelistproperty.h" -#include +#include #include using namespace QmlDesigner; diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp index 4cbebd738df..3297d1a59fd 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp @@ -4,7 +4,7 @@ #include "modelnodecontextmenu_helper.h" #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp index 2047f7625c1..2198cafa253 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/connectioneditor/propertytreemodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/propertytreemodel.cpp index cefaf69506d..db97345d41b 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/propertytreemodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/propertytreemodel.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.cpp index f1f9985a375..364a092a538 100644 --- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.cpp +++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarybundleimporter.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp index b2967818b76..8fed0fc442e 100644 --- a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp +++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp index ab02279e3e1..00ef24320b6 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/edit3d/bakelights.cpp b/src/plugins/qmldesigner/components/edit3d/bakelights.cpp index ab1eb9b07b1..606f4f4255c 100644 --- a/src/plugins/qmldesigner/components/edit3d/bakelights.cpp +++ b/src/plugins/qmldesigner/components/edit3d/bakelights.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp b/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp index a1dfcc8f981..78a578c788b 100644 --- a/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp +++ b/src/plugins/qmldesigner/components/edit3d/bakelightsdatamodel.cpp @@ -15,7 +15,7 @@ #include "qmlobjectnode.h" #include "variantproperty.h" -#include +#include #include diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index 23133d764d4..06f10aba28b 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -27,7 +27,7 @@ #include "variantproperty.h" #include -#include +#include #include #include diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp index 7a98b21cbd4..89d22e8e85c 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp index 657fb4773e0..b8913546647 100644 --- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp @@ -9,7 +9,7 @@ #include "modelnodecontextmenu.h" #include "qmldesignerconstants.h" -#include +#include #include #include diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp index 4c3c6a4a2e3..67a6e3ecfa9 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index c0dd7f4b2b8..5c14c46d183 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -15,7 +15,7 @@ #include "rewritingexception.h" #include "viewmanager.h" -#include +#include #include diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index ffefc431782..16b1a43eb36 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -21,7 +21,7 @@ #endif #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp index 223e04fd967..7dd73fac1cb 100644 --- a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp +++ b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp @@ -9,7 +9,7 @@ #include "navigatortreeview.h" #include "navigatorwidget.h" #include "choosefrompropertylistdialog.h" -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index c5fa30fc7d8..9ed9f24e42d 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 06e94968c16..32fa8d37343 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp index 1aeb97e677e..4d5417c0d6b 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorsectionitem.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorsectionitem.cpp index cbe0e0b1c1f..5b1b4159b39 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorsectionitem.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorsectionitem.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/designercoreutils/modelmerger.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/modelmerger.cpp rename to src/plugins/qmldesigner/designercore/designercoreutils/modelmerger.cpp diff --git a/src/plugins/qmldesigner/designercore/include/modelmerger.h b/src/plugins/qmldesigner/designercore/designercoreutils/modelmerger.h similarity index 100% rename from src/plugins/qmldesigner/designercore/include/modelmerger.h rename to src/plugins/qmldesigner/designercore/designercoreutils/modelmerger.h diff --git a/src/plugins/qmldesigner/designercore/model/modelutils.cpp b/src/plugins/qmldesigner/designercore/designercoreutils/modelutils.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/modelutils.cpp rename to src/plugins/qmldesigner/designercore/designercoreutils/modelutils.cpp diff --git a/src/plugins/qmldesigner/designercore/model/modelutils.h b/src/plugins/qmldesigner/designercore/designercoreutils/modelutils.h similarity index 100% rename from src/plugins/qmldesigner/designercore/model/modelutils.h rename to src/plugins/qmldesigner/designercore/designercoreutils/modelutils.h diff --git a/src/plugins/qmldesigner/designercore/model/skipiterator.h b/src/plugins/qmldesigner/designercore/designercoreutils/skipiterator.h similarity index 100% rename from src/plugins/qmldesigner/designercore/model/skipiterator.h rename to src/plugins/qmldesigner/designercore/designercoreutils/skipiterator.h diff --git a/src/plugins/qmldesigner/designercore/model/stylesheetmerger.cpp b/src/plugins/qmldesigner/designercore/designercoreutils/stylesheetmerger.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/stylesheetmerger.cpp rename to src/plugins/qmldesigner/designercore/designercoreutils/stylesheetmerger.cpp diff --git a/src/plugins/qmldesigner/designercore/include/stylesheetmerger.h b/src/plugins/qmldesigner/designercore/designercoreutils/stylesheetmerger.h similarity index 100% rename from src/plugins/qmldesigner/designercore/include/stylesheetmerger.h rename to src/plugins/qmldesigner/designercore/designercoreutils/stylesheetmerger.h diff --git a/src/plugins/qmldesigner/designercore/designercoreutils/uniquename.cpp b/src/plugins/qmldesigner/designercore/designercoreutils/uniquename.cpp index b0bf81207ba..7a487c451ac 100644 --- a/src/plugins/qmldesigner/designercore/designercoreutils/uniquename.cpp +++ b/src/plugins/qmldesigner/designercore/designercoreutils/uniquename.cpp @@ -3,7 +3,7 @@ #include "uniquename.h" -#include +#include #include diff --git a/src/plugins/qmldesigner/designercore/rewritertransaction.h b/src/plugins/qmldesigner/designercore/include/rewritertransaction.h similarity index 100% rename from src/plugins/qmldesigner/designercore/rewritertransaction.h rename to src/plugins/qmldesigner/designercore/include/rewritertransaction.h diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index f43a725d08b..d157346978f 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/metainfo/propertycontainer.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/propertycontainer.cpp rename to src/plugins/qmldesigner/designercore/metainfo/propertycontainer.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qml3dnode.cpp b/src/plugins/qmldesigner/designercore/qmltools/qml3dnode.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qml3dnode.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qml3dnode.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmlanchors.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmlanchors.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmlanchors.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmlchangeset.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmlchangeset.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmlconnections.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmlconnections.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmlconnections.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmlconnections.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmlitemnode.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmlitemnode.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmlmodelnodefacade.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmlmodelnodefacade.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmlobjectnode.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmlobjectnode.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmlstate.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmlstate.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmlstate.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmltextgenerator.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmltextgenerator.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h b/src/plugins/qmldesigner/designercore/qmltools/qmltextgenerator.h similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmltextgenerator.h rename to src/plugins/qmldesigner/designercore/qmltools/qmltextgenerator.h diff --git a/src/plugins/qmldesigner/designercore/model/qmltimeline.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmltimeline.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmltimeline.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmltimeline.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmltimelinekeyframegroup.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmltimelinekeyframegroup.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmltimelinekeyframegroup.cpp diff --git a/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp b/src/plugins/qmldesigner/designercore/qmltools/qmlvisualnode.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp rename to src/plugins/qmldesigner/designercore/qmltools/qmlvisualnode.cpp diff --git a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/rewriter/basetexteditmodifier.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp rename to src/plugins/qmldesigner/designercore/rewriter/basetexteditmodifier.cpp diff --git a/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp b/src/plugins/qmldesigner/designercore/rewriter/componenttextmodifier.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp rename to src/plugins/qmldesigner/designercore/rewriter/componenttextmodifier.cpp diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp b/src/plugins/qmldesigner/designercore/rewriter/modelnodepositionrecalculator.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp rename to src/plugins/qmldesigner/designercore/rewriter/modelnodepositionrecalculator.cpp diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h b/src/plugins/qmldesigner/designercore/rewriter/modelnodepositionrecalculator.h similarity index 100% rename from src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h rename to src/plugins/qmldesigner/designercore/rewriter/modelnodepositionrecalculator.h diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp b/src/plugins/qmldesigner/designercore/rewriter/modelnodepositionstorage.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/modelnodepositionstorage.cpp rename to src/plugins/qmldesigner/designercore/rewriter/modelnodepositionstorage.cpp diff --git a/src/plugins/qmldesigner/designercore/include/modelnodepositionstorage.h b/src/plugins/qmldesigner/designercore/rewriter/modelnodepositionstorage.h similarity index 100% rename from src/plugins/qmldesigner/designercore/include/modelnodepositionstorage.h rename to src/plugins/qmldesigner/designercore/rewriter/modelnodepositionstorage.h diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/designercore/rewriter/modeltotextmerger.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp rename to src/plugins/qmldesigner/designercore/rewriter/modeltotextmerger.cpp diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h b/src/plugins/qmldesigner/designercore/rewriter/modeltotextmerger.h similarity index 100% rename from src/plugins/qmldesigner/designercore/model/modeltotextmerger.h rename to src/plugins/qmldesigner/designercore/rewriter/modeltotextmerger.h diff --git a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/rewriter/plaintexteditmodifier.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp rename to src/plugins/qmldesigner/designercore/rewriter/plaintexteditmodifier.cpp diff --git a/src/plugins/qmldesigner/designercore/rewriter/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/rewriter/propertycontainer.cpp new file mode 100644 index 00000000000..cd7cebbb73a --- /dev/null +++ b/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 +#include +#include + +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 + diff --git a/src/plugins/qmldesigner/designercore/model/propertynode.cpp b/src/plugins/qmldesigner/designercore/rewriter/propertynode.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/propertynode.cpp rename to src/plugins/qmldesigner/designercore/rewriter/propertynode.cpp diff --git a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp b/src/plugins/qmldesigner/designercore/rewriter/propertyparser.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/propertyparser.cpp rename to src/plugins/qmldesigner/designercore/rewriter/propertyparser.cpp diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.cpp b/src/plugins/qmldesigner/designercore/rewriter/rewriteaction.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/rewriteaction.cpp rename to src/plugins/qmldesigner/designercore/rewriter/rewriteaction.cpp diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.h b/src/plugins/qmldesigner/designercore/rewriter/rewriteaction.h similarity index 100% rename from src/plugins/qmldesigner/designercore/model/rewriteaction.h rename to src/plugins/qmldesigner/designercore/rewriter/rewriteaction.h diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/rewriter/rewriteactioncompressor.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp rename to src/plugins/qmldesigner/designercore/rewriter/rewriteactioncompressor.cpp diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h b/src/plugins/qmldesigner/designercore/rewriter/rewriteactioncompressor.h similarity index 100% rename from src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h rename to src/plugins/qmldesigner/designercore/rewriter/rewriteactioncompressor.h diff --git a/src/plugins/qmldesigner/designercore/rewritertransaction.cpp b/src/plugins/qmldesigner/designercore/rewriter/rewritertransaction.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/rewritertransaction.cpp rename to src/plugins/qmldesigner/designercore/rewriter/rewritertransaction.cpp diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/rewriter/rewriterview.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/rewriterview.cpp rename to src/plugins/qmldesigner/designercore/rewriter/rewriterview.cpp diff --git a/src/plugins/qmldesigner/designercore/model/textmodifier.cpp b/src/plugins/qmldesigner/designercore/rewriter/textmodifier.cpp similarity index 100% rename from src/plugins/qmldesigner/designercore/model/textmodifier.cpp rename to src/plugins/qmldesigner/designercore/rewriter/textmodifier.cpp diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/rewriter/texttomodelmerger.cpp similarity index 99% rename from src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp rename to src/plugins/qmldesigner/designercore/rewriter/texttomodelmerger.cpp index 6950aa749a2..9ef4eb76fe9 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/rewriter/texttomodelmerger.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/rewriter/texttomodelmerger.h similarity index 100% rename from src/plugins/qmldesigner/designercore/model/texttomodelmerger.h rename to src/plugins/qmldesigner/designercore/rewriter/texttomodelmerger.h diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index 8592fc6c342..0d5f65cf8d2 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/auto/qml/qmldesigner/coretests/testrewriterview.h b/tests/auto/qml/qmldesigner/coretests/testrewriterview.h index 594ba3d3d39..75d7a73330d 100644 --- a/tests/auto/qml/qmldesigner/coretests/testrewriterview.h +++ b/tests/auto/qml/qmldesigner/coretests/testrewriterview.h @@ -3,8 +3,8 @@ #pragma once +#include #include -#include namespace QmlDesigner { diff --git a/tests/unit/tests/testdesignercore/CMakeLists.txt b/tests/unit/tests/testdesignercore/CMakeLists.txt index 3bc52fd2e1c..a06525bccb7 100644 --- a/tests/unit/tests/testdesignercore/CMakeLists.txt +++ b/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 - model/propertycontainer.cpp - model/propertyparser.cpp + designercoreutils/modelutils.cpp designercoreutils/modelutils.h + rewriter/propertycontainer.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 - rewritertransaction.h + rewriter/rewritertransaction.cpp + include/rewritertransaction.h designercoreutils/uniquename.cpp designercoreutils/uniquename.h ) diff --git a/tests/unit/tests/unittests/designercoreutils/CMakeLists.txt b/tests/unit/tests/unittests/designercoreutils/CMakeLists.txt index ac92e5a31c1..74e0f274e99 100644 --- a/tests/unit/tests/unittests/designercoreutils/CMakeLists.txt +++ b/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 ) diff --git a/tests/unit/tests/unittests/model/modelutils-test.cpp b/tests/unit/tests/unittests/designercoreutils/modelutils-test.cpp similarity index 99% rename from tests/unit/tests/unittests/model/modelutils-test.cpp rename to tests/unit/tests/unittests/designercoreutils/modelutils-test.cpp index ff800587f91..83d8ef757fb 100644 --- a/tests/unit/tests/unittests/model/modelutils-test.cpp +++ b/tests/unit/tests/unittests/designercoreutils/modelutils-test.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/unit/tests/unittests/model/CMakeLists.txt b/tests/unit/tests/unittests/model/CMakeLists.txt index dfd6107b14c..b29eda3995f 100644 --- a/tests/unit/tests/unittests/model/CMakeLists.txt +++ b/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 )