From cacce59c9f85946cbb48d1ef439b2552107fd86b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 16 Dec 2020 22:16:22 +0100
Subject: [PATCH] clang-format, to sort include directives
---
.../Core/Fresnel/SpecularScanTest.cpp | 4 +-
.../gui2/libtestmachinery/folderbasedtest.cpp | 14 ++---
.../gui2/libtestmachinery/folderbasedtest.h | 3 +-
.../gui2/libtestmachinery/test_utils.cpp | 20 +++----
.../gui2/libtestmachinery/test_utils.h | 11 ++--
.../gui2/libtestmachinery/widgetbasedtest.cpp | 9 ++--
.../gui2/libtestmachinery/widgetbasedtest.h | 3 +-
.../UnitTests/gui2/testdareflcore/TestAll.cpp | 2 +-
.../gui2/testdareflcore/datahandler.test.cpp | 2 +-
.../testdareflcore/dataloader_utils.test.cpp | 2 +-
.../dataselectionmodel.test.cpp | 4 +-
.../testdareflcore/defaultparser.test.cpp | 2 +-
.../importdataeditoractions.test.cpp | 2 +-
.../testdareflcore/importtableheader.test.cpp | 2 +-
.../layereditoractions.test.cpp | 4 +-
.../testdareflcore/layerelements.test.cpp | 2 +-
.../gui2/testdareflcore/layeritems.test.cpp | 2 +-
.../layerselectionmodel.test.cpp | 2 +-
.../testdareflcore/layerviewmodel.test.cpp | 4 +-
.../testdareflcore/quicksimutils.test.cpp | 2 +-
.../sldelementcontroller.test.cpp | 4 +-
gui2/core/app_constants.h | 3 +-
gui2/core/version.h | 15 ++----
gui2/dataloader/datahandler.cpp | 2 +-
gui2/dataloader/dataloader_utils.cpp | 6 +--
gui2/dataloader/dataloaderdialog.cpp | 20 +++----
gui2/dataloader/dataloaderdialog.h | 2 +-
gui2/dataloader/dataloadertoolbar.cpp | 2 +-
gui2/dataloader/dataloadertoolbar.h | 2 +-
gui2/dataloader/defaultparser.cpp | 2 +-
gui2/dataloader/importfilewidget.cpp | 8 +--
gui2/dataloader/importfilewidget.h | 2 +-
gui2/dataloader/importtableheader.cpp | 2 +-
gui2/dataloader/importtableheader.h | 2 +-
gui2/dataloader/importtablemodel.cpp | 4 +-
gui2/dataloader/importtablemodel.h | 2 +-
gui2/dataloader/importtablewidget.cpp | 8 +--
gui2/dataloader/importtablewidget.h | 2 +-
gui2/dataloader/loaderpreviewpanel.cpp | 8 +--
gui2/dataloader/loaderpreviewpanel.h | 2 +-
gui2/dataloader/loaderselectorpanel.cpp | 6 +--
gui2/dataloader/loaderselectorpanel.h | 2 +-
gui2/dataloader/parserpropertywidget.cpp | 8 +--
gui2/dataloader/parserpropertywidget.h | 2 +-
gui2/importdataview/dataselectionmodel.h | 2 +-
gui2/importdataview/dataselectorwidget.cpp | 12 ++---
gui2/importdataview/dataselectorwidget.h | 2 +-
gui2/importdataview/dataviewmodel.cpp | 6 +--
gui2/importdataview/graphcanvaswidget.cpp | 2 +-
gui2/importdataview/graphcanvaswidget.h | 2 +-
gui2/importdataview/importdataeditor.cpp | 6 +--
gui2/importdataview/importdataeditor.h | 2 +-
.../importdataeditoractions.cpp | 2 +-
gui2/importdataview/importdataeditoractions.h | 2 +-
.../importdataeditortoolbal.cpp | 4 +-
gui2/importdataview/importdataeditortoolbal.h | 2 +-
gui2/importdataview/importdataview.cpp | 4 +-
gui2/importdataview/importdataview.h | 2 +-
.../customlayertreeeditorfactory.cpp | 4 +-
gui2/layereditor/layereditor.cpp | 2 +-
gui2/layereditor/layereditor.h | 2 +-
gui2/layereditor/layereditoractions.cpp | 2 +-
gui2/layereditor/layereditoractions.h | 2 +-
gui2/layereditor/layereditortoolbar.cpp | 6 +--
gui2/layereditor/layereditortoolbar.h | 2 +-
gui2/layereditor/layereditorwidget.cpp | 4 +-
gui2/layereditor/layereditorwidget.h | 2 +-
gui2/layereditor/layerselectionmodel.cpp | 2 +-
gui2/layereditor/layerselectionmodel.h | 2 +-
gui2/layereditor/layertreeview.cpp | 2 +-
gui2/layereditor/layertreeview.h | 2 +-
gui2/main.cpp | 3 +-
gui2/mainwindow/actionmanager.cpp | 4 +-
gui2/mainwindow/actionmanager.h | 2 +-
gui2/mainwindow/fancytab.cpp | 4 +-
gui2/mainwindow/fancytab.h | 2 +-
gui2/mainwindow/mainbarwidget.cpp | 4 +-
gui2/mainwindow/mainbarwidget.h | 2 +-
gui2/mainwindow/mainwindow.cpp | 12 ++---
gui2/mainwindow/mainwindow.h | 2 +-
gui2/mainwindow/simulationview.cpp | 6 +--
gui2/mainwindow/simulationview.h | 2 +-
gui2/mainwindow/styleutils.cpp | 4 +-
gui2/materialeditor/materialeditor.cpp | 4 +-
gui2/materialeditor/materialeditor.h | 2 +-
gui2/materialeditor/materialeditoractions.cpp | 4 +-
gui2/materialeditor/materialeditoractions.h | 2 +-
gui2/materialeditor/materialeditortoolbar.cpp | 6 +--
gui2/materialeditor/materialeditortoolbar.h | 2 +-
gui2/materialeditor/materialeditorwidget.cpp | 2 +-
gui2/materialeditor/materialeditorwidget.h | 2 +-
gui2/materialeditor/materialselectionmodel.h | 2 +-
gui2/materialeditor/materialtableview.cpp | 2 +-
gui2/materialeditor/materialtableview.h | 2 +-
gui2/materialeditor/materialtreeview.cpp | 2 +-
gui2/materialeditor/materialtreeview.h | 2 +-
gui2/model/applicationmodels.h | 2 +-
gui2/model/experimentaldatamodel.cpp | 2 +-
gui2/model/instrumentitems.cpp | 2 +-
gui2/model/instrumentmodel.cpp | 2 +-
gui2/model/jobitem.cpp | 4 +-
gui2/model/jobmodel.cpp | 2 +-
gui2/model/materialitems.cpp | 4 +-
gui2/model/materialmodel.cpp | 4 +-
gui2/model/materialpropertycontroller.cpp | 2 +-
gui2/model/modelutils.cpp | 2 +-
gui2/model/sampleitems.cpp | 4 +-
gui2/model/samplemodel.cpp | 2 +-
.../custombeampropertyeditorfactory.cpp | 6 +--
.../instrumentpropertyeditor.cpp | 6 +--
gui2/quicksimeditor/jobmanager.h | 2 +-
gui2/quicksimeditor/materialprofile.cpp | 2 +-
gui2/quicksimeditor/quicksim_types.h | 2 +-
gui2/quicksimeditor/quicksimcontroller.cpp | 2 +-
gui2/quicksimeditor/quicksimcontroller.h | 2 +-
gui2/quicksimeditor/quicksimeditor.cpp | 6 +--
gui2/quicksimeditor/quicksimeditor.h | 2 +-
gui2/quicksimeditor/quicksimeditortoolbar.cpp | 4 +-
gui2/quicksimeditor/quicksimeditortoolbar.h | 2 +-
gui2/quicksimeditor/quicksimutils.cpp | 6 +--
gui2/quicksimeditor/quicksimutils.h | 3 +-
gui2/quicksimeditor/simplotcontroller.cpp | 2 +-
gui2/quicksimeditor/simplotcontroller.h | 2 +-
gui2/quicksimeditor/simplotwidget.cpp | 8 +--
gui2/quicksimeditor/simplotwidget.h | 2 +-
gui2/quicksimeditor/speculartoysimulation.cpp | 10 ++--
gui2/quicksimeditor/speculartoysimulation.h | 2 +-
gui2/settingsview/settingsview.cpp | 10 ++--
gui2/settingsview/settingsview.h | 2 +-
gui2/sldeditor/elementview.cpp | 2 +-
gui2/sldeditor/graphicsscene.h | 2 +-
gui2/sldeditor/layerelementcontroller.h | 2 +-
gui2/sldeditor/roughnesselementview.cpp | 2 +-
gui2/sldeditor/segmentelementview.cpp | 2 +-
gui2/sldeditor/sldeditor.cpp | 4 +-
gui2/sldeditor/sldeditor.h | 2 +-
gui2/sldeditor/sldeditoractions.cpp | 2 +-
gui2/sldeditor/sldeditoractions.h | 2 +-
gui2/sldeditor/sldeditortoolbar.cpp | 6 +--
gui2/sldeditor/sldeditortoolbar.h | 2 +-
gui2/sldeditor/sldelementcontroller.cpp | 4 +-
gui2/sldeditor/sldelementcontroller.h | 2 +-
gui2/sldeditor/sldelementmodel.cpp | 2 +-
gui2/sldeditor/sldviewwidget.cpp | 4 +-
gui2/sldeditor/sldviewwidget.h | 2 +-
gui2/welcomeview/openprojectwidget.cpp | 10 ++--
gui2/welcomeview/openprojectwidget.h | 2 +-
gui2/welcomeview/projecthandler.cpp | 4 +-
gui2/welcomeview/projecthandler.h | 2 +-
gui2/welcomeview/projectpanewidget.cpp | 4 +-
gui2/welcomeview/projectpanewidget.h | 2 +-
gui2/welcomeview/recentprojectsettings.cpp | 4 +-
gui2/welcomeview/recentprojectsettings.h | 2 +-
gui2/welcomeview/recentprojectwidget.cpp | 8 +--
gui2/welcomeview/recentprojectwidget.h | 2 +-
gui2/welcomeview/userinteractor.cpp | 8 +--
gui2/welcomeview/welcomeview.cpp | 8 +--
gui2/welcomeview/welcomeview.h | 2 +-
.../model/mvvm/commands/abstractitemcommand.h | 2 +-
mvvm/model/mvvm/commands/commandadapter.cpp | 2 +-
mvvm/model/mvvm/commands/commandadapter.h | 2 +-
mvvm/model/mvvm/commands/commandservice.h | 2 +-
mvvm/model/mvvm/commands/commandutils.h | 2 +-
mvvm/model/mvvm/commands/copyitemcommand.cpp | 2 +-
mvvm/model/mvvm/commands/moveitemcommand.h | 2 +-
.../model/mvvm/commands/removeitemcommand.cpp | 2 +-
mvvm/model/mvvm/commands/undostack.cpp | 4 +-
mvvm/model/mvvm/commands/undostack.h | 2 +-
mvvm/model/mvvm/core/uniqueidgenerator.cpp | 2 +-
.../mvvm/factories/itemconverterfactory.h | 2 +-
.../mvvm/factories/modelconverterfactory.cpp | 2 +-
.../mvvm/factories/modelconverterfactory.h | 2 +-
.../mvvm/factories/modeldocumentfactory.h | 2 +-
.../mvvm/factories/projectmanagerfactory.h | 2 +-
.../mvvm/interfaces/itembackupstrategy.h | 2 +-
mvvm/model/mvvm/interfaces/itemcopystrategy.h | 2 +-
.../mvvm/interfaces/itemfactoryinterface.h | 2 +-
mvvm/model/mvvm/model/comparators.cpp | 4 +-
mvvm/model/mvvm/model/customvariants.cpp | 2 +-
mvvm/model/mvvm/model/customvariants.h | 2 +-
mvvm/model/mvvm/model/datarole.cpp | 2 +-
mvvm/model/mvvm/model/externalproperty.h | 2 +-
mvvm/model/mvvm/model/groupitem.cpp | 2 +-
mvvm/model/mvvm/model/groupitem.h | 2 +-
mvvm/model/mvvm/model/itemfactory.cpp | 2 +-
mvvm/model/mvvm/model/itemfactory.h | 2 +-
mvvm/model/mvvm/model/itemmanager.cpp | 2 +-
mvvm/model/mvvm/model/itemmanager.h | 2 +-
mvvm/model/mvvm/model/itempool.cpp | 2 +-
mvvm/model/mvvm/model/itempool.h | 2 +-
mvvm/model/mvvm/model/itemutils.cpp | 2 +-
mvvm/model/mvvm/model/itemutils.h | 2 +-
mvvm/model/mvvm/model/modelutils.cpp | 4 +-
mvvm/model/mvvm/model/modelutils.h | 2 +-
mvvm/model/mvvm/model/path.cpp | 2 +-
mvvm/model/mvvm/model/propertyitem.cpp | 2 +-
mvvm/model/mvvm/model/sessionitem.cpp | 2 +-
mvvm/model/mvvm/model/sessionitem.h | 2 +-
.../model/mvvm/model/sessionitemcontainer.cpp | 2 +-
mvvm/model/mvvm/model/sessionitemdata.cpp | 4 +-
mvvm/model/mvvm/model/sessionitemtags.cpp | 2 +-
mvvm/model/mvvm/model/sessionmodel.cpp | 2 +-
mvvm/model/mvvm/model/sessionmodel.h | 2 +-
mvvm/model/mvvm/model/taginfo.cpp | 2 +-
.../mvvm/project/modelhaschangedcontroller.h | 2 +-
mvvm/model/mvvm/project/project.cpp | 4 +-
mvvm/model/mvvm/project/project.h | 2 +-
mvvm/model/mvvm/project/project_types.h | 2 +-
.../mvvm/project/projectchangecontroller.cpp | 2 +-
.../mvvm/project/projectchangecontroller.h | 2 +-
mvvm/model/mvvm/project/projectmanager.cpp | 2 +-
mvvm/model/mvvm/project/projectmanager.h | 2 +-
.../mvvm/project/projectmanagerdecorator.cpp | 2 +-
.../mvvm/project/projectmanagerdecorator.h | 2 +-
mvvm/model/mvvm/project/projectutils.cpp | 4 +-
mvvm/model/mvvm/project/projectutils.h | 2 +-
.../mvvm/serialization/compatibilityutils.cpp | 2 +-
.../mvvm/serialization/compatibilityutils.h | 2 +-
.../model/mvvm/serialization/jsondocument.cpp | 6 +--
mvvm/model/mvvm/serialization/jsondocument.h | 2 +-
.../model/mvvm/serialization/jsonitem_types.h | 2 +-
.../serialization/jsonitembackupstrategy.cpp | 4 +-
.../serialization/jsonitembackupstrategy.h | 2 +-
.../jsonitemcontainerconverter.cpp | 6 +--
.../jsonitemcontainerconverter.h | 2 +-
.../mvvm/serialization/jsonitemconverter.cpp | 6 +--
.../jsonitemconverterinterface.h | 2 +-
.../serialization/jsonitemcopystrategy.cpp | 4 +-
.../mvvm/serialization/jsonitemcopystrategy.h | 2 +-
.../serialization/jsonitemdataconverter.cpp | 6 +--
.../serialization/jsonitemdataconverter.h | 2 +-
.../jsonitemdataconverterinterface.h | 2 +-
.../serialization/jsonitemformatassistant.cpp | 2 +-
.../serialization/jsonitemformatassistant.h | 2 +-
.../serialization/jsonitemtagsconverter.cpp | 6 +--
.../serialization/jsonitemtagsconverter.h | 2 +-
.../mvvm/serialization/jsonmodelconverter.cpp | 6 +--
.../serialization/jsontaginfoconverter.cpp | 4 +-
.../mvvm/serialization/jsontaginfoconverter.h | 2 +-
mvvm/model/mvvm/serialization/jsonutils.cpp | 6 +--
.../serialization/jsonvariantconverter.cpp | 6 +--
.../mvvm/serialization/jsonvariantconverter.h | 4 +-
mvvm/model/mvvm/signals/callback_types.h | 2 +-
mvvm/model/mvvm/signals/callbackcontainer.h | 4 +-
mvvm/model/mvvm/signals/itemmapper.cpp | 2 +-
mvvm/model/mvvm/signals/itemmapper.h | 2 +-
mvvm/model/mvvm/signals/modellistenerbase.cpp | 2 +-
mvvm/model/mvvm/signals/modelmapper.cpp | 2 +-
mvvm/model/mvvm/signals/modelmapper.h | 2 +-
mvvm/model/mvvm/standarditems/axisitems.h | 2 +-
.../model/mvvm/standarditems/colormapitem.cpp | 2 +-
.../standarditems/colormapviewportitem.cpp | 4 +-
mvvm/model/mvvm/standarditems/data1ditem.cpp | 2 +-
mvvm/model/mvvm/standarditems/data2ditem.cpp | 2 +-
mvvm/model/mvvm/standarditems/graphitem.cpp | 4 +-
.../mvvm/standarditems/graphviewportitem.cpp | 4 +-
mvvm/model/mvvm/standarditems/linkeditem.cpp | 2 +-
.../mvvm/standarditems/plottableitems.cpp | 4 +-
mvvm/model/mvvm/standarditems/vectoritem.cpp | 2 +-
.../model/mvvm/standarditems/viewportitem.cpp | 2 +-
mvvm/model/mvvm/utils/binutils.cpp | 2 +-
mvvm/model/mvvm/utils/containerutils.h | 2 +-
mvvm/model/mvvm/utils/fileutils.cpp | 2 +-
mvvm/model/mvvm/utils/numericutils.cpp | 2 +-
mvvm/model/mvvm/utils/progresshandler.h | 2 +-
mvvm/model/mvvm/utils/reallimits.cpp | 4 +-
mvvm/model/mvvm/utils/stringutils.cpp | 2 +-
mvvm/model/mvvm/utils/threadsafestack.h | 2 +-
.../libtestmachinery/folderbasedtest.cpp | 14 ++---
mvvm/tests/libtestmachinery/folderbasedtest.h | 3 +-
mvvm/tests/libtestmachinery/google_test.h | 4 +-
mvvm/tests/libtestmachinery/mockinterfaces.h | 4 +-
mvvm/tests/libtestmachinery/mockwidgets.cpp | 18 +++----
mvvm/tests/libtestmachinery/mockwidgets.h | 12 ++---
mvvm/tests/libtestmachinery/test_utils.cpp | 53 +++++++------------
mvvm/tests/libtestmachinery/test_utils.h | 20 +++----
mvvm/tests/libtestmachinery/toyitems.cpp | 32 ++++-------
mvvm/tests/libtestmachinery/toyitems.h | 33 ++++--------
mvvm/tests/libtestmachinery/toymodel.cpp | 14 ++---
mvvm/tests/libtestmachinery/toymodel.h | 8 ++-
.../libtestmachinery/widgetbasedtest.cpp | 9 ++--
mvvm/tests/libtestmachinery/widgetbasedtest.h | 3 +-
mvvm/tests/testintegration/TestAll.cpp | 3 +-
.../standarditemserialization.test.cpp | 16 +++---
.../testintegration/toyitemslattice.test.cpp | 6 +--
.../toyitemsserialization.test.cpp | 16 +++---
.../toyitemsshapegroup.test.cpp | 33 +++++-------
.../testintegration/undoscenario.test.cpp | 8 ++-
.../testmodel/callbackcontainer.test.cpp | 2 +-
mvvm/tests/testmodel/compounditem.test.cpp | 4 +-
mvvm/tests/testmodel/containeritem.test.cpp | 2 +-
mvvm/tests/testmodel/containerutils.test.cpp | 2 +-
mvvm/tests/testmodel/customvariants.test.cpp | 6 +--
mvvm/tests/testmodel/fileutils.test.cpp | 2 +-
mvvm/tests/testmodel/graphitem.test.cpp | 2 +-
.../testmodel/itemconverterfactory.test.cpp | 4 +-
mvvm/tests/testmodel/itemlistener.test.cpp | 2 +-
mvvm/tests/testmodel/itemmanager.test.cpp | 2 +-
mvvm/tests/testmodel/itempool.test.cpp | 2 +-
mvvm/tests/testmodel/itemutils.test.cpp | 2 +-
mvvm/tests/testmodel/jsondocument.test.cpp | 2 +-
.../jsonitemcontainerconverter.test.cpp | 8 +--
.../testmodel/jsonitemconverter.test.cpp | 8 +--
.../testmodel/jsonitemdataconverter.test.cpp | 6 +--
.../jsonitemformatassistant.test.cpp | 4 +-
.../testmodel/jsonmodelconverter.test.cpp | 8 +--
.../testmodel/jsontaginfoconverter.test.cpp | 4 +-
mvvm/tests/testmodel/jsonutils.test.cpp | 2 +-
.../testmodel/jsonvariantconverter.test.cpp | 10 ++--
mvvm/tests/testmodel/modellistener.test.cpp | 2 +-
mvvm/tests/testmodel/modelutils.test.cpp | 2 +-
mvvm/tests/testmodel/numericutils.test.cpp | 2 +-
mvvm/tests/testmodel/path.test.cpp | 2 +-
mvvm/tests/testmodel/plottableitems.test.cpp | 2 +-
mvvm/tests/testmodel/project.test.cpp | 4 +-
mvvm/tests/testmodel/projectmanager.test.cpp | 4 +-
.../projectmanagerdecorator.test.cpp | 2 +-
mvvm/tests/testmodel/projectutils.test.cpp | 2 +-
mvvm/tests/testmodel/reallimits.test.cpp | 2 +-
mvvm/tests/testmodel/sessionitem.test.cpp | 4 +-
.../testmodel/sessionitemcontainer.test.cpp | 2 +-
mvvm/tests/testmodel/sessionitemtags.test.cpp | 2 +-
mvvm/tests/testmodel/sessionmodel.test.cpp | 2 +-
mvvm/tests/testmodel/stringutils.test.cpp | 2 +-
mvvm/tests/testmodel/threadsafestack.test.cpp | 2 +-
mvvm/tests/testmodel/undostack.test.cpp | 4 +-
.../testview/axistitlecontroller.test.cpp | 4 +-
.../testview/colormapplotcontroller.test.cpp | 4 +-
.../colormapviewportplotcontroller.test.cpp | 2 +-
.../testview/customplotsceneadapter.test.cpp | 2 +-
.../testview/data1dplotcontroller.test.cpp | 4 +-
.../testview/data2dplotcontroller.test.cpp | 4 +-
.../testview/graphplotcontroller.test.cpp | 4 +-
.../graphviewportplotcontroller.test.cpp | 2 +-
mvvm/tests/testview/pencontroller.test.cpp | 2 +-
mvvm/tests/testview/propertyflatview.test.cpp | 6 +--
.../viewportaxisplotcontroller.test.cpp | 4 +-
mvvm/tests/testview/widgetutils.test.cpp | 2 +-
mvvm/tests/testviewmodel/TestToyLayerItem.cpp | 6 +--
.../testviewmodel/TestToyMultiLayerItem.cpp | 6 +--
.../testviewmodel/TestToyParticleItem.cpp | 6 +--
.../defaulteditorfactory.test.cpp | 8 +--
.../testviewmodel/defaultviewmodel.test.cpp | 8 +--
.../labeldatarowstrategy.test.cpp | 2 +-
.../propertiesrowstrategy.test.cpp | 2 +-
.../propertyflatviewmodel.test.cpp | 4 +-
.../propertytableviewmodel.test.cpp | 2 +-
.../testviewmodel/propertyviewmodel.test.cpp | 4 +-
.../testviewmodel/scientificspinbox.test.cpp | 2 +-
.../standardchildrenstrategies.test.cpp | 4 +-
.../testviewmodel/standardviewitems.test.cpp | 4 +-
.../testviewmodel/topitemsviewmodel.test.cpp | 6 +--
mvvm/tests/testviewmodel/viewitem.test.cpp | 2 +-
.../testviewmodel/viewmodelbase.test.cpp | 6 +--
.../viewmodelcontroller.test.cpp | 4 +-
.../testviewmodel/viewmodeldelegate.test.cpp | 6 +--
.../testviewmodel/viewmodelfactory.test.cpp | 2 +-
.../testviewmodel/viewmodelutils.test.cpp | 6 +--
.../mvvm/plotting/axistitlecontroller.cpp | 2 +-
mvvm/view/mvvm/plotting/axistitlecontroller.h | 2 +-
mvvm/view/mvvm/plotting/colormapcanvas.cpp | 2 +-
mvvm/view/mvvm/plotting/colormapcanvas.h | 2 +-
.../mvvm/plotting/colormapinfoformatter.cpp | 2 +-
.../mvvm/plotting/colormapplotcontroller.cpp | 6 +--
.../mvvm/plotting/colormapplotcontroller.h | 2 +-
.../colormapviewportplotcontroller.cpp | 4 +-
.../plotting/colormapviewportplotcontroller.h | 2 +-
.../plotting/colorscaleplotcontroller.cpp | 2 +-
.../mvvm/plotting/colorscaleplotcontroller.h | 2 +-
.../mvvm/plotting/customplotproxywidget.cpp | 2 +-
.../mvvm/plotting/customplotproxywidget.h | 2 +-
.../mvvm/plotting/customplotsceneadapter.h | 2 +-
.../mvvm/plotting/data1dplotcontroller.cpp | 2 +-
.../view/mvvm/plotting/data1dplotcontroller.h | 2 +-
.../mvvm/plotting/data2dplotcontroller.cpp | 4 +-
.../view/mvvm/plotting/data2dplotcontroller.h | 2 +-
mvvm/view/mvvm/plotting/graphcanvas.cpp | 6 +--
mvvm/view/mvvm/plotting/graphcanvas.h | 2 +-
.../mvvm/plotting/graphplotcontroller.cpp | 4 +-
mvvm/view/mvvm/plotting/graphplotcontroller.h | 2 +-
.../plotting/graphviewportplotcontroller.cpp | 4 +-
.../plotting/graphviewportplotcontroller.h | 2 +-
mvvm/view/mvvm/plotting/mousemovereporter.cpp | 2 +-
mvvm/view/mvvm/plotting/mousemovereporter.h | 2 +-
mvvm/view/mvvm/plotting/pencontroller.cpp | 4 +-
mvvm/view/mvvm/plotting/pencontroller.h | 2 +-
.../mvvm/plotting/statusstringreporter.cpp | 2 +-
.../view/mvvm/plotting/statusstringreporter.h | 2 +-
.../plotting/statusstringreporterfactory.cpp | 2 +-
.../plotting/statusstringreporterfactory.h | 2 +-
.../plotting/viewportaxisplotcontroller.cpp | 6 +--
.../plotting/viewportaxisplotcontroller.h | 2 +-
.../view/mvvm/widgets/adjustingscrollarea.cpp | 2 +-
mvvm/view/mvvm/widgets/adjustingscrollarea.h | 2 +-
mvvm/view/mvvm/widgets/allitemstreeview.cpp | 2 +-
mvvm/view/mvvm/widgets/collapsiblebar.cpp | 4 +-
mvvm/view/mvvm/widgets/collapsiblebar.h | 2 +-
.../mvvm/widgets/collapsiblelistwidget.cpp | 4 +-
.../view/mvvm/widgets/collapsiblelistwidget.h | 2 +-
mvvm/view/mvvm/widgets/itemstreeview.cpp | 6 +--
mvvm/view/mvvm/widgets/itemstreeview.h | 2 +-
.../mvvm/widgets/itemstreeviewinterface.h | 2 +-
mvvm/view/mvvm/widgets/layoututils.cpp | 2 +-
mvvm/view/mvvm/widgets/propertyflatview.cpp | 10 ++--
mvvm/view/mvvm/widgets/propertyflatview.h | 2 +-
mvvm/view/mvvm/widgets/propertytreeview.cpp | 4 +-
mvvm/view/mvvm/widgets/statuslabel.cpp | 6 +--
mvvm/view/mvvm/widgets/statuslabel.h | 2 +-
mvvm/view/mvvm/widgets/topitemstreeview.cpp | 2 +-
mvvm/view/mvvm/widgets/widgetutils.cpp | 4 +-
mvvm/view/mvvm/widgets/widgetutils.h | 2 +-
mvvm/viewmodel/mvvm/editors/booleditor.cpp | 2 +-
mvvm/viewmodel/mvvm/editors/coloreditor.cpp | 6 +--
.../mvvm/editors/combopropertyeditor.cpp | 4 +-
mvvm/viewmodel/mvvm/editors/customeditor.h | 2 +-
.../mvvm/editors/customeventfilters.cpp | 2 +-
.../mvvm/editors/customeventfilters.h | 2 +-
.../mvvm/editors/defaulteditorfactory.cpp | 2 +-
.../mvvm/editors/defaulteditorfactory.h | 4 +-
mvvm/viewmodel/mvvm/editors/doubleeditor.cpp | 4 +-
.../viewmodel/mvvm/editors/editorbuilders.cpp | 4 +-
mvvm/viewmodel/mvvm/editors/editorbuilders.h | 2 +-
.../editors/externalpropertycomboeditor.cpp | 4 +-
.../editors/externalpropertycomboeditor.h | 2 +-
.../mvvm/editors/externalpropertyeditor.cpp | 10 ++--
.../mvvm/editors/externalpropertyeditor.h | 2 +-
mvvm/viewmodel/mvvm/editors/integereditor.cpp | 2 +-
.../mvvm/editors/scientificdoubleeditor.cpp | 4 +-
.../mvvm/editors/scientificspinbox.cpp | 4 +-
.../mvvm/editors/scientificspinbox.h | 2 +-
.../mvvm/editors/scientificspinboxeditor.cpp | 4 +-
.../mvvm/editors/selectablecomboboxeditor.cpp | 8 +--
.../factories/viewmodelcontrollerbuilder.h | 2 +-
.../factories/viewmodelcontrollerfactory.h | 2 +-
.../mvvm/factories/viewmodelfactory.h | 2 +-
.../mvvm/interfaces/editorfactoryinterface.h | 2 +-
.../mvvm/interfaces/rowstrategyinterface.h | 2 +-
.../mvvm/viewmodel/defaultcelldecorator.cpp | 6 +--
.../mvvm/viewmodel/labeldatarowstrategy.cpp | 2 +-
.../mvvm/viewmodel/propertiesrowstrategy.cpp | 2 +-
.../viewmodel/standardchildrenstrategies.cpp | 2 +-
.../mvvm/viewmodel/standardviewitems.cpp | 2 +-
.../standardviewmodelcontrollers.cpp | 2 +-
.../mvvm/viewmodel/topitemsviewmodel.cpp | 2 +-
mvvm/viewmodel/mvvm/viewmodel/viewitem.cpp | 4 +-
mvvm/viewmodel/mvvm/viewmodel/viewitem.h | 2 +-
mvvm/viewmodel/mvvm/viewmodel/viewmodel.cpp | 2 +-
.../mvvm/viewmodel/viewmodelbase.cpp | 2 +-
mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.h | 2 +-
.../mvvm/viewmodel/viewmodelcontroller.cpp | 4 +-
.../mvvm/viewmodel/viewmodelcontroller.h | 4 +-
.../mvvm/viewmodel/viewmodeldelegate.cpp | 4 +-
.../mvvm/viewmodel/viewmodeldelegate.h | 2 +-
.../mvvm/viewmodel/viewmodelutils.cpp | 6 +--
.../viewmodel/mvvm/viewmodel/viewmodelutils.h | 2 +-
455 files changed, 808 insertions(+), 923 deletions(-)
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
index 3df1c01142d..2bd17a1f820 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
@@ -196,14 +196,14 @@ TEST_F(SpecularScanTest, GenerateSimElements) {
EXPECT_EQ(scan2.numberOfSimulationElements(), 3u);
for (size_t i = 0; i < sim_elements2.size(); ++i)
EXPECT_TRUE(sim_elements2[i].isCalculated());
-
+
const double offset = 1.;
scan2.setOffset(offset);
std::vector<SpecularSimulationElement> sim_elements3 =
scan2.generateSimulationElements(instrument);
std::vector<Slice> slices;
slices.emplace_back(0., MaterialBySLD());
- for (size_t i = 0; i < sim_elements3.size(); ++i){
+ for (size_t i = 0; i < sim_elements3.size(); ++i) {
const auto generatedKzs = sim_elements3[i].produceKz(slices);
EXPECT_EQ(generatedKzs[0].imag(), 0.);
EXPECT_EQ(2. * generatedKzs[0].real(), scan2_qvector[i] + offset);
diff --git a/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp b/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp
index 96bfbb0072e..60b0ab6a553 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp
+++ b/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.cpp
@@ -8,31 +8,27 @@
// ************************************************************************** //
#include "folderbasedtest.h"
-#include "test_utils.h"
#include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
-FolderBasedTest::FolderBasedTest(const std::string& test_dir) : m_test_dir(test_dir)
-{
+FolderBasedTest::FolderBasedTest(const std::string& test_dir) : m_test_dir(test_dir) {
TestUtils::CreateTestDirectory(m_test_dir);
}
-std::string FolderBasedTest::testDir() const
-{
+std::string FolderBasedTest::testDir() const {
return m_test_dir;
}
//! Return full path to the test folder. Located in CMAKE_BINARY_DIR/test_output/<m_test_dir>.
-std::string FolderBasedTest::testPath() const
-{
+std::string FolderBasedTest::testPath() const {
return TestUtils::TestDirectoryPath(m_test_dir);
}
//! Creates an empty directory in main test folder.
//! Remove recursively previous one with the same name, if exist.
-std::string FolderBasedTest::createEmptyDir(const std::string& subdir) const
-{
+std::string FolderBasedTest::createEmptyDir(const std::string& subdir) const {
auto path = ModelView::Utils::join(testPath(), subdir);
ModelView::Utils::remove_all(path);
ModelView::Utils::create_directory(path);
diff --git a/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h b/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h
index 60b00e26567..9e5163497d0 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h
+++ b/Tests/UnitTests/gui2/libtestmachinery/folderbasedtest.h
@@ -15,8 +15,7 @@
//! Convenience class which creates a directory on disk for test content.
-class FolderBasedTest : public ::testing::Test
-{
+class FolderBasedTest : public ::testing::Test {
public:
FolderBasedTest(const std::string& test_dir);
~FolderBasedTest();
diff --git a/Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp b/Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp
index 1ed0ec6ab2c..757de37ea30 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp
+++ b/Tests/UnitTests/gui2/libtestmachinery/test_utils.cpp
@@ -8,42 +8,37 @@
// ************************************************************************** //
#include "test_utils.h"
+#include "mvvm/utils/fileutils.h"
#include "testconfig.h" // this file is auto generated by the build system in build directory
#include <QFile>
#include <QString>
#include <QTextStream>
-#include "mvvm/utils/fileutils.h"
#include <stdexcept>
#include <string>
using namespace ModelView;
-std::string TestUtils::TestOutputDir()
-{
+std::string TestUtils::TestOutputDir() {
return TestConfig::TestOutputDir(); // defined in auto-generated testconfig.h
}
-std::string TestUtils::CreateTestDirectory(const std::string& test_sub_dir)
-{
+std::string TestUtils::CreateTestDirectory(const std::string& test_sub_dir) {
std::string result = TestDirectoryPath(test_sub_dir);
Utils::create_directory(result);
return result;
}
-std::string TestUtils::TestDirectoryPath(const std::string& test_sub_dir)
-{
+std::string TestUtils::TestDirectoryPath(const std::string& test_sub_dir) {
return TestOutputDir() + std::string("/") + test_sub_dir;
}
-std::string TestUtils::TestFileName(const std::string& test_sub_dir, const std::string& file_name)
-{
+std::string TestUtils::TestFileName(const std::string& test_sub_dir, const std::string& file_name) {
return TestDirectoryPath(test_sub_dir) + std::string("/") + file_name;
}
std::string TestUtils::CreateTestFile(const std::string& dirname, const std::string& fileName,
- const std::string& content)
-{
+ const std::string& content) {
std::string filename = dirname.empty() ? fileName : dirname + "/" + fileName;
QFile file(QString::fromStdString(filename));
@@ -61,8 +56,7 @@ std::string TestUtils::CreateTestFile(const std::string& dirname, const std::str
return filename;
}
-std::string TestUtils::CreateEmptyFile(const std::string& dirname, const std::string& fileName)
-{
+std::string TestUtils::CreateEmptyFile(const std::string& dirname, const std::string& fileName) {
std::string filename = dirname.empty() ? fileName : dirname + "/" + fileName;
QFile file(QString::fromStdString(filename));
diff --git a/Tests/UnitTests/gui2/libtestmachinery/test_utils.h b/Tests/UnitTests/gui2/libtestmachinery/test_utils.h
index ac0ccf2ba52..bf48c70799a 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/test_utils.h
+++ b/Tests/UnitTests/gui2/libtestmachinery/test_utils.h
@@ -10,9 +10,9 @@
#ifndef TESTUTILS_H
#define TESTUTILS_H
+#include "mvvm/model/customvariants.h"
#include <QString>
#include <memory>
-#include "mvvm/model/customvariants.h"
//! @file test_utils.h
//! @brief Collection of utility functions for various unit tests.
@@ -20,15 +20,13 @@
class QJsonObject;
class QJsonArray;
-namespace ModelView
-{
+namespace ModelView {
class SessionModel;
}
//! Various common utils for unit tests.
-namespace TestUtils
-{
+namespace TestUtils {
//! Returns full path to the main test folder, as defined by CMake at compile time.
//! Shoud point to CMAKE_BINARY_DIR/test_output
@@ -54,8 +52,7 @@ std::string CreateTestFile(const std::string& dirname, const std::string& fileNa
std::string CreateEmptyFile(const std::string& dirname, const std::string& fileName);
template <typename T = std::string, typename... Args>
-std::vector<T> toStringVector(Args&&... args)
-{
+std::vector<T> toStringVector(Args&&... args) {
std::vector<T> v;
(v.push_back(std::string(args)), ...);
return v;
diff --git a/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp b/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp
index 46ab6bc12b8..3dd8ac213d3 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp
+++ b/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.cpp
@@ -12,8 +12,7 @@
QApplication* WidgetBasedTest::m_app = nullptr;
-namespace
-{
+namespace {
// faking argc and argv
char progname[] = "testview";
char* argv[] = {&progname[0], nullptr};
@@ -22,13 +21,11 @@ int argc = 1;
WidgetBasedTest::WidgetBasedTest() {}
-void WidgetBasedTest::SetUpTestSuite()
-{
+void WidgetBasedTest::SetUpTestSuite() {
m_app = new QApplication(argc, argv);
}
-void WidgetBasedTest::TearDownTestSuite()
-{
+void WidgetBasedTest::TearDownTestSuite() {
delete m_app;
m_app = 0;
}
diff --git a/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h b/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h
index 60b02dc575a..dc7fe2103bd 100644
--- a/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h
+++ b/Tests/UnitTests/gui2/libtestmachinery/widgetbasedtest.h
@@ -16,8 +16,7 @@ class QApplication;
//! Convenience class to setup QApplication for tests involving QWidget creation.
-class WidgetBasedTest : public ::testing::Test
-{
+class WidgetBasedTest : public ::testing::Test {
public:
WidgetBasedTest();
diff --git a/Tests/UnitTests/gui2/testdareflcore/TestAll.cpp b/Tests/UnitTests/gui2/testdareflcore/TestAll.cpp
index 6e00903ef61..adc5870aa2f 100644
--- a/Tests/UnitTests/gui2/testdareflcore/TestAll.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/TestAll.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "google_test.h"
+#include "mvvm/model/comparators.h"
#include <QApplication>
#include <QStandardItem>
-#include "mvvm/model/comparators.h"
#include <string>
int main(int argc, char** argv) {
diff --git a/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp b/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
index 55bc755ef76..634664c0642 100644
--- a/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "folderbasedtest.h"
-#include "test_utils.h"
#include "gui2/dataloader/datahandler.h"
#include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
using TestUtils::toStringVector;
using namespace DaRefl;
diff --git a/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp b/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
index c3ee09bb9e3..5343890388f 100644
--- a/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
@@ -8,10 +8,10 @@
// ************************************************************************** //
#include "folderbasedtest.h"
-#include "test_utils.h"
#include "gui2/dataloader/dataloader_constants.h"
#include "gui2/dataloader/dataloader_utils.h"
#include "gui2/importdataview/graphimportdata.h"
+#include "test_utils.h"
#include <initializer_list>
#include <vector>
diff --git a/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
index 9d5a3e3b823..fcb299e6372 100644
--- a/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
@@ -8,14 +8,14 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
-#include <QDebug>
#include "gui2/importdataview/dataselectionmodel.h"
#include "gui2/importdataview/dataviewmodel.h"
#include "gui2/model/experimentaldataitems.h"
#include "gui2/model/experimentaldatamodel.h"
#include "mvvm/model/modelutils.h"
#include "mvvm/standarditems/graphitem.h"
+#include "test_utils.h"
+#include <QDebug>
using namespace DaRefl;
using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp b/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
index b4a77c2e9e3..0afddc9aafe 100644
--- a/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "gui2/dataloader/dataloader_types.h"
#include "gui2/dataloader/defaultparser.h"
+#include "test_utils.h"
using namespace DaRefl;
using TestUtils::toStringVector;
diff --git a/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp b/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
index 36b6e7b8b7f..96b0edc3201 100644
--- a/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
@@ -8,7 +8,6 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "gui2/importdataview/dataselectionmodel.h"
#include "gui2/importdataview/dataviewmodel.h"
#include "gui2/importdataview/graphimportdata.h"
@@ -19,6 +18,7 @@
#include "mvvm/model/modelutils.h"
#include "mvvm/standarditems/graphitem.h"
#include "mvvm/standarditems/plottableitems.h"
+#include "test_utils.h"
using namespace DaRefl;
using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp b/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
index 4931c593678..7cca2633cb4 100644
--- a/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
@@ -8,11 +8,11 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "gui2/dataloader/dataloader_constants.h"
#include "gui2/dataloader/dataloader_types.h"
#include "gui2/dataloader/importtableheader.h"
#include "mvvm/model/comboproperty.h"
+#include "test_utils.h"
using namespace DaRefl;
diff --git a/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
index 1caff388ff8..c6db07a6c57 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
@@ -8,8 +8,6 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
-#include <QDebug>
#include "gui2/layereditor/layereditoractions.h"
#include "gui2/layereditor/layerselectionmodel.h"
#include "gui2/layereditor/layerviewmodel.h"
@@ -18,6 +16,8 @@
#include "gui2/model/samplemodel.h"
#include "mvvm/viewmodel/standardviewitems.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include "test_utils.h"
+#include <QDebug>
using namespace DaRefl;
using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
index eaaa037b9b2..c09b9073730 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
@@ -9,7 +9,6 @@
#include "google_test.h"
-#include "test_utils.h"
#include "gui2/model/materialmodel.h"
#include "gui2/model/samplemodel.h"
#include "gui2/sldeditor/graphicsscene.h"
@@ -20,6 +19,7 @@
#include "gui2/sldeditor/segmentelementview.h"
#include "gui2/sldeditor/sldelementmodel.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include "test_utils.h"
#include <QColor>
#include <QGraphicsSceneMouseEvent>
diff --git a/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
index ac46cbedd6e..3711acc1f22 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "gui2/model/sampleitems.h"
#include "gui2/model/samplemodel.h"
+#include "test_utils.h"
using namespace DaRefl;
using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
index 7c69289b980..edf2107ffb3 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
@@ -8,12 +8,12 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "gui2/layereditor/layerselectionmodel.h"
#include "gui2/layereditor/layerviewmodel.h"
#include "gui2/model/sampleitems.h"
#include "gui2/model/samplemodel.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include "test_utils.h"
using namespace DaRefl;
using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
index e207c9a9dae..82d2664d452 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
@@ -8,12 +8,12 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
-#include <QSignalSpy>
#include "gui2/layereditor/layerviewmodel.h"
#include "gui2/model/sampleitems.h"
#include "gui2/model/samplemodel.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include "test_utils.h"
+#include <QSignalSpy>
using namespace DaRefl;
using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp b/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
index c4558635b30..9419b7be645 100644
--- a/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
@@ -8,7 +8,6 @@
// ************************************************************************** //
#include "google_test.h"
-#include <QColor>
#include "gui2/model/materialitems.h"
#include "gui2/model/materialmodel.h"
#include "gui2/model/sampleitems.h"
@@ -16,6 +15,7 @@
#include "gui2/quicksimeditor/quicksimutils.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/model/itempool.h"
+#include <QColor>
#include <tuple>
using namespace DaRefl;
diff --git a/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp b/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
index 20669c61cfa..b394803b27b 100644
--- a/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
@@ -9,8 +9,6 @@
#include "google_test.h"
-#include "test_utils.h"
-#include <QGraphicsScene>
#include "gui2/model/materialmodel.h"
#include "gui2/model/sampleitems.h"
#include "gui2/model/samplemodel.h"
@@ -18,6 +16,8 @@
#include "gui2/sldeditor/layerelementcontroller.h"
#include "gui2/sldeditor/sldelementcontroller.cpp"
#include "gui2/sldeditor/sldelementmodel.h"
+#include "test_utils.h"
+#include <QGraphicsScene>
using namespace DaRefl;
using namespace ModelView;
diff --git a/gui2/core/app_constants.h b/gui2/core/app_constants.h
index 512570d5d6a..5c6a06d95dc 100644
--- a/gui2/core/app_constants.h
+++ b/gui2/core/app_constants.h
@@ -12,8 +12,7 @@
#include <QString>
-namespace DaRefl::Constants
-{
+namespace DaRefl::Constants {
//! Constants for QSettings.
diff --git a/gui2/core/version.h b/gui2/core/version.h
index d4c3a476310..95091f2bc5d 100644
--- a/gui2/core/version.h
+++ b/gui2/core/version.h
@@ -15,33 +15,28 @@
#include <string>
-namespace DaRefl
-{
+namespace DaRefl {
//! Returns major project version.
-inline int ProjectVersionMajor()
-{
+inline int ProjectVersionMajor() {
const int project_version_major = 0;
return project_version_major;
}
//! Returns minor project version.
-inline int ProjectVersionMinor()
-{
+inline int ProjectVersionMinor() {
const int project_version_minor = 1;
return project_version_minor;
}
//! Returns patch project version.
-inline int ProjectVersionPatch()
-{
+inline int ProjectVersionPatch() {
const int project_version_path = 0;
return project_version_path;
}
//! Returns project version string
-inline std::string ProjectVersion()
-{
+inline std::string ProjectVersion() {
const std::string project_version = "0.1.0";
return project_version;
}
diff --git a/gui2/dataloader/datahandler.cpp b/gui2/dataloader/datahandler.cpp
index 777fb9e31a8..8abfa71106a 100644
--- a/gui2/dataloader/datahandler.cpp
+++ b/gui2/dataloader/datahandler.cpp
@@ -9,8 +9,8 @@
#include "gui2/dataloader/datahandler.h"
#include "gui2/dataloader/dataloader_utils.h"
-#include <iostream>
#include "mvvm/utils/containerutils.h"
+#include <iostream>
namespace DaRefl {
diff --git a/gui2/dataloader/dataloader_utils.cpp b/gui2/dataloader/dataloader_utils.cpp
index fc26a6a4160..93bb0381643 100644
--- a/gui2/dataloader/dataloader_utils.cpp
+++ b/gui2/dataloader/dataloader_utils.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
-#include <algorithm>
-#include "gui2/dataloader/dataloader_constants.h"
#include "gui2/dataloader/dataloader_utils.h"
+#include "gui2/dataloader/dataloader_constants.h"
#include "gui2/importdataview/graphimportdata.h"
-#include <fstream>
#include "mvvm/utils/stringutils.h"
+#include <algorithm>
+#include <fstream>
namespace DaRefl {
diff --git a/gui2/dataloader/dataloaderdialog.cpp b/gui2/dataloader/dataloaderdialog.cpp
index 1fffbc3e866..02fdea9e6be 100644
--- a/gui2/dataloader/dataloaderdialog.cpp
+++ b/gui2/dataloader/dataloaderdialog.cpp
@@ -7,26 +7,26 @@
//
// ************************************************************************** //
-#include <QApplication>
-#include <QDebug>
-#include <QDialogButtonBox>
-#include <QKeyEvent>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QSettings>
-#include <QSplitter>
-#include <QVBoxLayout>
+#include "gui2/dataloader/dataloaderdialog.h"
#include "gui2/core/app_constants.h"
#include "gui2/dataloader/datahandler.h"
#include "gui2/dataloader/dataloader_types.h"
#include "gui2/dataloader/dataloader_utils.h"
-#include "gui2/dataloader/dataloaderdialog.h"
#include "gui2/dataloader/dataloadertoolbar.h"
#include "gui2/dataloader/loaderpreviewpanel.h"
#include "gui2/dataloader/loaderselectorpanel.h"
#include "gui2/dataloader/parserinterface.h"
#include "mvvm/utils/fileutils.h"
#include "mvvm/widgets/widgetutils.h"
+#include <QApplication>
+#include <QDebug>
+#include <QDialogButtonBox>
+#include <QKeyEvent>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QSettings>
+#include <QSplitter>
+#include <QVBoxLayout>
#include <sstream>
namespace DaRefl {
diff --git a/gui2/dataloader/dataloaderdialog.h b/gui2/dataloader/dataloaderdialog.h
index 69d7f0922ab..3b22cde93f7 100644
--- a/gui2/dataloader/dataloaderdialog.h
+++ b/gui2/dataloader/dataloaderdialog.h
@@ -10,9 +10,9 @@
#ifndef DAREFL_DATALOADER_DATALOADERDIALOG_H
#define DAREFL_DATALOADER_DATALOADERDIALOG_H
-#include <QDialog>
#include "darefl_export.h"
#include "gui2/importdataview/graphimportdata.h"
+#include <QDialog>
#include <memory>
#include <vector>
diff --git a/gui2/dataloader/dataloadertoolbar.cpp b/gui2/dataloader/dataloadertoolbar.cpp
index 1ed5586d62b..3da2e839a93 100644
--- a/gui2/dataloader/dataloadertoolbar.cpp
+++ b/gui2/dataloader/dataloadertoolbar.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include <QAction>
#include "gui2/dataloader/dataloadertoolbar.h"
#include "gui2/mainwindow/styleutils.h"
+#include <QAction>
namespace DaRefl {
diff --git a/gui2/dataloader/dataloadertoolbar.h b/gui2/dataloader/dataloadertoolbar.h
index 4dfb09ee7f0..39fea9fbbae 100644
--- a/gui2/dataloader/dataloadertoolbar.h
+++ b/gui2/dataloader/dataloadertoolbar.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_DATALOADER_DATALOADERTOOLBAR_H
#define DAREFL_DATALOADER_DATALOADERTOOLBAR_H
-#include <QToolBar>
#include "darefl_export.h"
+#include <QToolBar>
namespace DaRefl {
diff --git a/gui2/dataloader/defaultparser.cpp b/gui2/dataloader/defaultparser.cpp
index 663ef622f7d..4ac5eace6ed 100644
--- a/gui2/dataloader/defaultparser.cpp
+++ b/gui2/dataloader/defaultparser.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "gui2/dataloader/dataloader_utils.h"
#include "gui2/dataloader/defaultparser.h"
+#include "gui2/dataloader/dataloader_utils.h"
#include <stdexcept>
namespace DaRefl {
diff --git a/gui2/dataloader/importfilewidget.cpp b/gui2/dataloader/importfilewidget.cpp
index 1eef932064f..5179448b167 100644
--- a/gui2/dataloader/importfilewidget.cpp
+++ b/gui2/dataloader/importfilewidget.cpp
@@ -7,6 +7,10 @@
//
// ************************************************************************** //
+#include "gui2/dataloader/importfilewidget.h"
+#include "gui2/core/app_constants.h"
+#include "mvvm/utils/binutils.h"
+#include "mvvm/utils/fileutils.h"
#include <QFileDialog>
#include <QItemSelectionModel>
#include <QListView>
@@ -14,10 +18,6 @@
#include <QSettings>
#include <QStringListModel>
#include <QVBoxLayout>
-#include "gui2/core/app_constants.h"
-#include "gui2/dataloader/importfilewidget.h"
-#include "mvvm/utils/binutils.h"
-#include "mvvm/utils/fileutils.h"
namespace DaRefl {
diff --git a/gui2/dataloader/importfilewidget.h b/gui2/dataloader/importfilewidget.h
index f2262d68cb1..4867228b297 100644
--- a/gui2/dataloader/importfilewidget.h
+++ b/gui2/dataloader/importfilewidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_DATALOADER_IMPORTFILEWIDGET_H
#define DAREFL_DATALOADER_IMPORTFILEWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
class QListView;
class QStringListModel;
diff --git a/gui2/dataloader/importtableheader.cpp b/gui2/dataloader/importtableheader.cpp
index f00a96d47b7..bbc660982ef 100644
--- a/gui2/dataloader/importtableheader.cpp
+++ b/gui2/dataloader/importtableheader.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "gui2/dataloader/importtableheader.h"
#include "gui2/dataloader/dataloader_constants.h"
#include "gui2/dataloader/dataloader_types.h"
-#include "gui2/dataloader/importtableheader.h"
#include "mvvm/model/comboproperty.h"
using ModelView::ComboProperty;
diff --git a/gui2/dataloader/importtableheader.h b/gui2/dataloader/importtableheader.h
index 5b28dff197e..393b8fabac0 100644
--- a/gui2/dataloader/importtableheader.h
+++ b/gui2/dataloader/importtableheader.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_DATALOADER_IMPORTTABLEHEADER_H
#define DAREFL_DATALOADER_IMPORTTABLEHEADER_H
-#include <QVariant>
#include "darefl_export.h"
+#include <QVariant>
#include <vector>
namespace DaRefl {
diff --git a/gui2/dataloader/importtablemodel.cpp b/gui2/dataloader/importtablemodel.cpp
index d37717ff29c..da8f8eb77d4 100644
--- a/gui2/dataloader/importtablemodel.cpp
+++ b/gui2/dataloader/importtablemodel.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QBrush>
+#include "gui2/dataloader/importtablemodel.h"
#include "gui2/dataloader/dataloader_types.h"
#include "gui2/dataloader/importtableheader.h"
-#include "gui2/dataloader/importtablemodel.h"
+#include <QBrush>
namespace DaRefl {
diff --git a/gui2/dataloader/importtablemodel.h b/gui2/dataloader/importtablemodel.h
index 0e32f5d335b..df0eece90cf 100644
--- a/gui2/dataloader/importtablemodel.h
+++ b/gui2/dataloader/importtablemodel.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_DATALOADER_IMPORTTABLEMODEL_H
#define DAREFL_DATALOADER_IMPORTTABLEMODEL_H
-#include <QAbstractTableModel>
#include "darefl_export.h"
+#include <QAbstractTableModel>
#include <memory>
#include <string>
#include <vector>
diff --git a/gui2/dataloader/importtablewidget.cpp b/gui2/dataloader/importtablewidget.cpp
index b9368f7555a..095b4a764d9 100644
--- a/gui2/dataloader/importtablewidget.cpp
+++ b/gui2/dataloader/importtablewidget.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include <QStandardItemModel>
-#include <QTableView>
-#include <QVBoxLayout>
+#include "gui2/dataloader/importtablewidget.h"
#include "gui2/dataloader/dataloader_types.h"
#include "gui2/dataloader/importtablemodel.h"
-#include "gui2/dataloader/importtablewidget.h"
#include "mvvm/viewmodel/viewmodeldelegate.h"
+#include <QStandardItemModel>
+#include <QTableView>
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/dataloader/importtablewidget.h b/gui2/dataloader/importtablewidget.h
index 6c7a5993cc3..41be7c98588 100644
--- a/gui2/dataloader/importtablewidget.h
+++ b/gui2/dataloader/importtablewidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_DATALOADER_IMPORTTABLEWIDGET_H
#define DAREFL_DATALOADER_IMPORTTABLEWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
#include <memory>
#include <string>
#include <vector>
diff --git a/gui2/dataloader/loaderpreviewpanel.cpp b/gui2/dataloader/loaderpreviewpanel.cpp
index ffaaf994411..347495eb260 100644
--- a/gui2/dataloader/loaderpreviewpanel.cpp
+++ b/gui2/dataloader/loaderpreviewpanel.cpp
@@ -7,14 +7,14 @@
//
// ************************************************************************** //
-#include <QColor>
-#include <QTabWidget>
-#include <QVBoxLayout>
+#include "gui2/dataloader/loaderpreviewpanel.h"
#include "gui2/dataloader/dataloader_utils.h"
#include "gui2/dataloader/importtablewidget.h"
#include "gui2/dataloader/importtextview.h"
-#include "gui2/dataloader/loaderpreviewpanel.h"
#include "gui2/dataloader/parserinterface.h"
+#include <QColor>
+#include <QTabWidget>
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/dataloader/loaderpreviewpanel.h b/gui2/dataloader/loaderpreviewpanel.h
index bad8798cc81..f51ea6abe5f 100644
--- a/gui2/dataloader/loaderpreviewpanel.h
+++ b/gui2/dataloader/loaderpreviewpanel.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_DATALOADER_LOADERPREVIEWPANEL_H
#define DAREFL_DATALOADER_LOADERPREVIEWPANEL_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
class ImportTextView;
class ImportTableWidget;
diff --git a/gui2/dataloader/loaderselectorpanel.cpp b/gui2/dataloader/loaderselectorpanel.cpp
index b4d3b18e57a..96d14d2376d 100644
--- a/gui2/dataloader/loaderselectorpanel.cpp
+++ b/gui2/dataloader/loaderselectorpanel.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
-#include <QSplitter>
-#include <QVBoxLayout>
+#include "gui2/dataloader/loaderselectorpanel.h"
#include "gui2/dataloader/defaultparser.h"
#include "gui2/dataloader/importfilewidget.h"
-#include "gui2/dataloader/loaderselectorpanel.h"
#include "gui2/dataloader/parserpropertywidget.h"
+#include <QSplitter>
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/dataloader/loaderselectorpanel.h b/gui2/dataloader/loaderselectorpanel.h
index 856db89edd7..c35faed67d1 100644
--- a/gui2/dataloader/loaderselectorpanel.h
+++ b/gui2/dataloader/loaderselectorpanel.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_DATALOADER_LOADERSELECTORPANEL_H
#define DAREFL_DATALOADER_LOADERSELECTORPANEL_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
#include <memory>
class QSplitter;
diff --git a/gui2/dataloader/parserpropertywidget.cpp b/gui2/dataloader/parserpropertywidget.cpp
index 1cb718885b7..0ffaf31d02f 100644
--- a/gui2/dataloader/parserpropertywidget.cpp
+++ b/gui2/dataloader/parserpropertywidget.cpp
@@ -7,6 +7,10 @@
//
// ************************************************************************** //
+#include "gui2/dataloader/parserpropertywidget.h"
+#include "gui2/core/app_constants.h"
+#include "gui2/dataloader/defaultparser.h"
+#include "mvvm/widgets/widgetutils.h"
#include <QButtonGroup>
#include <QComboBox>
#include <QDebug>
@@ -18,10 +22,6 @@
#include <QRegExpValidator>
#include <QSettings>
#include <QVBoxLayout>
-#include "gui2/core/app_constants.h"
-#include "gui2/dataloader/defaultparser.h"
-#include "gui2/dataloader/parserpropertywidget.h"
-#include "mvvm/widgets/widgetutils.h"
namespace {
diff --git a/gui2/dataloader/parserpropertywidget.h b/gui2/dataloader/parserpropertywidget.h
index 1189752047b..76d25e5c068 100644
--- a/gui2/dataloader/parserpropertywidget.h
+++ b/gui2/dataloader/parserpropertywidget.h
@@ -10,9 +10,9 @@
#ifndef DAREFL_DATALOADER_PARSERPROPERTYWIDGET_H
#define DAREFL_DATALOADER_PARSERPROPERTYWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
#include "gui2/dataloader/dataloader_types.h"
+#include <QWidget>
#include <memory>
class QGridLayout;
diff --git a/gui2/importdataview/dataselectionmodel.h b/gui2/importdataview/dataselectionmodel.h
index 451a4e76ab7..e1a36f5be94 100644
--- a/gui2/importdataview/dataselectionmodel.h
+++ b/gui2/importdataview/dataselectionmodel.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_IMPORTDATAVIEW_DATASELECTIONMODEL_H
#define DAREFL_IMPORTDATAVIEW_DATASELECTIONMODEL_H
-#include <QItemSelectionModel>
#include "darefl_export.h"
+#include <QItemSelectionModel>
#include <vector>
namespace ModelView {
diff --git a/gui2/importdataview/dataselectorwidget.cpp b/gui2/importdataview/dataselectorwidget.cpp
index 4634b74b59c..d9208e9e284 100644
--- a/gui2/importdataview/dataselectorwidget.cpp
+++ b/gui2/importdataview/dataselectorwidget.cpp
@@ -7,19 +7,19 @@
//
// ************************************************************************** //
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSplitter>
-#include <QTreeView>
-#include <QVBoxLayout>
-#include "gui2/importdataview/dataselectionmodel.h"
#include "gui2/importdataview/dataselectorwidget.h"
+#include "gui2/importdataview/dataselectionmodel.h"
#include "gui2/importdataview/dataviewmodel.h"
#include "gui2/model/experimentaldataitems.h"
#include "mvvm/standarditems/graphitem.h"
#include "mvvm/widgets/collapsiblelistwidget.h"
#include "mvvm/widgets/standardtreeviews.h"
#include "mvvm/widgets/widgetutils.h"
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSplitter>
+#include <QTreeView>
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/importdataview/dataselectorwidget.h b/gui2/importdataview/dataselectorwidget.h
index c7f0df1e7fa..c6ddce2aaf5 100644
--- a/gui2/importdataview/dataselectorwidget.h
+++ b/gui2/importdataview/dataselectorwidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_IMPORTDATAVIEW_DATASELECTORWIDGET_H
#define DAREFL_IMPORTDATAVIEW_DATASELECTORWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
class QTreeView;
diff --git a/gui2/importdataview/dataviewmodel.cpp b/gui2/importdataview/dataviewmodel.cpp
index 4d45bd864bb..4441499052c 100644
--- a/gui2/importdataview/dataviewmodel.cpp
+++ b/gui2/importdataview/dataviewmodel.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include <QByteArray>
-#include <QDataStream>
-#include <QMimeData>
#include "gui2/importdataview/dataviewmodel.h"
#include "gui2/model/experimentaldatamodel.h"
#include "gui2/model/item_constants.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/viewmodel/viewmodelutils.h"
#include "mvvm/widgets/widgetutils.h"
+#include <QByteArray>
+#include <QDataStream>
+#include <QMimeData>
using namespace ModelView;
diff --git a/gui2/importdataview/graphcanvaswidget.cpp b/gui2/importdataview/graphcanvaswidget.cpp
index c3a96fe0f73..6361de8b8d6 100644
--- a/gui2/importdataview/graphcanvaswidget.cpp
+++ b/gui2/importdataview/graphcanvaswidget.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
#include "gui2/importdataview/graphcanvaswidget.h"
#include "gui2/model/experimentaldataitems.h"
#include "mvvm/plotting/graphcanvas.h"
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/importdataview/graphcanvaswidget.h b/gui2/importdataview/graphcanvaswidget.h
index 6fd60d2f4ab..6f1bbb999f5 100644
--- a/gui2/importdataview/graphcanvaswidget.h
+++ b/gui2/importdataview/graphcanvaswidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_IMPORTDATAVIEW_GRAPHCANVASWIDGET_H
#define DAREFL_IMPORTDATAVIEW_GRAPHCANVASWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
namespace ModelView {
class GraphCanvas;
diff --git a/gui2/importdataview/importdataeditor.cpp b/gui2/importdataview/importdataeditor.cpp
index 9c70b1f6e0d..bc1d2004b7d 100644
--- a/gui2/importdataview/importdataeditor.cpp
+++ b/gui2/importdataview/importdataeditor.cpp
@@ -7,20 +7,20 @@
//
// ************************************************************************** //
-#include <QSplitter>
-#include <QVBoxLayout>
+#include "gui2/importdataview/importdataeditor.h"
#include "gui2/dataloader/dataloaderdialog.h"
#include "gui2/importdataview/dataselectionmodel.h"
#include "gui2/importdataview/dataselectorwidget.h"
#include "gui2/importdataview/dataviewmodel.h"
#include "gui2/importdataview/graphcanvaswidget.h"
-#include "gui2/importdataview/importdataeditor.h"
#include "gui2/importdataview/importdataeditoractions.h"
#include "gui2/importdataview/importdataeditortoolbal.h"
#include "gui2/model/experimentaldataitems.h"
#include "gui2/model/experimentaldatamodel.h"
#include "mvvm/model/modelutils.h"
#include "mvvm/utils/containerutils.h"
+#include <QSplitter>
+#include <QVBoxLayout>
using namespace ModelView;
diff --git a/gui2/importdataview/importdataeditor.h b/gui2/importdataview/importdataeditor.h
index 89125eeeeb5..bbe427cfe63 100644
--- a/gui2/importdataview/importdataeditor.h
+++ b/gui2/importdataview/importdataeditor.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITOR_H
#define DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITOR_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
#include <string>
namespace DaRefl {
diff --git a/gui2/importdataview/importdataeditoractions.cpp b/gui2/importdataview/importdataeditoractions.cpp
index 3de9ddc3560..defe0efe69b 100644
--- a/gui2/importdataview/importdataeditoractions.cpp
+++ b/gui2/importdataview/importdataeditoractions.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "gui2/importdataview/importdataeditoractions.h"
#include "gui2/importdataview/dataselectionmodel.h"
#include "gui2/importdataview/graphimportdata.h"
-#include "gui2/importdataview/importdataeditoractions.h"
#include "gui2/model/experimentaldataitems.h"
#include "gui2/model/experimentaldatamodel.h"
#include "mvvm/interfaces/undostackinterface.h"
diff --git a/gui2/importdataview/importdataeditoractions.h b/gui2/importdataview/importdataeditoractions.h
index b5ac96e83f7..c15a70fedda 100644
--- a/gui2/importdataview/importdataeditoractions.h
+++ b/gui2/importdataview/importdataeditoractions.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITORACTIONS_H
#define DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITORACTIONS_H
-#include <QObject>
#include "darefl_export.h"
+#include <QObject>
class QItemSelection;
diff --git a/gui2/importdataview/importdataeditortoolbal.cpp b/gui2/importdataview/importdataeditortoolbal.cpp
index 96234ae5440..3a1f694c6de 100644
--- a/gui2/importdataview/importdataeditortoolbal.cpp
+++ b/gui2/importdataview/importdataeditortoolbal.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QAction>
-#include "gui2/importdataview/importdataeditoractions.h"
#include "gui2/importdataview/importdataeditortoolbal.h"
+#include "gui2/importdataview/importdataeditoractions.h"
#include "gui2/mainwindow/styleutils.h"
+#include <QAction>
namespace DaRefl {
diff --git a/gui2/importdataview/importdataeditortoolbal.h b/gui2/importdataview/importdataeditortoolbal.h
index 54ca32dd1f0..ef22864d9d0 100644
--- a/gui2/importdataview/importdataeditortoolbal.h
+++ b/gui2/importdataview/importdataeditortoolbal.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITORTOOLBAL_H
#define DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITORTOOLBAL_H
-#include <QToolBar>
#include "darefl_export.h"
+#include <QToolBar>
namespace DaRefl {
diff --git a/gui2/importdataview/importdataview.cpp b/gui2/importdataview/importdataview.cpp
index 1c44c22dbcb..ca188a7df48 100644
--- a/gui2/importdataview/importdataview.cpp
+++ b/gui2/importdataview/importdataview.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
-#include "gui2/importdataview/importdataeditor.h"
#include "gui2/importdataview/importdataview.h"
+#include "gui2/importdataview/importdataeditor.h"
#include "gui2/model/applicationmodels.h"
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/importdataview/importdataview.h b/gui2/importdataview/importdataview.h
index 0a892ce8e40..4a4e471104d 100644
--- a/gui2/importdataview/importdataview.h
+++ b/gui2/importdataview/importdataview.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_IMPORTDATAVIEW_IMPORTDATAVIEW_H
#define DAREFL_IMPORTDATAVIEW_IMPORTDATAVIEW_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
namespace DaRefl {
diff --git a/gui2/layereditor/customlayertreeeditorfactory.cpp b/gui2/layereditor/customlayertreeeditorfactory.cpp
index 176b5bc437d..7ec4d2aaaa2 100644
--- a/gui2/layereditor/customlayertreeeditorfactory.cpp
+++ b/gui2/layereditor/customlayertreeeditorfactory.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include <QModelIndex>
-#include <algorithm>
#include "gui2/layereditor/customlayertreeeditorfactory.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/model/materialmodel.h"
#include "mvvm/editors/externalpropertycomboeditor.h"
#include "mvvm/model/externalproperty.h"
+#include <QModelIndex>
+#include <algorithm>
using namespace ModelView;
diff --git a/gui2/layereditor/layereditor.cpp b/gui2/layereditor/layereditor.cpp
index 63c3941e6ff..80cd76cbd21 100644
--- a/gui2/layereditor/layereditor.cpp
+++ b/gui2/layereditor/layereditor.cpp
@@ -7,7 +7,6 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
#include "gui2/layereditor/layereditor.h"
#include "gui2/layereditor/layereditoractions.h"
#include "gui2/layereditor/layereditortoolbar.h"
@@ -15,6 +14,7 @@
#include "gui2/layereditor/layerselectionmodel.h"
#include "gui2/mainwindow/styleutils.h"
#include "gui2/model/applicationmodels.h"
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/layereditor/layereditor.h b/gui2/layereditor/layereditor.h
index 89edd266781..7abd736af3a 100644
--- a/gui2/layereditor/layereditor.h
+++ b/gui2/layereditor/layereditor.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_LAYEREDITOR_LAYEREDITOR_H
#define DAREFL_LAYEREDITOR_LAYEREDITOR_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
namespace ModelView {
class AbstractViewModel;
diff --git a/gui2/layereditor/layereditoractions.cpp b/gui2/layereditor/layereditoractions.cpp
index 554d583bbbc..06a1dcf5be1 100644
--- a/gui2/layereditor/layereditoractions.cpp
+++ b/gui2/layereditor/layereditoractions.cpp
@@ -7,7 +7,6 @@
//
// ************************************************************************** //
-#include <QAction>
#include "gui2/layereditor/layereditoractions.h"
#include "gui2/layereditor/layerselectionmodel.h"
#include "gui2/model/item_constants.h"
@@ -16,6 +15,7 @@
#include "mvvm/model/itemutils.h"
#include "mvvm/model/modelutils.h"
#include "mvvm/viewmodel/viewmodel.h"
+#include <QAction>
using namespace ModelView;
diff --git a/gui2/layereditor/layereditoractions.h b/gui2/layereditor/layereditoractions.h
index a5c480296a1..a23d2c8f89e 100644
--- a/gui2/layereditor/layereditoractions.h
+++ b/gui2/layereditor/layereditoractions.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_LAYEREDITOR_LAYEREDITORACTIONS_H
#define DAREFL_LAYEREDITOR_LAYEREDITORACTIONS_H
-#include <QObject>
#include "darefl_export.h"
+#include <QObject>
#include <memory>
namespace DaRefl {
diff --git a/gui2/layereditor/layereditortoolbar.cpp b/gui2/layereditor/layereditortoolbar.cpp
index 5b3a243f239..24f177823e5 100644
--- a/gui2/layereditor/layereditortoolbar.cpp
+++ b/gui2/layereditor/layereditortoolbar.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
+#include "gui2/layereditor/layereditortoolbar.h"
+#include "gui2/layereditor/layereditoractions.h"
+#include "gui2/mainwindow/styleutils.h"
#include <QAction>
#include <QMenu>
#include <QToolButton>
-#include "gui2/layereditor/layereditoractions.h"
-#include "gui2/layereditor/layereditortoolbar.h"
-#include "gui2/mainwindow/styleutils.h"
namespace DaRefl {
diff --git a/gui2/layereditor/layereditortoolbar.h b/gui2/layereditor/layereditortoolbar.h
index a7e064f491d..0ccc4a1a404 100644
--- a/gui2/layereditor/layereditortoolbar.h
+++ b/gui2/layereditor/layereditortoolbar.h
@@ -10,9 +10,9 @@
#ifndef DAREFL_LAYEREDITOR_LAYEREDITORTOOLBAR_H
#define DAREFL_LAYEREDITOR_LAYEREDITORTOOLBAR_H
+#include "darefl_export.h"
#include <QToolBar>
#include <QWidget>
-#include "darefl_export.h"
#include <map>
#include <string>
diff --git a/gui2/layereditor/layereditorwidget.cpp b/gui2/layereditor/layereditorwidget.cpp
index 4cce0932c49..d37a6dd6fde 100644
--- a/gui2/layereditor/layereditorwidget.cpp
+++ b/gui2/layereditor/layereditorwidget.cpp
@@ -7,9 +7,8 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
-#include "gui2/layereditor/customlayertreeeditorfactory.h"
#include "gui2/layereditor/layereditorwidget.h"
+#include "gui2/layereditor/customlayertreeeditorfactory.h"
#include "gui2/layereditor/layerselectionmodel.h"
#include "gui2/layereditor/layertreeview.h"
#include "gui2/layereditor/layerviewmodel.h"
@@ -17,6 +16,7 @@
#include "gui2/model/sampleitems.h"
#include "gui2/model/samplemodel.h"
#include "mvvm/viewmodel/viewmodeldelegate.h"
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/layereditor/layereditorwidget.h b/gui2/layereditor/layereditorwidget.h
index 8c4e73de179..39267b1298b 100644
--- a/gui2/layereditor/layereditorwidget.h
+++ b/gui2/layereditor/layereditorwidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_LAYEREDITOR_LAYEREDITORWIDGET_H
#define DAREFL_LAYEREDITOR_LAYEREDITORWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
#include <memory>
namespace ModelView {
diff --git a/gui2/layereditor/layerselectionmodel.cpp b/gui2/layereditor/layerselectionmodel.cpp
index 7d4954a4508..1f19572f323 100644
--- a/gui2/layereditor/layerselectionmodel.cpp
+++ b/gui2/layereditor/layerselectionmodel.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
-#include <QItemSelection>
#include "gui2/layereditor/layerselectionmodel.h"
#include "gui2/model/sampleitems.h"
#include "mvvm/viewmodel/viewmodel.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include <QItemSelection>
namespace DaRefl {
diff --git a/gui2/layereditor/layerselectionmodel.h b/gui2/layereditor/layerselectionmodel.h
index a4ede1a8d38..1bd03b53bb6 100644
--- a/gui2/layereditor/layerselectionmodel.h
+++ b/gui2/layereditor/layerselectionmodel.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_LAYEREDITOR_LAYERSELECTIONMODEL_H
#define DAREFL_LAYEREDITOR_LAYERSELECTIONMODEL_H
-#include <QItemSelectionModel>
#include "darefl_export.h"
+#include <QItemSelectionModel>
#include <vector>
namespace ModelView {
diff --git a/gui2/layereditor/layertreeview.cpp b/gui2/layereditor/layertreeview.cpp
index 39189e2f21d..bde16f9202c 100644
--- a/gui2/layereditor/layertreeview.cpp
+++ b/gui2/layereditor/layertreeview.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "gui2/layereditor/layertreeview.h"
#include <QHeaderView>
#include <QMouseEvent>
-#include "gui2/layereditor/layertreeview.h"
namespace DaRefl {
diff --git a/gui2/layereditor/layertreeview.h b/gui2/layereditor/layertreeview.h
index 241b4459768..82c7ca128a7 100644
--- a/gui2/layereditor/layertreeview.h
+++ b/gui2/layereditor/layertreeview.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_LAYEREDITOR_LAYERTREEVIEW_H
#define DAREFL_LAYEREDITOR_LAYERTREEVIEW_H
-#include <QTreeView>
#include "darefl_export.h"
+#include <QTreeView>
namespace DaRefl {
diff --git a/gui2/main.cpp b/gui2/main.cpp
index 3ede179c9f5..65e06f34d9b 100644
--- a/gui2/main.cpp
+++ b/gui2/main.cpp
@@ -11,8 +11,7 @@
#include <QApplication>
#include <QLocale>
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
diff --git a/gui2/mainwindow/actionmanager.cpp b/gui2/mainwindow/actionmanager.cpp
index 6610da2d99a..6f428f69f14 100644
--- a/gui2/mainwindow/actionmanager.cpp
+++ b/gui2/mainwindow/actionmanager.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
+#include "gui2/mainwindow/actionmanager.h"
+#include "mvvm/widgets/widgetutils.h"
#include <QAction>
#include <QMainWindow>
#include <QMenuBar>
#include <QToolBar>
-#include "gui2/mainwindow/actionmanager.h"
-#include "mvvm/widgets/widgetutils.h"
namespace DaRefl {
diff --git a/gui2/mainwindow/actionmanager.h b/gui2/mainwindow/actionmanager.h
index e6f45e00fa9..a956b741023 100644
--- a/gui2/mainwindow/actionmanager.h
+++ b/gui2/mainwindow/actionmanager.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MAINWINDOW_ACTIONMANAGER_H
#define DAREFL_MAINWINDOW_ACTIONMANAGER_H
-#include <QObject>
#include "darefl_export.h"
+#include <QObject>
class QMainWindow;
class QAction;
diff --git a/gui2/mainwindow/fancytab.cpp b/gui2/mainwindow/fancytab.cpp
index d9a56b09767..060d0c667ec 100644
--- a/gui2/mainwindow/fancytab.cpp
+++ b/gui2/mainwindow/fancytab.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
+#include "gui2/mainwindow/fancytab.h"
+#include "mvvm/widgets/widgetutils.h"
#include <QHBoxLayout>
#include <QLabel>
#include <QMouseEvent>
#include <QPainter>
-#include "gui2/mainwindow/fancytab.h"
-#include "mvvm/widgets/widgetutils.h"
namespace {
QColor defaultColor() {
diff --git a/gui2/mainwindow/fancytab.h b/gui2/mainwindow/fancytab.h
index f4be33a601b..45f84c1b918 100644
--- a/gui2/mainwindow/fancytab.h
+++ b/gui2/mainwindow/fancytab.h
@@ -10,9 +10,9 @@
#ifndef DAREFL_MAINWINDOW_FANCYTAB_H
#define DAREFL_MAINWINDOW_FANCYTAB_H
+#include "darefl_export.h"
#include <QColor>
#include <QWidget>
-#include "darefl_export.h"
class QLabel;
class QString;
diff --git a/gui2/mainwindow/mainbarwidget.cpp b/gui2/mainwindow/mainbarwidget.cpp
index a56f7feb97e..9e2173f1277 100644
--- a/gui2/mainwindow/mainbarwidget.cpp
+++ b/gui2/mainwindow/mainbarwidget.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
+#include "gui2/mainwindow/mainbarwidget.h"
+#include "gui2/mainwindow/fancytab.h"
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
#include <QStackedWidget>
#include <QVBoxLayout>
-#include "gui2/mainwindow/fancytab.h"
-#include "gui2/mainwindow/mainbarwidget.h"
namespace DaRefl {
diff --git a/gui2/mainwindow/mainbarwidget.h b/gui2/mainwindow/mainbarwidget.h
index 9c67284528b..b8fcf5e8aea 100644
--- a/gui2/mainwindow/mainbarwidget.h
+++ b/gui2/mainwindow/mainbarwidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MAINWINDOW_MAINBARWIDGET_H
#define DAREFL_MAINWINDOW_MAINBARWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
#include <map>
class QStackedWidget;
diff --git a/gui2/mainwindow/mainwindow.cpp b/gui2/mainwindow/mainwindow.cpp
index 9966a199735..fb48927951b 100644
--- a/gui2/mainwindow/mainwindow.cpp
+++ b/gui2/mainwindow/mainwindow.cpp
@@ -7,19 +7,19 @@
//
// ************************************************************************** //
-#include <QCloseEvent>
-#include <QCoreApplication>
-#include <QFileDialog>
-#include <QMenuBar>
-#include <QSettings>
+#include "gui2/mainwindow/mainwindow.h"
#include "gui2/importdataview/importdataview.h"
#include "gui2/mainwindow/actionmanager.h"
#include "gui2/mainwindow/mainbarwidget.h"
-#include "gui2/mainwindow/mainwindow.h"
#include "gui2/mainwindow/simulationview.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/settingsview/settingsview.h"
#include "gui2/welcomeview/welcomeview.h"
+#include <QCloseEvent>
+#include <QCoreApplication>
+#include <QFileDialog>
+#include <QMenuBar>
+#include <QSettings>
namespace {
const QString main_window_group = "MainWindow";
diff --git a/gui2/mainwindow/mainwindow.h b/gui2/mainwindow/mainwindow.h
index 6fc3790c1b3..f90ac43a89b 100644
--- a/gui2/mainwindow/mainwindow.h
+++ b/gui2/mainwindow/mainwindow.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MAINWINDOW_MAINWINDOW_H
#define DAREFL_MAINWINDOW_MAINWINDOW_H
-#include <QMainWindow>
#include "darefl_export.h"
+#include <QMainWindow>
#include <memory>
namespace DaRefl {
diff --git a/gui2/mainwindow/simulationview.cpp b/gui2/mainwindow/simulationview.cpp
index 83dc300d512..b0ae3aecc67 100644
--- a/gui2/mainwindow/simulationview.cpp
+++ b/gui2/mainwindow/simulationview.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include <QSplitter>
-#include <QVBoxLayout>
-#include "gui2/layereditor/layereditor.h"
#include "gui2/mainwindow/simulationview.h"
+#include "gui2/layereditor/layereditor.h"
#include "gui2/materialeditor/materialeditor.h"
#include "gui2/quicksimeditor/instrumentpropertyeditor.h"
#include "gui2/quicksimeditor/quicksimeditor.h"
#include "gui2/sldeditor/sldeditor.h"
#include "mvvm/widgets/collapsiblelistwidget.h"
+#include <QSplitter>
+#include <QVBoxLayout>
using namespace ModelView;
diff --git a/gui2/mainwindow/simulationview.h b/gui2/mainwindow/simulationview.h
index 2d968b9ab02..37e806e7493 100644
--- a/gui2/mainwindow/simulationview.h
+++ b/gui2/mainwindow/simulationview.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MAINWINDOW_SIMULATIONVIEW_H
#define DAREFL_MAINWINDOW_SIMULATIONVIEW_H
-#include <QMainWindow>
#include "darefl_export.h"
+#include <QMainWindow>
#include <memory>
namespace ModelView {
diff --git a/gui2/mainwindow/styleutils.cpp b/gui2/mainwindow/styleutils.cpp
index f1275ae4e24..06e2c2f234c 100644
--- a/gui2/mainwindow/styleutils.cpp
+++ b/gui2/mainwindow/styleutils.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/resources/resources.h"
#include <QFontMetrics>
#include <QSize>
#include <QToolBar>
#include <QWidget>
-#include "gui2/mainwindow/styleutils.h"
-#include "gui2/resources/resources.h"
namespace DaRefl {
diff --git a/gui2/materialeditor/materialeditor.cpp b/gui2/materialeditor/materialeditor.cpp
index 25c09d91d0b..d049b5214c8 100644
--- a/gui2/materialeditor/materialeditor.cpp
+++ b/gui2/materialeditor/materialeditor.cpp
@@ -7,14 +7,14 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
-#include "gui2/mainwindow/styleutils.h"
#include "gui2/materialeditor/materialeditor.h"
+#include "gui2/mainwindow/styleutils.h"
#include "gui2/materialeditor/materialeditoractions.h"
#include "gui2/materialeditor/materialeditortoolbar.h"
#include "gui2/materialeditor/materialeditorwidget.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/model/materialmodel.h"
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/materialeditor/materialeditor.h b/gui2/materialeditor/materialeditor.h
index 42affc20ac6..fd7b96302e0 100644
--- a/gui2/materialeditor/materialeditor.h
+++ b/gui2/materialeditor/materialeditor.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MATERIALEDITOR_MATERIALEDITOR_H
#define DAREFL_MATERIALEDITOR_MATERIALEDITOR_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
namespace DaRefl {
diff --git a/gui2/materialeditor/materialeditoractions.cpp b/gui2/materialeditor/materialeditoractions.cpp
index 168e17f6804..6888a175fa3 100644
--- a/gui2/materialeditor/materialeditoractions.cpp
+++ b/gui2/materialeditor/materialeditoractions.cpp
@@ -7,8 +7,6 @@
//
// ************************************************************************** //
-#include <QFile>
-#include <QTextStream>
#include "gui2/materialeditor/materialeditoractions.h"
#include "gui2/materialeditor/materialselectionmodel.h"
#include "gui2/model/materialitems.h"
@@ -16,6 +14,8 @@
#include "mvvm/model/modelutils.h"
#include "mvvm/model/sessionitemdata.h"
#include "mvvm/viewmodel/viewmodel.h"
+#include <QFile>
+#include <QTextStream>
using namespace ModelView;
diff --git a/gui2/materialeditor/materialeditoractions.h b/gui2/materialeditor/materialeditoractions.h
index c5eef6387ec..97848c8c716 100644
--- a/gui2/materialeditor/materialeditoractions.h
+++ b/gui2/materialeditor/materialeditoractions.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MATERIALEDITOR_MATERIALEDITORACTIONS_H
#define DAREFL_MATERIALEDITOR_MATERIALEDITORACTIONS_H
-#include <QObject>
#include "darefl_export.h"
+#include <QObject>
#include <memory>
namespace DaRefl {
diff --git a/gui2/materialeditor/materialeditortoolbar.cpp b/gui2/materialeditor/materialeditortoolbar.cpp
index f9b8f67cb15..b6582321ea4 100644
--- a/gui2/materialeditor/materialeditortoolbar.cpp
+++ b/gui2/materialeditor/materialeditortoolbar.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
-#include <QAction>
-#include <QToolButton>
+#include "gui2/materialeditor/materialeditortoolbar.h"
#include "gui2/mainwindow/styleutils.h"
#include "gui2/materialeditor/materialeditoractions.h"
-#include "gui2/materialeditor/materialeditortoolbar.h"
+#include <QAction>
+#include <QToolButton>
namespace DaRefl {
diff --git a/gui2/materialeditor/materialeditortoolbar.h b/gui2/materialeditor/materialeditortoolbar.h
index a20fb979d40..92a950e4bc6 100644
--- a/gui2/materialeditor/materialeditortoolbar.h
+++ b/gui2/materialeditor/materialeditortoolbar.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MATERIALEDITOR_MATERIALEDITORTOOLBAR_H
#define DAREFL_MATERIALEDITOR_MATERIALEDITORTOOLBAR_H
-#include <QToolBar>
#include "darefl_export.h"
+#include <QToolBar>
namespace DaRefl {
diff --git a/gui2/materialeditor/materialeditorwidget.cpp b/gui2/materialeditor/materialeditorwidget.cpp
index b3527dc64d1..2e8df2ff980 100644
--- a/gui2/materialeditor/materialeditorwidget.cpp
+++ b/gui2/materialeditor/materialeditorwidget.cpp
@@ -7,7 +7,6 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
#include "gui2/materialeditor/materialeditorwidget.h"
#include "gui2/materialeditor/materialselectionmodel.h"
#include "gui2/materialeditor/materialtableview.h"
@@ -18,6 +17,7 @@
#include "mvvm/factories/viewmodelfactory.h"
#include "mvvm/model/modelutils.h"
#include "mvvm/viewmodel/viewmodeldelegate.h"
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/materialeditor/materialeditorwidget.h b/gui2/materialeditor/materialeditorwidget.h
index 5fe93093d31..3a962bc0c45 100644
--- a/gui2/materialeditor/materialeditorwidget.h
+++ b/gui2/materialeditor/materialeditorwidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MATERIALEDITOR_MATERIALEDITORWIDGET_H
#define DAREFL_MATERIALEDITOR_MATERIALEDITORWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
#include <memory>
namespace ModelView {
diff --git a/gui2/materialeditor/materialselectionmodel.h b/gui2/materialeditor/materialselectionmodel.h
index 7e40053f474..5284f31b020 100644
--- a/gui2/materialeditor/materialselectionmodel.h
+++ b/gui2/materialeditor/materialselectionmodel.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MATERIALEDITOR_MATERIALSELECTIONMODEL_H
#define DAREFL_MATERIALEDITOR_MATERIALSELECTIONMODEL_H
-#include <QItemSelectionModel>
#include "darefl_export.h"
+#include <QItemSelectionModel>
#include <vector>
namespace ModelView {
diff --git a/gui2/materialeditor/materialtableview.cpp b/gui2/materialeditor/materialtableview.cpp
index 7990fbe6580..fbdf1787c63 100644
--- a/gui2/materialeditor/materialtableview.cpp
+++ b/gui2/materialeditor/materialtableview.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "gui2/materialeditor/materialtableview.h"
#include <QHeaderView>
#include <QMouseEvent>
-#include "gui2/materialeditor/materialtableview.h"
namespace DaRefl {
diff --git a/gui2/materialeditor/materialtableview.h b/gui2/materialeditor/materialtableview.h
index e5c663bc54f..37e35b906e8 100644
--- a/gui2/materialeditor/materialtableview.h
+++ b/gui2/materialeditor/materialtableview.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MATERIALEDITOR_MATERIALTABLEVIEW_H
#define DAREFL_MATERIALEDITOR_MATERIALTABLEVIEW_H
-#include <QTableView>
#include "darefl_export.h"
+#include <QTableView>
namespace DaRefl {
diff --git a/gui2/materialeditor/materialtreeview.cpp b/gui2/materialeditor/materialtreeview.cpp
index cc1323d859b..13896beff64 100644
--- a/gui2/materialeditor/materialtreeview.cpp
+++ b/gui2/materialeditor/materialtreeview.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "gui2/materialeditor/materialtreeview.h"
#include <QHeaderView>
#include <QMouseEvent>
-#include "gui2/materialeditor/materialtreeview.h"
namespace DaRefl {
diff --git a/gui2/materialeditor/materialtreeview.h b/gui2/materialeditor/materialtreeview.h
index 7be584d5d37..de18762dbe7 100644
--- a/gui2/materialeditor/materialtreeview.h
+++ b/gui2/materialeditor/materialtreeview.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_MATERIALEDITOR_MATERIALTREEVIEW_H
#define DAREFL_MATERIALEDITOR_MATERIALTREEVIEW_H
-#include <QTreeView>
#include "darefl_export.h"
+#include <QTreeView>
namespace DaRefl {
diff --git a/gui2/model/applicationmodels.h b/gui2/model/applicationmodels.h
index 29e9cfa2192..5c62edb85f2 100644
--- a/gui2/model/applicationmodels.h
+++ b/gui2/model/applicationmodels.h
@@ -11,8 +11,8 @@
#define DAREFL_MODEL_APPLICATIONMODELS_H
#include "darefl_export.h"
-#include <memory>
#include "mvvm/interfaces/applicationmodelsinterface.h"
+#include <memory>
namespace ModelView {
class SessionModel;
diff --git a/gui2/model/experimentaldatamodel.cpp b/gui2/model/experimentaldatamodel.cpp
index 73ce0e08870..d3c35fc4381 100644
--- a/gui2/model/experimentaldatamodel.cpp
+++ b/gui2/model/experimentaldatamodel.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "gui2/model/experimentaldatamodel.h"
#include "gui2/importdataview/graphimportdata.h"
#include "gui2/model/experimentaldataitems.h"
-#include "gui2/model/experimentaldatamodel.h"
#include "mvvm/model/itemcatalogue.h"
#include "mvvm/model/modelutils.h"
diff --git a/gui2/model/instrumentitems.cpp b/gui2/model/instrumentitems.cpp
index e1552e4212c..07c20e9fa6c 100644
--- a/gui2/model/instrumentitems.cpp
+++ b/gui2/model/instrumentitems.cpp
@@ -7,7 +7,6 @@
//
// ************************************************************************** //
-#include <QColor>
#include "gui2/model/instrumentitems.h"
#include "gui2/model/item_constants.h"
#include "gui2/model/modelutils.h"
@@ -15,6 +14,7 @@
#include "mvvm/model/sessionmodel.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/graphitem.h"
+#include <QColor>
using namespace ModelView;
diff --git a/gui2/model/instrumentmodel.cpp b/gui2/model/instrumentmodel.cpp
index 5c2be3f4153..76950aaf0cb 100644
--- a/gui2/model/instrumentmodel.cpp
+++ b/gui2/model/instrumentmodel.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "gui2/model/instrumentitems.h"
#include "gui2/model/instrumentmodel.h"
+#include "gui2/model/instrumentitems.h"
#include "mvvm/model/itemcatalogue.h"
using namespace ModelView;
diff --git a/gui2/model/jobitem.cpp b/gui2/model/jobitem.cpp
index 1fc1280235a..5362e11a7d9 100644
--- a/gui2/model/jobitem.cpp
+++ b/gui2/model/jobitem.cpp
@@ -7,10 +7,9 @@
//
// ************************************************************************** //
-#include <QColor>
+#include "gui2/model/jobitem.h"
#include "gui2/model/experimentaldataitems.h"
#include "gui2/model/item_constants.h"
-#include "gui2/model/jobitem.h"
#include "gui2/model/jobmodel.h"
#include "gui2/model/modelutils.h"
#include "mvvm/model/modelutils.h"
@@ -18,6 +17,7 @@
#include "mvvm/standarditems/data1ditem.h"
#include "mvvm/standarditems/graphitem.h"
#include "mvvm/standarditems/graphviewportitem.h"
+#include <QColor>
using namespace ModelView;
diff --git a/gui2/model/jobmodel.cpp b/gui2/model/jobmodel.cpp
index dfce378c068..7eeb9d091a0 100644
--- a/gui2/model/jobmodel.cpp
+++ b/gui2/model/jobmodel.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "gui2/model/jobmodel.h"
#include "gui2/model/experimentaldataitems.h"
#include "gui2/model/jobitem.h"
-#include "gui2/model/jobmodel.h"
#include "gui2/quicksimeditor/quicksim_types.h"
#include "mvvm/model/itemcatalogue.h"
#include "mvvm/model/modelutils.h"
diff --git a/gui2/model/materialitems.cpp b/gui2/model/materialitems.cpp
index 9c7ffb6b476..d35cfa3661f 100644
--- a/gui2/model/materialitems.cpp
+++ b/gui2/model/materialitems.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QColor>
-#include "gui2/model/item_constants.h"
#include "gui2/model/materialitems.h"
+#include "gui2/model/item_constants.h"
#include "mvvm/model/externalproperty.h"
+#include <QColor>
using namespace ModelView;
diff --git a/gui2/model/materialmodel.cpp b/gui2/model/materialmodel.cpp
index e1df14bad49..a2765a5b105 100644
--- a/gui2/model/materialmodel.cpp
+++ b/gui2/model/materialmodel.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include <QColor>
+#include "gui2/model/materialmodel.h"
#include "gui2/model/item_constants.h"
#include "gui2/model/materialitems.h"
-#include "gui2/model/materialmodel.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/model/itemcatalogue.h"
#include "mvvm/widgets/widgetutils.h"
+#include <QColor>
using namespace ModelView;
diff --git a/gui2/model/materialpropertycontroller.cpp b/gui2/model/materialpropertycontroller.cpp
index 42add71c636..c42ff736d63 100644
--- a/gui2/model/materialpropertycontroller.cpp
+++ b/gui2/model/materialpropertycontroller.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "gui2/model/materialmodel.h"
#include "gui2/model/materialpropertycontroller.h"
+#include "gui2/model/materialmodel.h"
#include "gui2/model/sampleitems.h"
#include "gui2/model/samplemodel.h"
#include "mvvm/model/externalproperty.h"
diff --git a/gui2/model/modelutils.cpp b/gui2/model/modelutils.cpp
index 8d0d4e31e5e..cad58eb38b0 100644
--- a/gui2/model/modelutils.cpp
+++ b/gui2/model/modelutils.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "gui2/model/experimentaldatamodel.h"
#include "gui2/model/modelutils.h"
+#include "gui2/model/experimentaldatamodel.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/model/modelutils.h"
#include "mvvm/standarditems/axisitems.h"
diff --git a/gui2/model/sampleitems.cpp b/gui2/model/sampleitems.cpp
index 0a30979c83d..74298a8840d 100644
--- a/gui2/model/sampleitems.cpp
+++ b/gui2/model/sampleitems.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include <QVariant>
+#include "gui2/model/sampleitems.h"
#include "gui2/model/item_constants.h"
#include "gui2/model/materialitems.h"
#include "gui2/model/materialmodel.h"
-#include "gui2/model/sampleitems.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/signals/itemmapper.h"
+#include <QVariant>
namespace DaRefl {
diff --git a/gui2/model/samplemodel.cpp b/gui2/model/samplemodel.cpp
index 5f6372939da..0d01aac4668 100644
--- a/gui2/model/samplemodel.cpp
+++ b/gui2/model/samplemodel.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "gui2/model/sampleitems.h"
#include "gui2/model/samplemodel.h"
+#include "gui2/model/sampleitems.h"
#include "mvvm/model/itemcatalogue.h"
using namespace ModelView;
diff --git a/gui2/quicksimeditor/custombeampropertyeditorfactory.cpp b/gui2/quicksimeditor/custombeampropertyeditorfactory.cpp
index 3543c81a9fd..0dedd3fccc3 100644
--- a/gui2/quicksimeditor/custombeampropertyeditorfactory.cpp
+++ b/gui2/quicksimeditor/custombeampropertyeditorfactory.cpp
@@ -7,18 +7,18 @@
//
// ************************************************************************** //
-#include <QModelIndex>
-#include <algorithm>
+#include "gui2/quicksimeditor/custombeampropertyeditorfactory.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/model/experimentaldataitems.h"
#include "gui2/model/experimentaldatamodel.h"
#include "gui2/model/materialmodel.h"
#include "gui2/model/modelutils.h"
-#include "gui2/quicksimeditor/custombeampropertyeditorfactory.h"
#include "mvvm/editors/externalpropertycomboeditor.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/model/modelutils.h"
#include "mvvm/standarditems/graphitem.h"
+#include <QModelIndex>
+#include <algorithm>
using namespace ModelView;
diff --git a/gui2/quicksimeditor/instrumentpropertyeditor.cpp b/gui2/quicksimeditor/instrumentpropertyeditor.cpp
index 410bed52523..bcde0f81c59 100644
--- a/gui2/quicksimeditor/instrumentpropertyeditor.cpp
+++ b/gui2/quicksimeditor/instrumentpropertyeditor.cpp
@@ -7,16 +7,16 @@
//
// ************************************************************************** //
-#include <QTreeView>
-#include <QVBoxLayout>
+#include "gui2/quicksimeditor/instrumentpropertyeditor.h"
#include "gui2/mainwindow/styleutils.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/model/instrumentitems.h"
#include "gui2/model/instrumentmodel.h"
#include "gui2/quicksimeditor/custombeampropertyeditorfactory.h"
-#include "gui2/quicksimeditor/instrumentpropertyeditor.h"
#include "mvvm/viewmodel/viewmodeldelegate.h"
#include "mvvm/widgets/propertytreeview.h"
+#include <QTreeView>
+#include <QVBoxLayout>
using namespace ModelView;
diff --git a/gui2/quicksimeditor/jobmanager.h b/gui2/quicksimeditor/jobmanager.h
index 9f214b45eaf..a3d1374c9cb 100644
--- a/gui2/quicksimeditor/jobmanager.h
+++ b/gui2/quicksimeditor/jobmanager.h
@@ -10,10 +10,10 @@
#ifndef DAREFL_QUICKSIMEDITOR_JOBMANAGER_H
#define DAREFL_QUICKSIMEDITOR_JOBMANAGER_H
-#include <QObject>
#include "darefl_export.h"
#include "gui2/quicksimeditor/quicksim_types.h"
#include "mvvm/utils/threadsafestack.h"
+#include <QObject>
namespace DaRefl {
diff --git a/gui2/quicksimeditor/materialprofile.cpp b/gui2/quicksimeditor/materialprofile.cpp
index 07717d00322..605ae9101f7 100644
--- a/gui2/quicksimeditor/materialprofile.cpp
+++ b/gui2/quicksimeditor/materialprofile.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <Sample/Slice/Slice.h>
#include "gui2/quicksimeditor/materialprofile.h"
#include "gui2/quicksimeditor/profilehelper.h"
#include "gui2/quicksimeditor/quicksimutils.h"
+#include <Sample/Slice/Slice.h>
namespace DaRefl {
diff --git a/gui2/quicksimeditor/quicksim_types.h b/gui2/quicksimeditor/quicksim_types.h
index dc94e1cb262..9502b677a7e 100644
--- a/gui2/quicksimeditor/quicksim_types.h
+++ b/gui2/quicksimeditor/quicksim_types.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_QUICKSIMEDITOR_QUICKSIM_TYPES_H
#define DAREFL_QUICKSIMEDITOR_QUICKSIM_TYPES_H
-#include <complex>
#include "darefl_export.h"
+#include <complex>
#include <vector>
namespace DaRefl {
diff --git a/gui2/quicksimeditor/quicksimcontroller.cpp b/gui2/quicksimeditor/quicksimcontroller.cpp
index 4b13c2bdbf6..73488db279e 100644
--- a/gui2/quicksimeditor/quicksimcontroller.cpp
+++ b/gui2/quicksimeditor/quicksimcontroller.cpp
@@ -7,6 +7,7 @@
//
// ************************************************************************** //
+#include "gui2/quicksimeditor/quicksimcontroller.h"
#include "gui2/core/app_constants.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/model/instrumentitems.h"
@@ -17,7 +18,6 @@
#include "gui2/model/sampleitems.h"
#include "gui2/model/samplemodel.h"
#include "gui2/quicksimeditor/jobmanager.h"
-#include "gui2/quicksimeditor/quicksimcontroller.h"
#include "gui2/quicksimeditor/quicksimutils.h"
#include "gui2/quicksimeditor/speculartoysimulation.h"
#include "mvvm/project/modelhaschangedcontroller.h"
diff --git a/gui2/quicksimeditor/quicksimcontroller.h b/gui2/quicksimeditor/quicksimcontroller.h
index f6133143c22..cedc8bee437 100644
--- a/gui2/quicksimeditor/quicksimcontroller.h
+++ b/gui2/quicksimeditor/quicksimcontroller.h
@@ -10,9 +10,9 @@
#ifndef DAREFL_QUICKSIMEDITOR_QUICKSIMCONTROLLER_H
#define DAREFL_QUICKSIMEDITOR_QUICKSIMCONTROLLER_H
-#include <QObject>
#include "darefl_export.h"
#include "gui2/quicksimeditor/quicksim_types.h"
+#include <QObject>
#include <memory>
namespace ModelView {
diff --git a/gui2/quicksimeditor/quicksimeditor.cpp b/gui2/quicksimeditor/quicksimeditor.cpp
index 2403d1a0f80..1a140e1503b 100644
--- a/gui2/quicksimeditor/quicksimeditor.cpp
+++ b/gui2/quicksimeditor/quicksimeditor.cpp
@@ -7,20 +7,20 @@
//
// ************************************************************************** //
-#include <QTabWidget>
-#include <QVBoxLayout>
+#include "gui2/quicksimeditor/quicksimeditor.h"
#include "gui2/mainwindow/styleutils.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/model/experimentaldataitems.h"
#include "gui2/model/jobmodel.h"
#include "gui2/quicksimeditor/quicksimcontroller.h"
-#include "gui2/quicksimeditor/quicksimeditor.h"
#include "gui2/quicksimeditor/quicksimeditortoolbar.h"
#include "gui2/quicksimeditor/simplotcontroller.h"
#include "gui2/quicksimeditor/simplotwidget.h"
#include "mvvm/model/modelutils.h"
#include "mvvm/plotting/graphcanvas.h"
#include "mvvm/standarditems/graphviewportitem.h"
+#include <QTabWidget>
+#include <QVBoxLayout>
using namespace ModelView;
diff --git a/gui2/quicksimeditor/quicksimeditor.h b/gui2/quicksimeditor/quicksimeditor.h
index 0fd4f2019f4..fc57fe7b3bf 100644
--- a/gui2/quicksimeditor/quicksimeditor.h
+++ b/gui2/quicksimeditor/quicksimeditor.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_QUICKSIMEDITOR_QUICKSIMEDITOR_H
#define DAREFL_QUICKSIMEDITOR_QUICKSIMEDITOR_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
namespace DaRefl {
diff --git a/gui2/quicksimeditor/quicksimeditortoolbar.cpp b/gui2/quicksimeditor/quicksimeditortoolbar.cpp
index 5ba6f38795e..661e5bce02c 100644
--- a/gui2/quicksimeditor/quicksimeditortoolbar.cpp
+++ b/gui2/quicksimeditor/quicksimeditortoolbar.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
+#include "gui2/quicksimeditor/quicksimeditortoolbar.h"
+#include "gui2/core/app_constants.h"
#include <QAction>
#include <QCheckBox>
#include <QLabel>
#include <QProgressBar>
#include <QVBoxLayout>
-#include "gui2/core/app_constants.h"
-#include "gui2/quicksimeditor/quicksimeditortoolbar.h"
namespace DaRefl {
diff --git a/gui2/quicksimeditor/quicksimeditortoolbar.h b/gui2/quicksimeditor/quicksimeditortoolbar.h
index 1084a36516c..27f7d183bea 100644
--- a/gui2/quicksimeditor/quicksimeditortoolbar.h
+++ b/gui2/quicksimeditor/quicksimeditortoolbar.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_QUICKSIMEDITOR_QUICKSIMEDITORTOOLBAR_H
#define DAREFL_QUICKSIMEDITOR_QUICKSIMEDITORTOOLBAR_H
-#include <QToolBar>
#include "darefl_export.h"
+#include <QToolBar>
class QProgressBar;
class QCheckBox;
diff --git a/gui2/quicksimeditor/quicksimutils.cpp b/gui2/quicksimeditor/quicksimutils.cpp
index ba7bf733b18..c7601da57d3 100644
--- a/gui2/quicksimeditor/quicksimutils.cpp
+++ b/gui2/quicksimeditor/quicksimutils.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
+#include "gui2/quicksimeditor/quicksimutils.h"
#include "gui2/model/item_constants.h"
#include "gui2/model/materialitems.h"
#include "gui2/model/sampleitems.h"
-#include "gui2/quicksimeditor/quicksimutils.h"
+#include "mvvm/model/externalproperty.h"
+#include "mvvm/model/sessionmodel.h"
#include <Sample/Material/MaterialFactoryFuncs.h>
#include <Sample/Slice/LayerRoughness.h>
#include <Sample/Slice/Slice.h>
-#include "mvvm/model/externalproperty.h"
-#include "mvvm/model/sessionmodel.h"
#include <stdexcept>
namespace DaRefl {
diff --git a/gui2/quicksimeditor/quicksimutils.h b/gui2/quicksimeditor/quicksimutils.h
index 0c73233e282..ea6efe0e77e 100644
--- a/gui2/quicksimeditor/quicksimutils.h
+++ b/gui2/quicksimeditor/quicksimutils.h
@@ -23,8 +23,7 @@ namespace DaRefl::Utils {
//! Creates multi-slice presentation of internal multilayer structure.
DAREFLCORE_EXPORT multislice_t CreateMultiSlice(const MultiLayerItem& multilayer);
-DAREFLCORE_EXPORT std::vector<Slice>
-createBornAgainSlices(const multislice_t& multislice);
+DAREFLCORE_EXPORT std::vector<Slice> createBornAgainSlices(const multislice_t& multislice);
} // namespace DaRefl::Utils
diff --git a/gui2/quicksimeditor/simplotcontroller.cpp b/gui2/quicksimeditor/simplotcontroller.cpp
index e59708e466a..af0d4b7e534 100644
--- a/gui2/quicksimeditor/simplotcontroller.cpp
+++ b/gui2/quicksimeditor/simplotcontroller.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
+#include "gui2/quicksimeditor/simplotcontroller.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/model/instrumentitems.h"
#include "gui2/model/instrumentmodel.h"
#include "gui2/model/jobitem.h"
#include "gui2/model/jobmodel.h"
-#include "gui2/quicksimeditor/simplotcontroller.h"
#include "mvvm/project/modelhaschangedcontroller.h"
namespace DaRefl {
diff --git a/gui2/quicksimeditor/simplotcontroller.h b/gui2/quicksimeditor/simplotcontroller.h
index 17d9c444529..89461592c60 100644
--- a/gui2/quicksimeditor/simplotcontroller.h
+++ b/gui2/quicksimeditor/simplotcontroller.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_QUICKSIMEDITOR_SIMPLOTCONTROLLER_H
#define DAREFL_QUICKSIMEDITOR_SIMPLOTCONTROLLER_H
-#include <QObject>
#include "darefl_export.h"
+#include <QObject>
#include <memory>
namespace ModelView {
diff --git a/gui2/quicksimeditor/simplotwidget.cpp b/gui2/quicksimeditor/simplotwidget.cpp
index 3340b7e8f05..e851fe03845 100644
--- a/gui2/quicksimeditor/simplotwidget.cpp
+++ b/gui2/quicksimeditor/simplotwidget.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include <QList>
-#include <QSplitter>
-#include <QVBoxLayout>
+#include "gui2/quicksimeditor/simplotwidget.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/model/experimentaldataitems.h"
#include "gui2/model/jobmodel.h"
-#include "gui2/quicksimeditor/simplotwidget.h"
#include "mvvm/plotting/graphcanvas.h"
#include "mvvm/standarditems/graphviewportitem.h"
+#include <QList>
+#include <QSplitter>
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/quicksimeditor/simplotwidget.h b/gui2/quicksimeditor/simplotwidget.h
index 6899848b02e..558c0fac0a5 100644
--- a/gui2/quicksimeditor/simplotwidget.h
+++ b/gui2/quicksimeditor/simplotwidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_QUICKSIMEDITOR_SIMPLOTWIDGET_H
#define DAREFL_QUICKSIMEDITOR_SIMPLOTWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
namespace ModelView {
class GraphCanvas;
diff --git a/gui2/quicksimeditor/speculartoysimulation.cpp b/gui2/quicksimeditor/speculartoysimulation.cpp
index 7bab4e5efcb..51b6a3fc40f 100644
--- a/gui2/quicksimeditor/speculartoysimulation.cpp
+++ b/gui2/quicksimeditor/speculartoysimulation.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include <algorithm>
+#include "gui2/quicksimeditor/speculartoysimulation.h"
#include "gui2/quicksimeditor/materialprofile.h"
#include "gui2/quicksimeditor/quicksimutils.h"
-#include "gui2/quicksimeditor/speculartoysimulation.h"
-#include <Sample/Slice/Slice.h>
-#include <Sample/Slice/KzComputation.h>
-#include <Sample/Specular/SpecularScalarTanhStrategy.h>
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/utils/containerutils.h"
+#include <Sample/Slice/KzComputation.h>
+#include <Sample/Slice/Slice.h>
+#include <Sample/Specular/SpecularScalarTanhStrategy.h>
+#include <algorithm>
#include <stdexcept>
using namespace ModelView;
diff --git a/gui2/quicksimeditor/speculartoysimulation.h b/gui2/quicksimeditor/speculartoysimulation.h
index f40d4bdc98f..daeae5d3abb 100644
--- a/gui2/quicksimeditor/speculartoysimulation.h
+++ b/gui2/quicksimeditor/speculartoysimulation.h
@@ -12,8 +12,8 @@
#include "darefl_export.h"
#include "gui2/quicksimeditor/quicksim_types.h"
-#include <memory>
#include "mvvm/utils/progresshandler.h"
+#include <memory>
#include <vector>
class SpecularScalarTanhStrategy;
diff --git a/gui2/settingsview/settingsview.cpp b/gui2/settingsview/settingsview.cpp
index f95b4f6a147..acd416ee825 100644
--- a/gui2/settingsview/settingsview.cpp
+++ b/gui2/settingsview/settingsview.cpp
@@ -7,17 +7,17 @@
//
// ************************************************************************** //
+#include "gui2/settingsview/settingsview.h"
+#include "gui2/model/applicationmodels.h"
+#include "mvvm/model/sessionmodel.h"
+#include "mvvm/widgets/allitemstreeview.h"
+#include "mvvm/widgets/widgetutils.h"
#include <QHBoxLayout>
#include <QListView>
#include <QListWidget>
#include <QStackedWidget>
#include <QTabWidget>
#include <QTreeView>
-#include "gui2/model/applicationmodels.h"
-#include "gui2/settingsview/settingsview.h"
-#include "mvvm/model/sessionmodel.h"
-#include "mvvm/widgets/allitemstreeview.h"
-#include "mvvm/widgets/widgetutils.h"
namespace DaRefl {
diff --git a/gui2/settingsview/settingsview.h b/gui2/settingsview/settingsview.h
index ebba0c5e650..b4be2d9f306 100644
--- a/gui2/settingsview/settingsview.h
+++ b/gui2/settingsview/settingsview.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_SETTINGSVIEW_SETTINGSVIEW_H
#define DAREFL_SETTINGSVIEW_SETTINGSVIEW_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
class QTabWidget;
class QStackedWidget;
diff --git a/gui2/sldeditor/elementview.cpp b/gui2/sldeditor/elementview.cpp
index ee6cc81dc07..1a381d103a7 100644
--- a/gui2/sldeditor/elementview.cpp
+++ b/gui2/sldeditor/elementview.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include "mvvm/plotting/sceneadapterinterface.h"
#include "gui2/sldeditor/elementview.h"
#include "gui2/sldeditor/graphicsscene.h"
+#include "mvvm/plotting/sceneadapterinterface.h"
#include <QCursor>
#include <QPainter>
diff --git a/gui2/sldeditor/graphicsscene.h b/gui2/sldeditor/graphicsscene.h
index 018fffd5bfb..4d055d52961 100644
--- a/gui2/sldeditor/graphicsscene.h
+++ b/gui2/sldeditor/graphicsscene.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_SLDEDITOR_GRAPHICSSCENE_H
#define DAREFL_SLDEDITOR_GRAPHICSSCENE_H
-#include <QGraphicsScene>
#include "darefl_export.h"
+#include <QGraphicsScene>
#include <memory>
namespace ModelView {
diff --git a/gui2/sldeditor/layerelementcontroller.h b/gui2/sldeditor/layerelementcontroller.h
index 4c580142c5e..ca744886894 100644
--- a/gui2/sldeditor/layerelementcontroller.h
+++ b/gui2/sldeditor/layerelementcontroller.h
@@ -10,10 +10,10 @@
#ifndef DAREFL_SLDEDITOR_LAYERELEMENTCONTROLLER_H
#define DAREFL_SLDEDITOR_LAYERELEMENTCONTROLLER_H
+#include "darefl_export.h"
#include "mvvm/plotting/sceneadapterinterface.h"
#include <QObject>
#include <QPainterPath>
-#include "darefl_export.h"
#include <vector>
namespace DaRefl {
diff --git a/gui2/sldeditor/roughnesselementview.cpp b/gui2/sldeditor/roughnesselementview.cpp
index 0da9c1c78c1..b2fea0156f1 100644
--- a/gui2/sldeditor/roughnesselementview.cpp
+++ b/gui2/sldeditor/roughnesselementview.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "gui2/sldeditor/layerelementcontroller.h"
#include "gui2/sldeditor/roughnesselementview.h"
+#include "gui2/sldeditor/layerelementcontroller.h"
#include <QPainter>
#include <QStyleOption>
diff --git a/gui2/sldeditor/segmentelementview.cpp b/gui2/sldeditor/segmentelementview.cpp
index 80cb6d1c5f9..85f9553468c 100644
--- a/gui2/sldeditor/segmentelementview.cpp
+++ b/gui2/sldeditor/segmentelementview.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "gui2/sldeditor/layerelementcontroller.h"
#include "gui2/sldeditor/segmentelementview.h"
+#include "gui2/sldeditor/layerelementcontroller.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
diff --git a/gui2/sldeditor/sldeditor.cpp b/gui2/sldeditor/sldeditor.cpp
index 33a60a4dd79..813b531473d 100644
--- a/gui2/sldeditor/sldeditor.cpp
+++ b/gui2/sldeditor/sldeditor.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
+#include "gui2/sldeditor/sldeditor.h"
#include "gui2/mainwindow/styleutils.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/sldeditor/graphicsscene.h"
-#include "gui2/sldeditor/sldeditor.h"
#include "gui2/sldeditor/sldeditoractions.h"
#include "gui2/sldeditor/sldeditortoolbar.h"
#include "gui2/sldeditor/sldviewwidget.h"
#include "mvvm/plotting/graphcanvas.h"
+#include <QVBoxLayout>
namespace DaRefl {
diff --git a/gui2/sldeditor/sldeditor.h b/gui2/sldeditor/sldeditor.h
index 730ca69460f..515773bb868 100644
--- a/gui2/sldeditor/sldeditor.h
+++ b/gui2/sldeditor/sldeditor.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_SLDEDITOR_SLDEDITOR_H
#define DAREFL_SLDEDITOR_SLDEDITOR_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
namespace DaRefl {
class SLDEditorActions;
diff --git a/gui2/sldeditor/sldeditoractions.cpp b/gui2/sldeditor/sldeditoractions.cpp
index 02132317cb3..bade4543863 100644
--- a/gui2/sldeditor/sldeditoractions.cpp
+++ b/gui2/sldeditor/sldeditoractions.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "gui2/sldeditor/layerelementitem.h"
#include "gui2/sldeditor/sldeditoractions.h"
+#include "gui2/sldeditor/layerelementitem.h"
#include "gui2/sldeditor/sldelementmodel.h"
#include "mvvm/model/modelutils.h"
#include "mvvm/viewmodel/viewmodel.h"
diff --git a/gui2/sldeditor/sldeditoractions.h b/gui2/sldeditor/sldeditoractions.h
index 58799546a94..f4a6d63428c 100644
--- a/gui2/sldeditor/sldeditoractions.h
+++ b/gui2/sldeditor/sldeditoractions.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_SLDEDITOR_SLDEDITORACTIONS_H
#define DAREFL_SLDEDITOR_SLDEDITORACTIONS_H
-#include <QObject>
#include "darefl_export.h"
+#include <QObject>
#include <memory>
namespace DaRefl {
diff --git a/gui2/sldeditor/sldeditortoolbar.cpp b/gui2/sldeditor/sldeditortoolbar.cpp
index 20a17629225..21d4633d9f8 100644
--- a/gui2/sldeditor/sldeditortoolbar.cpp
+++ b/gui2/sldeditor/sldeditortoolbar.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
-#include <QAction>
-#include <QToolButton>
+#include "gui2/sldeditor/sldeditortoolbar.h"
#include "gui2/mainwindow/styleutils.h"
#include "gui2/resources/resources.h"
#include "gui2/sldeditor/sldeditoractions.h"
-#include "gui2/sldeditor/sldeditortoolbar.h"
+#include <QAction>
+#include <QToolButton>
namespace DaRefl {
diff --git a/gui2/sldeditor/sldeditortoolbar.h b/gui2/sldeditor/sldeditortoolbar.h
index 4e65cb179bf..c852b51021e 100644
--- a/gui2/sldeditor/sldeditortoolbar.h
+++ b/gui2/sldeditor/sldeditortoolbar.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_SLDEDITOR_SLDEDITORTOOLBAR_H
#define DAREFL_SLDEDITOR_SLDEDITORTOOLBAR_H
-#include <QToolBar>
#include "darefl_export.h"
+#include <QToolBar>
namespace DaRefl {
diff --git a/gui2/sldeditor/sldelementcontroller.cpp b/gui2/sldeditor/sldelementcontroller.cpp
index 45e58cb0fcf..9f5589dc8f2 100644
--- a/gui2/sldeditor/sldelementcontroller.cpp
+++ b/gui2/sldeditor/sldelementcontroller.cpp
@@ -7,6 +7,7 @@
//
// ************************************************************************** //
+#include "gui2/sldeditor/sldelementcontroller.h"
#include "gui2/model/materialitems.h"
#include "gui2/model/materialmodel.h"
#include "gui2/model/sampleitems.h"
@@ -15,13 +16,12 @@
#include "gui2/sldeditor/layerelementcontroller.h"
#include "gui2/sldeditor/layerelementitem.h"
#include "gui2/sldeditor/segmentelementview.h"
-#include "gui2/sldeditor/sldelementcontroller.h"
#include "gui2/sldeditor/sldelementmodel.h"
-#include <iostream>
#include "mvvm/model/compounditem.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/model/modelutils.h"
#include "mvvm/signals/modelmapper.h"
+#include <iostream>
using namespace ModelView;
diff --git a/gui2/sldeditor/sldelementcontroller.h b/gui2/sldeditor/sldelementcontroller.h
index a6afd057014..745e79c50e4 100644
--- a/gui2/sldeditor/sldelementcontroller.h
+++ b/gui2/sldeditor/sldelementcontroller.h
@@ -10,11 +10,11 @@
#ifndef DAREFL_SLDEDITOR_SLDELEMENTCONTROLLER_H
#define DAREFL_SLDEDITOR_SLDELEMENTCONTROLLER_H
-#include <QObject>
#include "darefl_export.h"
#include "gui2/sldeditor/layerelementcontroller.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
+#include <QObject>
#include <vector>
namespace DaRefl {
diff --git a/gui2/sldeditor/sldelementmodel.cpp b/gui2/sldeditor/sldelementmodel.cpp
index 0d76c8cab24..7fa77d81d6f 100644
--- a/gui2/sldeditor/sldelementmodel.cpp
+++ b/gui2/sldeditor/sldelementmodel.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "gui2/sldeditor/layerelementitem.h"
#include "gui2/sldeditor/sldelementmodel.h"
+#include "gui2/sldeditor/layerelementitem.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/model/itemcatalogue.h"
diff --git a/gui2/sldeditor/sldviewwidget.cpp b/gui2/sldeditor/sldviewwidget.cpp
index 16aaf592bf2..e30f026bfb7 100644
--- a/gui2/sldeditor/sldviewwidget.cpp
+++ b/gui2/sldeditor/sldviewwidget.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
-#include <QResizeEvent>
+#include "gui2/sldeditor/sldviewwidget.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/model/jobmodel.h"
#include "gui2/sldeditor/graphicsscene.h"
#include "gui2/sldeditor/sldelementcontroller.h"
-#include "gui2/sldeditor/sldviewwidget.h"
+#include <QResizeEvent>
namespace DaRefl {
diff --git a/gui2/sldeditor/sldviewwidget.h b/gui2/sldeditor/sldviewwidget.h
index 78f21b110cf..f2fed31d3b3 100644
--- a/gui2/sldeditor/sldviewwidget.h
+++ b/gui2/sldeditor/sldviewwidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_SLDEDITOR_SLDVIEWWIDGET_H
#define DAREFL_SLDEDITOR_SLDVIEWWIDGET_H
-#include <QGraphicsView>
#include "darefl_export.h"
+#include <QGraphicsView>
#include <memory>
namespace DaRefl {
diff --git a/gui2/welcomeview/openprojectwidget.cpp b/gui2/welcomeview/openprojectwidget.cpp
index dc04bdd8142..4c4be3bc1f1 100644
--- a/gui2/welcomeview/openprojectwidget.cpp
+++ b/gui2/welcomeview/openprojectwidget.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QVBoxLayout>
+#include "gui2/welcomeview/openprojectwidget.h"
#include "gui2/core/version.h"
#include "gui2/mainwindow/styleutils.h"
-#include "gui2/welcomeview/openprojectwidget.h"
#include "mvvm/core/version.h"
#include "mvvm/widgets/widgetutils.h"
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QVBoxLayout>
namespace {
int logo_width() {
diff --git a/gui2/welcomeview/openprojectwidget.h b/gui2/welcomeview/openprojectwidget.h
index 3ed64002058..16b37828d13 100644
--- a/gui2/welcomeview/openprojectwidget.h
+++ b/gui2/welcomeview/openprojectwidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_WELCOMEVIEW_OPENPROJECTWIDGET_H
#define DAREFL_WELCOMEVIEW_OPENPROJECTWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
#include <memory>
class QBoxLayout;
diff --git a/gui2/welcomeview/projecthandler.cpp b/gui2/welcomeview/projecthandler.cpp
index 62c6ff8b989..4fe92f08f98 100644
--- a/gui2/welcomeview/projecthandler.cpp
+++ b/gui2/welcomeview/projecthandler.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include <QMainWindow>
-#include "gui2/model/applicationmodels.h"
#include "gui2/welcomeview/projecthandler.h"
+#include "gui2/model/applicationmodels.h"
#include "gui2/welcomeview/recentprojectsettings.h"
#include "gui2/welcomeview/recentprojectwidget.h"
#include "gui2/welcomeview/userinteractor.h"
#include "mvvm/factories/projectmanagerfactory.h"
#include "mvvm/project/project_types.h"
#include "mvvm/widgets/widgetutils.h"
+#include <QMainWindow>
using namespace ModelView;
diff --git a/gui2/welcomeview/projecthandler.h b/gui2/welcomeview/projecthandler.h
index 97b3b3fa41d..8396f68cb93 100644
--- a/gui2/welcomeview/projecthandler.h
+++ b/gui2/welcomeview/projecthandler.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_WELCOMEVIEW_PROJECTHANDLER_H
#define DAREFL_WELCOMEVIEW_PROJECTHANDLER_H
-#include <QObject>
#include "darefl_export.h"
+#include <QObject>
#include <memory>
#include <vector>
diff --git a/gui2/welcomeview/projectpanewidget.cpp b/gui2/welcomeview/projectpanewidget.cpp
index 47846570d7b..aa96853335a 100644
--- a/gui2/welcomeview/projectpanewidget.cpp
+++ b/gui2/welcomeview/projectpanewidget.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
+#include "gui2/welcomeview/projectpanewidget.h"
+#include "mvvm/widgets/widgetutils.h"
#include <QLabel>
#include <QMouseEvent>
#include <QPainter>
#include <QVBoxLayout>
-#include "gui2/welcomeview/projectpanewidget.h"
-#include "mvvm/widgets/widgetutils.h"
namespace {
int widget_height() {
diff --git a/gui2/welcomeview/projectpanewidget.h b/gui2/welcomeview/projectpanewidget.h
index 7b1efaba407..9082a9ef67d 100644
--- a/gui2/welcomeview/projectpanewidget.h
+++ b/gui2/welcomeview/projectpanewidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_WELCOMEVIEW_PROJECTPANEWIDGET_H
#define DAREFL_WELCOMEVIEW_PROJECTPANEWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
class QLabel;
diff --git a/gui2/welcomeview/recentprojectsettings.cpp b/gui2/welcomeview/recentprojectsettings.cpp
index 7197285675c..a5480179e3f 100644
--- a/gui2/welcomeview/recentprojectsettings.cpp
+++ b/gui2/welcomeview/recentprojectsettings.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QDir>
-#include <QSettings>
#include "gui2/welcomeview/recentprojectsettings.h"
#include "mvvm/utils/fileutils.h"
+#include <QDir>
+#include <QSettings>
namespace {
const int max_recent_projects = 10;
diff --git a/gui2/welcomeview/recentprojectsettings.h b/gui2/welcomeview/recentprojectsettings.h
index 957937663e8..3dfbbd9b43d 100644
--- a/gui2/welcomeview/recentprojectsettings.h
+++ b/gui2/welcomeview/recentprojectsettings.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_WELCOMEVIEW_RECENTPROJECTSETTINGS_H
#define DAREFL_WELCOMEVIEW_RECENTPROJECTSETTINGS_H
-#include <QStringList>
#include "darefl_export.h"
+#include <QStringList>
namespace DaRefl {
diff --git a/gui2/welcomeview/recentprojectwidget.cpp b/gui2/welcomeview/recentprojectwidget.cpp
index 0adb195071d..efe79076f64 100644
--- a/gui2/welcomeview/recentprojectwidget.cpp
+++ b/gui2/welcomeview/recentprojectwidget.cpp
@@ -7,14 +7,14 @@
//
// ************************************************************************** //
-#include <QLabel>
-#include <QScrollArea>
-#include <QVBoxLayout>
+#include "gui2/welcomeview/recentprojectwidget.h"
#include "gui2/mainwindow/styleutils.h"
#include "gui2/welcomeview/projectpanewidget.h"
-#include "gui2/welcomeview/recentprojectwidget.h"
#include "mvvm/widgets/adjustingscrollarea.h"
#include "mvvm/widgets/widgetutils.h"
+#include <QLabel>
+#include <QScrollArea>
+#include <QVBoxLayout>
namespace {
const int max_recent_project_count = 10;
diff --git a/gui2/welcomeview/recentprojectwidget.h b/gui2/welcomeview/recentprojectwidget.h
index 9a8a69b8a96..7abfe54cb73 100644
--- a/gui2/welcomeview/recentprojectwidget.h
+++ b/gui2/welcomeview/recentprojectwidget.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_WELCOMEVIEW_RECENTPROJECTWIDGET_H
#define DAREFL_WELCOMEVIEW_RECENTPROJECTWIDGET_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
#include <memory>
#include <vector>
diff --git a/gui2/welcomeview/userinteractor.cpp b/gui2/welcomeview/userinteractor.cpp
index bb94b42c87f..37c6af6b13f 100644
--- a/gui2/welcomeview/userinteractor.cpp
+++ b/gui2/welcomeview/userinteractor.cpp
@@ -7,14 +7,14 @@
//
// ************************************************************************** //
-#include <QFileDialog>
-#include <QMessageBox>
-#include "gui2/welcomeview/recentprojectsettings.h"
#include "gui2/welcomeview/userinteractor.h"
-#include <map>
+#include "gui2/welcomeview/recentprojectsettings.h"
#include "mvvm/project/project_types.h"
#include "mvvm/project/projectutils.h"
#include "mvvm/utils/fileutils.h"
+#include <QFileDialog>
+#include <QMessageBox>
+#include <map>
using namespace ModelView;
diff --git a/gui2/welcomeview/welcomeview.cpp b/gui2/welcomeview/welcomeview.cpp
index de3f5a29196..fcfc57c986a 100644
--- a/gui2/welcomeview/welcomeview.cpp
+++ b/gui2/welcomeview/welcomeview.cpp
@@ -7,17 +7,17 @@
//
// ************************************************************************** //
-#include <QApplication>
-#include <QHBoxLayout>
-#include <QMainWindow>
+#include "gui2/welcomeview/welcomeview.h"
#include "gui2/model/applicationmodels.h"
#include "gui2/welcomeview/openprojectwidget.h"
#include "gui2/welcomeview/projecthandler.h"
#include "gui2/welcomeview/recentprojectsettings.h"
#include "gui2/welcomeview/recentprojectwidget.h"
-#include "gui2/welcomeview/welcomeview.h"
#include "mvvm/project/projectutils.h"
#include "mvvm/widgets/widgetutils.h"
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QMainWindow>
namespace DaRefl {
diff --git a/gui2/welcomeview/welcomeview.h b/gui2/welcomeview/welcomeview.h
index 0a4fd33afbe..f90248d5e88 100644
--- a/gui2/welcomeview/welcomeview.h
+++ b/gui2/welcomeview/welcomeview.h
@@ -10,8 +10,8 @@
#ifndef DAREFL_WELCOMEVIEW_WELCOMEVIEW_H
#define DAREFL_WELCOMEVIEW_WELCOMEVIEW_H
-#include <QWidget>
#include "darefl_export.h"
+#include <QWidget>
#include <memory>
namespace DaRefl {
diff --git a/mvvm/model/mvvm/commands/abstractitemcommand.h b/mvvm/model/mvvm/commands/abstractitemcommand.h
index bb877fdc534..87d527d108b 100644
--- a/mvvm/model/mvvm/commands/abstractitemcommand.h
+++ b/mvvm/model/mvvm/commands/abstractitemcommand.h
@@ -10,9 +10,9 @@
#ifndef MVVM_COMMANDS_ABSTRACTITEMCOMMAND_H
#define MVVM_COMMANDS_ABSTRACTITEMCOMMAND_H
-#include <memory>
#include "mvvm/commands/commandresult.h"
#include "mvvm/model_export.h"
+#include <memory>
#include <string>
namespace ModelView {
diff --git a/mvvm/model/mvvm/commands/commandadapter.cpp b/mvvm/model/mvvm/commands/commandadapter.cpp
index 2e6f9efad8a..2f139f4bb1b 100644
--- a/mvvm/model/mvvm/commands/commandadapter.cpp
+++ b/mvvm/model/mvvm/commands/commandadapter.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/commands/abstractitemcommand.h"
#include "mvvm/commands/commandadapter.h"
+#include "mvvm/commands/abstractitemcommand.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/commands/commandadapter.h b/mvvm/model/mvvm/commands/commandadapter.h
index 7ce98597538..b7fc978090c 100644
--- a/mvvm/model/mvvm/commands/commandadapter.h
+++ b/mvvm/model/mvvm/commands/commandadapter.h
@@ -10,9 +10,9 @@
#ifndef MVVM_COMMANDS_COMMANDADAPTER_H
#define MVVM_COMMANDS_COMMANDADAPTER_H
+#include "mvvm/model_export.h"
#include <QUndoCommand>
#include <memory>
-#include "mvvm/model_export.h"
namespace ModelView {
diff --git a/mvvm/model/mvvm/commands/commandservice.h b/mvvm/model/mvvm/commands/commandservice.h
index 13de6325863..441a2f87473 100644
--- a/mvvm/model/mvvm/commands/commandservice.h
+++ b/mvvm/model/mvvm/commands/commandservice.h
@@ -10,12 +10,12 @@
#ifndef MVVM_COMMANDS_COMMANDSERVICE_H
#define MVVM_COMMANDS_COMMANDSERVICE_H
-#include <memory>
#include "mvvm/commands/commandresult.h"
#include "mvvm/commands/undostack.h"
#include "mvvm/core/variant.h"
#include "mvvm/model/function_types.h"
#include "mvvm/model_export.h"
+#include <memory>
class QUndoCommand;
diff --git a/mvvm/model/mvvm/commands/commandutils.h b/mvvm/model/mvvm/commands/commandutils.h
index 878f5589301..636b2c610d3 100644
--- a/mvvm/model/mvvm/commands/commandutils.h
+++ b/mvvm/model/mvvm/commands/commandutils.h
@@ -13,9 +13,9 @@
//! @file commandutils.h
//! Collection of various utility functions for command service.
-#include <memory>
#include "mvvm/interfaces/itembackupstrategy.h"
#include "mvvm/interfaces/itemcopystrategy.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/commands/copyitemcommand.cpp b/mvvm/model/mvvm/commands/copyitemcommand.cpp
index 8943697b25a..5228e01eebf 100644
--- a/mvvm/model/mvvm/commands/copyitemcommand.cpp
+++ b/mvvm/model/mvvm/commands/copyitemcommand.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/commands/commandutils.h"
#include "mvvm/commands/copyitemcommand.h"
+#include "mvvm/commands/commandutils.h"
#include "mvvm/interfaces/itembackupstrategy.h"
#include "mvvm/interfaces/itemcopystrategy.h"
#include "mvvm/model/path.h"
diff --git a/mvvm/model/mvvm/commands/moveitemcommand.h b/mvvm/model/mvvm/commands/moveitemcommand.h
index 0cbe280abf9..6e446bf9c41 100644
--- a/mvvm/model/mvvm/commands/moveitemcommand.h
+++ b/mvvm/model/mvvm/commands/moveitemcommand.h
@@ -10,8 +10,8 @@
#ifndef MVVM_COMMANDS_MOVEITEMCOMMAND_H
#define MVVM_COMMANDS_MOVEITEMCOMMAND_H
-#include <memory>
#include "mvvm/commands/abstractitemcommand.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/commands/removeitemcommand.cpp b/mvvm/model/mvvm/commands/removeitemcommand.cpp
index c7d5ab9acb5..1a0c3a8052e 100644
--- a/mvvm/model/mvvm/commands/removeitemcommand.cpp
+++ b/mvvm/model/mvvm/commands/removeitemcommand.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/commands/commandutils.h"
#include "mvvm/commands/removeitemcommand.h"
+#include "mvvm/commands/commandutils.h"
#include "mvvm/interfaces/itembackupstrategy.h"
#include "mvvm/model/path.h"
#include "mvvm/model/sessionitem.h"
diff --git a/mvvm/model/mvvm/commands/undostack.cpp b/mvvm/model/mvvm/commands/undostack.cpp
index 0e3298ba0ca..779d3214678 100644
--- a/mvvm/model/mvvm/commands/undostack.cpp
+++ b/mvvm/model/mvvm/commands/undostack.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include <QUndoStack>
-#include "mvvm/commands/commandadapter.h"
#include "mvvm/commands/undostack.h"
+#include "mvvm/commands/commandadapter.h"
+#include <QUndoStack>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/commands/undostack.h b/mvvm/model/mvvm/commands/undostack.h
index f1ef560056d..01996f87265 100644
--- a/mvvm/model/mvvm/commands/undostack.h
+++ b/mvvm/model/mvvm/commands/undostack.h
@@ -10,9 +10,9 @@
#ifndef MVVM_COMMANDS_UNDOSTACK_H
#define MVVM_COMMANDS_UNDOSTACK_H
-#include <memory>
#include "mvvm/interfaces/undostackinterface.h"
#include "mvvm/model_export.h"
+#include <memory>
class QUndoStack;
diff --git a/mvvm/model/mvvm/core/uniqueidgenerator.cpp b/mvvm/model/mvvm/core/uniqueidgenerator.cpp
index 8640af93192..74eebef6e1f 100644
--- a/mvvm/model/mvvm/core/uniqueidgenerator.cpp
+++ b/mvvm/model/mvvm/core/uniqueidgenerator.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include <QUuid>
#include "mvvm/core/uniqueidgenerator.h"
+#include <QUuid>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/factories/itemconverterfactory.h b/mvvm/model/mvvm/factories/itemconverterfactory.h
index 895eb26d2a9..7d470905a4a 100644
--- a/mvvm/model/mvvm/factories/itemconverterfactory.h
+++ b/mvvm/model/mvvm/factories/itemconverterfactory.h
@@ -13,8 +13,8 @@
//! @file itemconverterfactory.h
//! Collection of factory functions to create SessionItem converters to/from serialized content.
-#include <memory>
#include "mvvm/serialization/jsonitemconverterinterface.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/factories/modelconverterfactory.cpp b/mvvm/model/mvvm/factories/modelconverterfactory.cpp
index 00bc60f2046..0e4585b05ca 100644
--- a/mvvm/model/mvvm/factories/modelconverterfactory.cpp
+++ b/mvvm/model/mvvm/factories/modelconverterfactory.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/factories/itemconverterfactory.h"
#include "mvvm/factories/modelconverterfactory.h"
+#include "mvvm/factories/itemconverterfactory.h"
#include "mvvm/serialization/jsonitem_types.h"
#include "mvvm/serialization/jsonmodelconverter.h"
diff --git a/mvvm/model/mvvm/factories/modelconverterfactory.h b/mvvm/model/mvvm/factories/modelconverterfactory.h
index 0d006c313dd..f9bb99e4ea8 100644
--- a/mvvm/model/mvvm/factories/modelconverterfactory.h
+++ b/mvvm/model/mvvm/factories/modelconverterfactory.h
@@ -13,8 +13,8 @@
//! @file modelconverterfactory.h
//! Collection of factory functions to create SessionModel converters to/from serialized content.
-#include <memory>
#include "mvvm/serialization/jsonmodelconverterinterface.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/factories/modeldocumentfactory.h b/mvvm/model/mvvm/factories/modeldocumentfactory.h
index 66e790bfb02..6b926f8da4b 100644
--- a/mvvm/model/mvvm/factories/modeldocumentfactory.h
+++ b/mvvm/model/mvvm/factories/modeldocumentfactory.h
@@ -10,8 +10,8 @@
#ifndef MVVM_FACTORIES_MODELDOCUMENTFACTORY_H
#define MVVM_FACTORIES_MODELDOCUMENTFACTORY_H
-#include <memory>
#include "mvvm/interfaces/modeldocumentinterface.h"
+#include <memory>
#include <vector>
namespace ModelView {
diff --git a/mvvm/model/mvvm/factories/projectmanagerfactory.h b/mvvm/model/mvvm/factories/projectmanagerfactory.h
index 1c7deaf94fa..8942ef43880 100644
--- a/mvvm/model/mvvm/factories/projectmanagerfactory.h
+++ b/mvvm/model/mvvm/factories/projectmanagerfactory.h
@@ -10,8 +10,8 @@
#ifndef MVVM_FACTORIES_PROJECTMANAGERFACTORY_H
#define MVVM_FACTORIES_PROJECTMANAGERFACTORY_H
-#include <memory>
#include "mvvm/interfaces/projectmanagerinterface.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/interfaces/itembackupstrategy.h b/mvvm/model/mvvm/interfaces/itembackupstrategy.h
index 2158cee9c04..43e560f1d9d 100644
--- a/mvvm/model/mvvm/interfaces/itembackupstrategy.h
+++ b/mvvm/model/mvvm/interfaces/itembackupstrategy.h
@@ -10,8 +10,8 @@
#ifndef MVVM_SERIALIZATION_ITEMBACKUPSTRATEGY_H
#define MVVM_SERIALIZATION_ITEMBACKUPSTRATEGY_H
-#include <memory>
#include "mvvm/model_export.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/interfaces/itemcopystrategy.h b/mvvm/model/mvvm/interfaces/itemcopystrategy.h
index 1c03adb1e2d..8a463a60c5c 100644
--- a/mvvm/model/mvvm/interfaces/itemcopystrategy.h
+++ b/mvvm/model/mvvm/interfaces/itemcopystrategy.h
@@ -10,8 +10,8 @@
#ifndef MVVM_SERIALIZATION_ITEMCOPYSTRATEGY_H
#define MVVM_SERIALIZATION_ITEMCOPYSTRATEGY_H
-#include <memory>
#include "mvvm/model_export.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/interfaces/itemfactoryinterface.h b/mvvm/model/mvvm/interfaces/itemfactoryinterface.h
index 539f7500457..8e479dc8d83 100644
--- a/mvvm/model/mvvm/interfaces/itemfactoryinterface.h
+++ b/mvvm/model/mvvm/interfaces/itemfactoryinterface.h
@@ -10,10 +10,10 @@
#ifndef MVVM_MODEL_ITEMFACTORYINTERFACE_H
#define MVVM_MODEL_ITEMFACTORYINTERFACE_H
-#include <memory>
#include "mvvm/core/types.h"
#include "mvvm/model/function_types.h"
#include "mvvm/model_export.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/model/comparators.cpp b/mvvm/model/mvvm/model/comparators.cpp
index 3d0db213cba..50423e9835f 100644
--- a/mvvm/model/mvvm/model/comparators.cpp
+++ b/mvvm/model/mvvm/model/comparators.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
-#include <QMetaType>
-#include "mvvm/model/comboproperty.h"
#include "mvvm/model/comparators.h"
+#include "mvvm/model/comboproperty.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/utils/reallimits.h"
+#include <QMetaType>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/customvariants.cpp b/mvvm/model/mvvm/model/customvariants.cpp
index c669c202fa0..3fe17afed8a 100644
--- a/mvvm/model/mvvm/model/customvariants.cpp
+++ b/mvvm/model/mvvm/model/customvariants.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/comboproperty.h"
#include "mvvm/model/customvariants.h"
+#include "mvvm/model/comboproperty.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/model/variant_constants.h"
diff --git a/mvvm/model/mvvm/model/customvariants.h b/mvvm/model/mvvm/model/customvariants.h
index 1995b8d5683..8fb4d9ef93b 100644
--- a/mvvm/model/mvvm/model/customvariants.h
+++ b/mvvm/model/mvvm/model/customvariants.h
@@ -13,10 +13,10 @@
//! @file customvariants.h
//! Registrations and translations for custom variants.
-#include <QMetaType>
#include "mvvm/core/variant.h"
#include "mvvm/model_export.h"
#include "mvvm/utils/reallimits.h"
+#include <QMetaType>
#include <string>
#include <vector>
diff --git a/mvvm/model/mvvm/model/datarole.cpp b/mvvm/model/mvvm/model/datarole.cpp
index d6930004664..8203f753bb3 100644
--- a/mvvm/model/mvvm/model/datarole.cpp
+++ b/mvvm/model/mvvm/model/datarole.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/customvariants.h"
#include "mvvm/model/datarole.h"
+#include "mvvm/model/customvariants.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/externalproperty.h b/mvvm/model/mvvm/model/externalproperty.h
index 85d18a41ca3..d2bc3c0c4e5 100644
--- a/mvvm/model/mvvm/model/externalproperty.h
+++ b/mvvm/model/mvvm/model/externalproperty.h
@@ -10,9 +10,9 @@
#ifndef MVVM_MODEL_EXTERNALPROPERTY_H
#define MVVM_MODEL_EXTERNALPROPERTY_H
-#include <QColor>
#include "mvvm/core/variant.h"
#include "mvvm/model_export.h"
+#include <QColor>
#include <string>
namespace ModelView {
diff --git a/mvvm/model/mvvm/model/groupitem.cpp b/mvvm/model/mvvm/model/groupitem.cpp
index 04cd3468f57..a99d2f899fc 100644
--- a/mvvm/model/mvvm/model/groupitem.cpp
+++ b/mvvm/model/mvvm/model/groupitem.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/comboproperty.h"
#include "mvvm/model/groupitem.h"
+#include "mvvm/model/comboproperty.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/utils/containerutils.h"
#include <stdexcept>
diff --git a/mvvm/model/mvvm/model/groupitem.h b/mvvm/model/mvvm/model/groupitem.h
index f1a7a1c3ac0..78babe706b4 100644
--- a/mvvm/model/mvvm/model/groupitem.h
+++ b/mvvm/model/mvvm/model/groupitem.h
@@ -10,9 +10,9 @@
#ifndef MVVM_MODEL_GROUPITEM_H
#define MVVM_MODEL_GROUPITEM_H
-#include <memory>
#include "mvvm/model/itemcatalogue.h"
#include "mvvm/model/sessionitem.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/model/itemfactory.cpp b/mvvm/model/mvvm/model/itemfactory.cpp
index 282372e67a5..04a733e5a9d 100644
--- a/mvvm/model/mvvm/model/itemfactory.cpp
+++ b/mvvm/model/mvvm/model/itemfactory.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/itemcatalogue.h"
#include "mvvm/model/itemfactory.h"
+#include "mvvm/model/itemcatalogue.h"
#include "mvvm/model/sessionitem.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/itemfactory.h b/mvvm/model/mvvm/model/itemfactory.h
index 5a52ee34e8f..02090fce2e7 100644
--- a/mvvm/model/mvvm/model/itemfactory.h
+++ b/mvvm/model/mvvm/model/itemfactory.h
@@ -10,9 +10,9 @@
#ifndef MVVM_MODEL_ITEMFACTORY_H
#define MVVM_MODEL_ITEMFACTORY_H
-#include <memory>
#include "mvvm/interfaces/itemfactoryinterface.h"
#include "mvvm/model_export.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/model/itemmanager.cpp b/mvvm/model/mvvm/model/itemmanager.cpp
index 801cd5124b5..6a76b70bbf9 100644
--- a/mvvm/model/mvvm/model/itemmanager.cpp
+++ b/mvvm/model/mvvm/model/itemmanager.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/model/itemmanager.h"
#include "mvvm/factories/itemcataloguefactory.h"
#include "mvvm/model/itemfactory.h"
-#include "mvvm/model/itemmanager.h"
#include "mvvm/model/itempool.h"
#include "mvvm/model/sessionitem.h"
diff --git a/mvvm/model/mvvm/model/itemmanager.h b/mvvm/model/mvvm/model/itemmanager.h
index 7aa6c5e5304..51cb6f3592b 100644
--- a/mvvm/model/mvvm/model/itemmanager.h
+++ b/mvvm/model/mvvm/model/itemmanager.h
@@ -10,9 +10,9 @@
#ifndef MVVM_MODEL_ITEMMANAGER_H
#define MVVM_MODEL_ITEMMANAGER_H
-#include <memory>
#include "mvvm/model/mvvm_types.h"
#include "mvvm/model_export.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/model/itempool.cpp b/mvvm/model/mvvm/model/itempool.cpp
index a52873146c7..a0b8c1cacdb 100644
--- a/mvvm/model/mvvm/model/itempool.cpp
+++ b/mvvm/model/mvvm/model/itempool.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/core/uniqueidgenerator.h"
#include "mvvm/model/itempool.h"
+#include "mvvm/core/uniqueidgenerator.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/itempool.h b/mvvm/model/mvvm/model/itempool.h
index 04bf76d7361..c82089fa26a 100644
--- a/mvvm/model/mvvm/model/itempool.h
+++ b/mvvm/model/mvvm/model/itempool.h
@@ -10,9 +10,9 @@
#ifndef MVVM_MODEL_ITEMPOOL_H
#define MVVM_MODEL_ITEMPOOL_H
-#include <map>
#include "mvvm/model/mvvm_types.h"
#include "mvvm/model_export.h"
+#include <map>
namespace ModelView {
diff --git a/mvvm/model/mvvm/model/itemutils.cpp b/mvvm/model/mvvm/model/itemutils.cpp
index af36cef516e..0eaad7dc7d3 100644
--- a/mvvm/model/mvvm/model/itemutils.cpp
+++ b/mvvm/model/mvvm/model/itemutils.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <iterator>
#include "mvvm/model/itemutils.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/utils/containerutils.h"
+#include <iterator>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/itemutils.h b/mvvm/model/mvvm/model/itemutils.h
index 6b9a489f8dc..dfdc6f54715 100644
--- a/mvvm/model/mvvm/model/itemutils.h
+++ b/mvvm/model/mvvm/model/itemutils.h
@@ -10,8 +10,8 @@
#ifndef MVVM_MODEL_ITEMUTILS_H
#define MVVM_MODEL_ITEMUTILS_H
-#include <functional>
#include "mvvm/model_export.h"
+#include <functional>
#include <vector>
namespace ModelView {
diff --git a/mvvm/model/mvvm/model/modelutils.cpp b/mvvm/model/mvvm/model/modelutils.cpp
index cc843e585a6..d81534fad9b 100644
--- a/mvvm/model/mvvm/model/modelutils.cpp
+++ b/mvvm/model/mvvm/model/modelutils.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QJsonObject>
-#include "mvvm/interfaces/undostackinterface.h"
#include "mvvm/model/modelutils.h"
+#include "mvvm/interfaces/undostackinterface.h"
#include "mvvm/model/path.h"
+#include <QJsonObject>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/modelutils.h b/mvvm/model/mvvm/model/modelutils.h
index 269582a1ddd..f51c4c38972 100644
--- a/mvvm/model/mvvm/model/modelutils.h
+++ b/mvvm/model/mvvm/model/modelutils.h
@@ -10,12 +10,12 @@
#ifndef MVVM_MODEL_MODELUTILS_H
#define MVVM_MODEL_MODELUTILS_H
-#include <memory>
#include "mvvm/factories/modelconverterfactory.h"
#include "mvvm/model/itemutils.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model_export.h"
+#include <memory>
#include <vector>
namespace ModelView {
diff --git a/mvvm/model/mvvm/model/path.cpp b/mvvm/model/mvvm/model/path.cpp
index b015622bea9..8eab5ff4138 100644
--- a/mvvm/model/mvvm/model/path.cpp
+++ b/mvvm/model/mvvm/model/path.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/model/path.h"
#include <algorithm>
#include <iterator>
-#include "mvvm/model/path.h"
#include <numeric>
#include <sstream>
diff --git a/mvvm/model/mvvm/model/propertyitem.cpp b/mvvm/model/mvvm/model/propertyitem.cpp
index 67070635de6..5cea236ed13 100644
--- a/mvvm/model/mvvm/model/propertyitem.cpp
+++ b/mvvm/model/mvvm/model/propertyitem.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/model/propertyitem.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/mvvm_types.h"
-#include "mvvm/model/propertyitem.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/sessionitem.cpp b/mvvm/model/mvvm/model/sessionitem.cpp
index 1c2329eb885..52c80833dc3 100644
--- a/mvvm/model/mvvm/model/sessionitem.cpp
+++ b/mvvm/model/mvvm/model/sessionitem.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/model/sessionitem.h"
#include "mvvm/core/uniqueidgenerator.h"
#include "mvvm/model/customvariants.h"
-#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionitemdata.h"
#include "mvvm/model/sessionitemtags.h"
#include "mvvm/model/sessionmodel.h"
diff --git a/mvvm/model/mvvm/model/sessionitem.h b/mvvm/model/mvvm/model/sessionitem.h
index 78ccca9f8fd..03de212d4b0 100644
--- a/mvvm/model/mvvm/model/sessionitem.h
+++ b/mvvm/model/mvvm/model/sessionitem.h
@@ -10,12 +10,12 @@
#ifndef MVVM_MODEL_SESSIONITEM_H
#define MVVM_MODEL_SESSIONITEM_H
-#include <memory>
#include "mvvm/core/variant.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/mvvm_types.h"
#include "mvvm/model/tagrow.h"
#include "mvvm/model_export.h"
+#include <memory>
#include <stdexcept>
#include <type_traits>
#include <vector>
diff --git a/mvvm/model/mvvm/model/sessionitemcontainer.cpp b/mvvm/model/mvvm/model/sessionitemcontainer.cpp
index 54d99768c96..05bb665e2f9 100644
--- a/mvvm/model/mvvm/model/sessionitemcontainer.cpp
+++ b/mvvm/model/mvvm/model/sessionitemcontainer.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionitemcontainer.h"
+#include "mvvm/model/sessionitem.h"
#include "mvvm/utils/containerutils.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/sessionitemdata.cpp b/mvvm/model/mvvm/model/sessionitemdata.cpp
index 7674c8dcf32..95d630a1d72 100644
--- a/mvvm/model/mvvm/model/sessionitemdata.cpp
+++ b/mvvm/model/mvvm/model/sessionitemdata.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include <algorithm>
-#include "mvvm/model/customvariants.h"
#include "mvvm/model/sessionitemdata.h"
+#include "mvvm/model/customvariants.h"
+#include <algorithm>
#include <sstream>
#include <stdexcept>
diff --git a/mvvm/model/mvvm/model/sessionitemtags.cpp b/mvvm/model/mvvm/model/sessionitemtags.cpp
index 9836e548d41..3d5ea386dde 100644
--- a/mvvm/model/mvvm/model/sessionitemtags.cpp
+++ b/mvvm/model/mvvm/model/sessionitemtags.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/sessionitemcontainer.h"
#include "mvvm/model/sessionitemtags.h"
+#include "mvvm/model/sessionitemcontainer.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/model/sessionmodel.cpp b/mvvm/model/mvvm/model/sessionmodel.cpp
index 6a2a94973b6..c3f01d3a5f9 100644
--- a/mvvm/model/mvvm/model/sessionmodel.cpp
+++ b/mvvm/model/mvvm/model/sessionmodel.cpp
@@ -7,6 +7,7 @@
//
// ************************************************************************** //
+#include "mvvm/model/sessionmodel.h"
#include "mvvm/commands/commandservice.h"
#include "mvvm/factories/itemcataloguefactory.h"
#include "mvvm/model/customvariants.h"
@@ -16,7 +17,6 @@
#include "mvvm/model/itempool.h"
#include "mvvm/model/itemutils.h"
#include "mvvm/model/sessionitem.h"
-#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/model/tagrow.h"
#include "mvvm/signals/modelmapper.h"
diff --git a/mvvm/model/mvvm/model/sessionmodel.h b/mvvm/model/mvvm/model/sessionmodel.h
index bb29722e7f9..71f388ccc98 100644
--- a/mvvm/model/mvvm/model/sessionmodel.h
+++ b/mvvm/model/mvvm/model/sessionmodel.h
@@ -10,13 +10,13 @@
#ifndef MVVM_MODEL_SESSIONMODEL_H
#define MVVM_MODEL_SESSIONMODEL_H
-#include <memory>
#include "mvvm/core/types.h"
#include "mvvm/core/variant.h"
#include "mvvm/model/function_types.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/tagrow.h"
#include "mvvm/model_export.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/model/taginfo.cpp b/mvvm/model/mvvm/model/taginfo.cpp
index f287e8f2e32..dc2c40d4db4 100644
--- a/mvvm/model/mvvm/model/taginfo.cpp
+++ b/mvvm/model/mvvm/model/taginfo.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include <algorithm>
#include "mvvm/model/taginfo.h"
#include "mvvm/utils/containerutils.h"
+#include <algorithm>
#include <sstream>
#include <stdexcept>
diff --git a/mvvm/model/mvvm/project/modelhaschangedcontroller.h b/mvvm/model/mvvm/project/modelhaschangedcontroller.h
index f566ac89c1f..8698227efe8 100644
--- a/mvvm/model/mvvm/project/modelhaschangedcontroller.h
+++ b/mvvm/model/mvvm/project/modelhaschangedcontroller.h
@@ -10,8 +10,8 @@
#ifndef MVVM_PROJECT_MODELHASCHANGEDCONTROLLER_H
#define MVVM_PROJECT_MODELHASCHANGEDCONTROLLER_H
-#include <functional>
#include "mvvm/signals/modellistener.h"
+#include <functional>
namespace ModelView {
diff --git a/mvvm/model/mvvm/project/project.cpp b/mvvm/model/mvvm/project/project.cpp
index 08e15e6115e..f368c9cce99 100644
--- a/mvvm/model/mvvm/project/project.cpp
+++ b/mvvm/model/mvvm/project/project.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include <functional>
-#include "mvvm/factories/modeldocumentfactory.h"
#include "mvvm/project/project.h"
+#include "mvvm/factories/modeldocumentfactory.h"
#include "mvvm/project/project_types.h"
#include "mvvm/project/projectchangecontroller.h"
#include "mvvm/project/projectutils.h"
#include "mvvm/utils/fileutils.h"
+#include <functional>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/project/project.h b/mvvm/model/mvvm/project/project.h
index 62e1f2ccd7f..19515fe585b 100644
--- a/mvvm/model/mvvm/project/project.h
+++ b/mvvm/model/mvvm/project/project.h
@@ -10,8 +10,8 @@
#ifndef MVVM_PROJECT_PROJECT_H
#define MVVM_PROJECT_PROJECT_H
-#include <memory>
#include "mvvm/interfaces/projectinterface.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/project/project_types.h b/mvvm/model/mvvm/project/project_types.h
index 5d2932ea069..b82b1f2cebc 100644
--- a/mvvm/model/mvvm/project/project_types.h
+++ b/mvvm/model/mvvm/project/project_types.h
@@ -10,8 +10,8 @@
#ifndef MVVM_PROJECT_PROJECT_TYPES_H
#define MVVM_PROJECT_PROJECT_TYPES_H
-#include <functional>
#include "mvvm/model_export.h"
+#include <functional>
#include <string>
#include <vector>
diff --git a/mvvm/model/mvvm/project/projectchangecontroller.cpp b/mvvm/model/mvvm/project/projectchangecontroller.cpp
index a34bff9e151..5ad20afb3dd 100644
--- a/mvvm/model/mvvm/project/projectchangecontroller.cpp
+++ b/mvvm/model/mvvm/project/projectchangecontroller.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/project/projectchangecontroller.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/project/modelhaschangedcontroller.h"
-#include "mvvm/project/projectchangecontroller.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/project/projectchangecontroller.h b/mvvm/model/mvvm/project/projectchangecontroller.h
index b24de5c48a2..db8fdf617ff 100644
--- a/mvvm/model/mvvm/project/projectchangecontroller.h
+++ b/mvvm/model/mvvm/project/projectchangecontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PROJECT_PROJECTCHANGECONTROLLER_H
#define MVVM_PROJECT_PROJECTCHANGECONTROLLER_H
+#include "mvvm/model_export.h"
#include <functional>
#include <memory>
-#include "mvvm/model_export.h"
#include <vector>
namespace ModelView {
diff --git a/mvvm/model/mvvm/project/projectmanager.cpp b/mvvm/model/mvvm/project/projectmanager.cpp
index f8af93aff70..e103804de0c 100644
--- a/mvvm/model/mvvm/project/projectmanager.cpp
+++ b/mvvm/model/mvvm/project/projectmanager.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/project/projectmanager.h"
#include "mvvm/interfaces/projectinterface.h"
#include "mvvm/project/project_types.h"
-#include "mvvm/project/projectmanager.h"
#include "mvvm/project/projectutils.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/project/projectmanager.h b/mvvm/model/mvvm/project/projectmanager.h
index b9bee7329d8..7355b43ec09 100644
--- a/mvvm/model/mvvm/project/projectmanager.h
+++ b/mvvm/model/mvvm/project/projectmanager.h
@@ -10,8 +10,8 @@
#ifndef MVVM_PROJECT_PROJECTMANAGER_H
#define MVVM_PROJECT_PROJECTMANAGER_H
-#include <memory>
#include "mvvm/interfaces/projectmanagerinterface.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/project/projectmanagerdecorator.cpp b/mvvm/model/mvvm/project/projectmanagerdecorator.cpp
index 28ecd97c575..911978a63b4 100644
--- a/mvvm/model/mvvm/project/projectmanagerdecorator.cpp
+++ b/mvvm/model/mvvm/project/projectmanagerdecorator.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/project/projectmanagerdecorator.h"
#include "mvvm/interfaces/projectinterface.h"
#include "mvvm/project/project_types.h"
#include "mvvm/project/projectmanager.h"
-#include "mvvm/project/projectmanagerdecorator.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/project/projectmanagerdecorator.h b/mvvm/model/mvvm/project/projectmanagerdecorator.h
index 80997c8a279..0876703b60f 100644
--- a/mvvm/model/mvvm/project/projectmanagerdecorator.h
+++ b/mvvm/model/mvvm/project/projectmanagerdecorator.h
@@ -10,8 +10,8 @@
#ifndef MVVM_PROJECT_PROJECTMANAGERDECORATOR_H
#define MVVM_PROJECT_PROJECTMANAGERDECORATOR_H
-#include <memory>
#include "mvvm/interfaces/projectmanagerinterface.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/project/projectutils.cpp b/mvvm/model/mvvm/project/projectutils.cpp
index 1e5b8218489..24525a79841 100644
--- a/mvvm/model/mvvm/project/projectutils.cpp
+++ b/mvvm/model/mvvm/project/projectutils.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include <cctype>
+#include "mvvm/project/projectutils.h"
#include "mvvm/interfaces/applicationmodelsinterface.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/project/project.h"
#include "mvvm/project/project_types.h"
-#include "mvvm/project/projectutils.h"
#include "mvvm/utils/fileutils.h"
+#include <cctype>
namespace {
const std::string json_extention = ".json";
diff --git a/mvvm/model/mvvm/project/projectutils.h b/mvvm/model/mvvm/project/projectutils.h
index 5b88cdbf418..43db11659e0 100644
--- a/mvvm/model/mvvm/project/projectutils.h
+++ b/mvvm/model/mvvm/project/projectutils.h
@@ -10,8 +10,8 @@
#ifndef MVVM_PROJECT_PROJECTUTILS_H
#define MVVM_PROJECT_PROJECTUTILS_H
-#include <memory>
#include "mvvm/model_export.h"
+#include <memory>
#include <string>
#include <vector>
diff --git a/mvvm/model/mvvm/serialization/compatibilityutils.cpp b/mvvm/model/mvvm/serialization/compatibilityutils.cpp
index 09b24ad2d40..9c770d692e7 100644
--- a/mvvm/model/mvvm/serialization/compatibilityutils.cpp
+++ b/mvvm/model/mvvm/serialization/compatibilityutils.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/serialization/compatibilityutils.h"
#include "mvvm/model/groupitem.h"
#include "mvvm/model/sessionitemcontainer.h"
#include "mvvm/model/sessionitemdata.h"
-#include "mvvm/serialization/compatibilityutils.h"
#include <set>
namespace ModelView ::Compatibility {
diff --git a/mvvm/model/mvvm/serialization/compatibilityutils.h b/mvvm/model/mvvm/serialization/compatibilityutils.h
index 3f60d09dfe1..5e7bb99b9f3 100644
--- a/mvvm/model/mvvm/serialization/compatibilityutils.h
+++ b/mvvm/model/mvvm/serialization/compatibilityutils.h
@@ -13,8 +13,8 @@
//! @file compatibilityutils.h
//! @brief Place for utils to fix back compatibility of serialized projects.
-#include <memory>
#include "mvvm/model_export.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/serialization/jsondocument.cpp b/mvvm/model/mvvm/serialization/jsondocument.cpp
index 2b595af16c2..2a0aaf30429 100644
--- a/mvvm/model/mvvm/serialization/jsondocument.cpp
+++ b/mvvm/model/mvvm/serialization/jsondocument.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
+#include "mvvm/serialization/jsondocument.h"
+#include "mvvm/factories/modelconverterfactory.h"
+#include "mvvm/model/sessionmodel.h"
#include <QFile>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
-#include "mvvm/factories/modelconverterfactory.h"
-#include "mvvm/model/sessionmodel.h"
-#include "mvvm/serialization/jsondocument.h"
#include <sstream>
#include <stdexcept>
diff --git a/mvvm/model/mvvm/serialization/jsondocument.h b/mvvm/model/mvvm/serialization/jsondocument.h
index 02f6747aa4a..c954a68a89f 100644
--- a/mvvm/model/mvvm/serialization/jsondocument.h
+++ b/mvvm/model/mvvm/serialization/jsondocument.h
@@ -10,8 +10,8 @@
#ifndef MVVM_SERIALIZATION_JSONDOCUMENT_H
#define MVVM_SERIALIZATION_JSONDOCUMENT_H
-#include <memory>
#include "mvvm/interfaces/modeldocumentinterface.h"
+#include <memory>
#include <vector>
namespace ModelView {
diff --git a/mvvm/model/mvvm/serialization/jsonitem_types.h b/mvvm/model/mvvm/serialization/jsonitem_types.h
index 523032f36e3..138670b0b0d 100644
--- a/mvvm/model/mvvm/serialization/jsonitem_types.h
+++ b/mvvm/model/mvvm/serialization/jsonitem_types.h
@@ -13,9 +13,9 @@
//! @file jsonitem_types.h
//! Collection of custom types involved into SessionItem and JSON mutual convertion.
+#include "mvvm/model_export.h"
#include <functional>
#include <memory>
-#include "mvvm/model_export.h"
#include <vector>
class QJsonObject;
diff --git a/mvvm/model/mvvm/serialization/jsonitembackupstrategy.cpp b/mvvm/model/mvvm/serialization/jsonitembackupstrategy.cpp
index 1647750f147..30db0945f21 100644
--- a/mvvm/model/mvvm/serialization/jsonitembackupstrategy.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitembackupstrategy.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitembackupstrategy.h"
#include "mvvm/factories/itemconverterfactory.h"
#include "mvvm/model/sessionitem.h"
-#include "mvvm/serialization/jsonitembackupstrategy.h"
+#include <QJsonObject>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsonitembackupstrategy.h b/mvvm/model/mvvm/serialization/jsonitembackupstrategy.h
index 10bac8aa2c8..0af9d74586e 100644
--- a/mvvm/model/mvvm/serialization/jsonitembackupstrategy.h
+++ b/mvvm/model/mvvm/serialization/jsonitembackupstrategy.h
@@ -10,8 +10,8 @@
#ifndef MVVM_SERIALIZATION_JSONITEMBACKUPSTRATEGY_H
#define MVVM_SERIALIZATION_JSONITEMBACKUPSTRATEGY_H
-#include <memory>
#include "mvvm/interfaces/itembackupstrategy.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.cpp b/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.cpp
index e96e4819ed8..a2e1ef9386c 100644
--- a/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.cpp
@@ -7,17 +7,17 @@
//
// ************************************************************************** //
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitemcontainerconverter.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionitemcontainer.h"
#include "mvvm/model/sessionitemtags.h"
#include "mvvm/model/tagrow.h"
#include "mvvm/serialization/compatibilityutils.h"
#include "mvvm/serialization/jsonitem_types.h"
-#include "mvvm/serialization/jsonitemcontainerconverter.h"
#include "mvvm/serialization/jsonitemformatassistant.h"
#include "mvvm/serialization/jsontaginfoconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.h b/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.h
index 2a47cb53b40..1710f4b6875 100644
--- a/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.h
+++ b/mvvm/model/mvvm/serialization/jsonitemcontainerconverter.h
@@ -10,9 +10,9 @@
#ifndef MVVM_SERIALIZATION_JSONITEMCONTAINERCONVERTER_H
#define MVVM_SERIALIZATION_JSONITEMCONTAINERCONVERTER_H
+#include "mvvm/model_export.h"
#include <functional>
#include <memory>
-#include "mvvm/model_export.h"
class QJsonObject;
diff --git a/mvvm/model/mvvm/serialization/jsonitemconverter.cpp b/mvvm/model/mvvm/serialization/jsonitemconverter.cpp
index 38e76cc2dda..e441bb3caa0 100644
--- a/mvvm/model/mvvm/serialization/jsonitemconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemconverter.cpp
@@ -7,18 +7,18 @@
//
// ************************************************************************** //
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitemconverter.h"
#include "mvvm/core/uniqueidgenerator.h"
#include "mvvm/interfaces/itemfactoryinterface.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionitemdata.h"
#include "mvvm/model/sessionitemtags.h"
#include "mvvm/serialization/jsonitem_types.h"
-#include "mvvm/serialization/jsonitemconverter.h"
#include "mvvm/serialization/jsonitemdataconverter.h"
#include "mvvm/serialization/jsonitemformatassistant.h"
#include "mvvm/serialization/jsonitemtagsconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsonitemconverterinterface.h b/mvvm/model/mvvm/serialization/jsonitemconverterinterface.h
index 29c523ee6d2..8665e5418db 100644
--- a/mvvm/model/mvvm/serialization/jsonitemconverterinterface.h
+++ b/mvvm/model/mvvm/serialization/jsonitemconverterinterface.h
@@ -10,8 +10,8 @@
#ifndef MVVM_SERIALIZATION_JSONITEMCONVERTERINTERFACE_H
#define MVVM_SERIALIZATION_JSONITEMCONVERTERINTERFACE_H
-#include <memory>
#include "mvvm/model_export.h"
+#include <memory>
class QJsonObject;
diff --git a/mvvm/model/mvvm/serialization/jsonitemcopystrategy.cpp b/mvvm/model/mvvm/serialization/jsonitemcopystrategy.cpp
index be4f63d51a4..9eece22d4fb 100644
--- a/mvvm/model/mvvm/serialization/jsonitemcopystrategy.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemcopystrategy.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitemcopystrategy.h"
#include "mvvm/factories/itemconverterfactory.h"
#include "mvvm/model/sessionitem.h"
-#include "mvvm/serialization/jsonitemcopystrategy.h"
+#include <QJsonObject>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsonitemcopystrategy.h b/mvvm/model/mvvm/serialization/jsonitemcopystrategy.h
index c51c0d02cb1..cbfe7fbf7d4 100644
--- a/mvvm/model/mvvm/serialization/jsonitemcopystrategy.h
+++ b/mvvm/model/mvvm/serialization/jsonitemcopystrategy.h
@@ -10,8 +10,8 @@
#ifndef MVVM_SERIALIZATION_JSONITEMCOPYSTRATEGY_H
#define MVVM_SERIALIZATION_JSONITEMCOPYSTRATEGY_H
-#include <memory>
#include "mvvm/interfaces/itemcopystrategy.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/serialization/jsonitemdataconverter.cpp b/mvvm/model/mvvm/serialization/jsonitemdataconverter.cpp
index 46349c38eba..718304464b9 100644
--- a/mvvm/model/mvvm/serialization/jsonitemdataconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemdataconverter.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitemdataconverter.h"
#include "mvvm/model/mvvm_types.h"
#include "mvvm/model/sessionitemdata.h"
-#include "mvvm/serialization/jsonitemdataconverter.h"
#include "mvvm/serialization/jsonitemformatassistant.h"
#include "mvvm/serialization/jsonvariantconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
#include <set>
#include <stdexcept>
diff --git a/mvvm/model/mvvm/serialization/jsonitemdataconverter.h b/mvvm/model/mvvm/serialization/jsonitemdataconverter.h
index d1f08c3b176..f3b9ba505df 100644
--- a/mvvm/model/mvvm/serialization/jsonitemdataconverter.h
+++ b/mvvm/model/mvvm/serialization/jsonitemdataconverter.h
@@ -10,10 +10,10 @@
#ifndef MVVM_SERIALIZATION_JSONITEMDATACONVERTER_H
#define MVVM_SERIALIZATION_JSONITEMDATACONVERTER_H
+#include "mvvm/serialization/jsonitemdataconverterinterface.h"
#include <QString>
#include <functional>
#include <memory>
-#include "mvvm/serialization/jsonitemdataconverterinterface.h"
class QJsonObject;
diff --git a/mvvm/model/mvvm/serialization/jsonitemdataconverterinterface.h b/mvvm/model/mvvm/serialization/jsonitemdataconverterinterface.h
index c9f83cf1048..d63f67eca4b 100644
--- a/mvvm/model/mvvm/serialization/jsonitemdataconverterinterface.h
+++ b/mvvm/model/mvvm/serialization/jsonitemdataconverterinterface.h
@@ -10,8 +10,8 @@
#ifndef MVVM_SERIALIZATION_JSONITEMDATACONVERTERINTERFACE_H
#define MVVM_SERIALIZATION_JSONITEMDATACONVERTERINTERFACE_H
-#include <memory>
#include "mvvm/model_export.h"
+#include <memory>
class QJsonArray;
diff --git a/mvvm/model/mvvm/serialization/jsonitemformatassistant.cpp b/mvvm/model/mvvm/serialization/jsonitemformatassistant.cpp
index bdade9ddea2..481706043f3 100644
--- a/mvvm/model/mvvm/serialization/jsonitemformatassistant.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemformatassistant.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/serialization/jsonitemformatassistant.h"
#include <QJsonObject>
#include <QStringList>
-#include "mvvm/serialization/jsonitemformatassistant.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsonitemformatassistant.h b/mvvm/model/mvvm/serialization/jsonitemformatassistant.h
index 8789b045e14..dfffecc44a6 100644
--- a/mvvm/model/mvvm/serialization/jsonitemformatassistant.h
+++ b/mvvm/model/mvvm/serialization/jsonitemformatassistant.h
@@ -10,9 +10,9 @@
#ifndef MVVM_SERIALIZATION_JSONITEMFORMATASSISTANT_H
#define MVVM_SERIALIZATION_JSONITEMFORMATASSISTANT_H
+#include "mvvm/serialization/jsonitemconverterinterface.h"
#include <QString>
#include <memory>
-#include "mvvm/serialization/jsonitemconverterinterface.h"
namespace ModelView {
diff --git a/mvvm/model/mvvm/serialization/jsonitemtagsconverter.cpp b/mvvm/model/mvvm/serialization/jsonitemtagsconverter.cpp
index 57d1d706dcf..79b4b0fdecd 100644
--- a/mvvm/model/mvvm/serialization/jsonitemtagsconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonitemtagsconverter.cpp
@@ -7,16 +7,16 @@
//
// ************************************************************************** //
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonitemtagsconverter.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionitemtags.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/serialization/jsonitem_types.h"
#include "mvvm/serialization/jsonitemcontainerconverter.h"
#include "mvvm/serialization/jsonitemformatassistant.h"
-#include "mvvm/serialization/jsonitemtagsconverter.h"
#include "mvvm/serialization/jsontaginfoconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsonitemtagsconverter.h b/mvvm/model/mvvm/serialization/jsonitemtagsconverter.h
index 20c13850005..b15c79b9c08 100644
--- a/mvvm/model/mvvm/serialization/jsonitemtagsconverter.h
+++ b/mvvm/model/mvvm/serialization/jsonitemtagsconverter.h
@@ -10,9 +10,9 @@
#ifndef MVVM_SERIALIZATION_JSONITEMTAGSCONVERTER_H
#define MVVM_SERIALIZATION_JSONITEMTAGSCONVERTER_H
+#include "mvvm/model_export.h"
#include <functional>
#include <memory>
-#include "mvvm/model_export.h"
class QJsonObject;
diff --git a/mvvm/model/mvvm/serialization/jsonmodelconverter.cpp b/mvvm/model/mvvm/serialization/jsonmodelconverter.cpp
index 823c4f799b5..74dc05851d6 100644
--- a/mvvm/model/mvvm/serialization/jsonmodelconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonmodelconverter.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonmodelconverter.h"
#include "mvvm/factories/itemconverterfactory.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/serialization/jsonitem_types.h"
#include "mvvm/serialization/jsonitemconverter.h"
#include "mvvm/serialization/jsonitemformatassistant.h"
-#include "mvvm/serialization/jsonmodelconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsontaginfoconverter.cpp b/mvvm/model/mvvm/serialization/jsontaginfoconverter.cpp
index 31c5e5e89f3..7209cb65bfb 100644
--- a/mvvm/model/mvvm/serialization/jsontaginfoconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsontaginfoconverter.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
+#include "mvvm/serialization/jsontaginfoconverter.h"
+#include "mvvm/model/taginfo.h"
#include <QJsonArray>
#include <QJsonObject>
#include <QStringList>
-#include "mvvm/model/taginfo.h"
-#include "mvvm/serialization/jsontaginfoconverter.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsontaginfoconverter.h b/mvvm/model/mvvm/serialization/jsontaginfoconverter.h
index 5c84053dc23..3d64e561c65 100644
--- a/mvvm/model/mvvm/serialization/jsontaginfoconverter.h
+++ b/mvvm/model/mvvm/serialization/jsontaginfoconverter.h
@@ -10,8 +10,8 @@
#ifndef MVVM_SERIALIZATION_JSONTAGINFOCONVERTER_H
#define MVVM_SERIALIZATION_JSONTAGINFOCONVERTER_H
-#include <QString>
#include "mvvm/serialization/jsontaginfoconverterinterface.h"
+#include <QString>
namespace ModelView {
diff --git a/mvvm/model/mvvm/serialization/jsonutils.cpp b/mvvm/model/mvvm/serialization/jsonutils.cpp
index 3c1c676a9e3..ccf74cfec80 100644
--- a/mvvm/model/mvvm/serialization/jsonutils.cpp
+++ b/mvvm/model/mvvm/serialization/jsonutils.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
-#include <QJsonDocument>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonutils.h"
#include "mvvm/factories/modelconverterfactory.h"
#include "mvvm/model/sessionmodel.h"
-#include "mvvm/serialization/jsonutils.h"
#include "mvvm/utils/reallimits.h"
+#include <QJsonDocument>
+#include <QJsonObject>
#include <stdexcept>
namespace {
diff --git a/mvvm/model/mvvm/serialization/jsonvariantconverter.cpp b/mvvm/model/mvvm/serialization/jsonvariantconverter.cpp
index b4f62eff467..ae49494749e 100644
--- a/mvvm/model/mvvm/serialization/jsonvariantconverter.cpp
+++ b/mvvm/model/mvvm/serialization/jsonvariantconverter.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include <QJsonArray>
-#include <QJsonObject>
+#include "mvvm/serialization/jsonvariantconverter.h"
#include "mvvm/model/comboproperty.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/model/variant_constants.h"
#include "mvvm/serialization/jsonutils.h"
-#include "mvvm/serialization/jsonvariantconverter.h"
#include "mvvm/utils/reallimits.h"
+#include <QJsonArray>
+#include <QJsonObject>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/serialization/jsonvariantconverter.h b/mvvm/model/mvvm/serialization/jsonvariantconverter.h
index bbeb458df6f..2e526434fdc 100644
--- a/mvvm/model/mvvm/serialization/jsonvariantconverter.h
+++ b/mvvm/model/mvvm/serialization/jsonvariantconverter.h
@@ -10,10 +10,10 @@
#ifndef MVVM_SERIALIZATION_JSONVARIANTCONVERTER_H
#define MVVM_SERIALIZATION_JSONVARIANTCONVERTER_H
-#include <functional>
-#include <map>
#include "mvvm/core/variant.h"
#include "mvvm/serialization/jsonvariantconverterinterface.h"
+#include <functional>
+#include <map>
#include <string>
class QJsonObject;
diff --git a/mvvm/model/mvvm/signals/callback_types.h b/mvvm/model/mvvm/signals/callback_types.h
index 91f678665f5..b558794f9d4 100644
--- a/mvvm/model/mvvm/signals/callback_types.h
+++ b/mvvm/model/mvvm/signals/callback_types.h
@@ -10,8 +10,8 @@
#ifndef MVVM_SIGNALS_CALLBACK_TYPES_H
#define MVVM_SIGNALS_CALLBACK_TYPES_H
-#include <functional>
#include "mvvm/model/tagrow.h"
+#include <functional>
#include <string>
namespace ModelView {
diff --git a/mvvm/model/mvvm/signals/callbackcontainer.h b/mvvm/model/mvvm/signals/callbackcontainer.h
index d84eff4b2c9..22305b9c4c9 100644
--- a/mvvm/model/mvvm/signals/callbackcontainer.h
+++ b/mvvm/model/mvvm/signals/callbackcontainer.h
@@ -10,11 +10,11 @@
#ifndef MVVM_SIGNALS_CALLBACKCONTAINER_H
#define MVVM_SIGNALS_CALLBACKCONTAINER_H
+#include "mvvm/model_export.h"
+#include "mvvm/signals/callback_types.h"
#include <algorithm>
#include <functional>
#include <list>
-#include "mvvm/model_export.h"
-#include "mvvm/signals/callback_types.h"
namespace ModelView {
diff --git a/mvvm/model/mvvm/signals/itemmapper.cpp b/mvvm/model/mvvm/signals/itemmapper.cpp
index 2f9dbd65d8a..f2e7a114033 100644
--- a/mvvm/model/mvvm/signals/itemmapper.cpp
+++ b/mvvm/model/mvvm/signals/itemmapper.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/signals/itemmapper.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/signals/callbackcontainer.h"
-#include "mvvm/signals/itemmapper.h"
#include "mvvm/signals/modelmapper.h"
#include <stdexcept>
diff --git a/mvvm/model/mvvm/signals/itemmapper.h b/mvvm/model/mvvm/signals/itemmapper.h
index 574c32a1b21..4a39330c86a 100644
--- a/mvvm/model/mvvm/signals/itemmapper.h
+++ b/mvvm/model/mvvm/signals/itemmapper.h
@@ -10,9 +10,9 @@
#ifndef MVVM_SIGNALS_ITEMMAPPER_H
#define MVVM_SIGNALS_ITEMMAPPER_H
-#include <memory>
#include "mvvm/interfaces/itemlistenerinterface.h"
#include "mvvm/signals/modellistener.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/signals/modellistenerbase.cpp b/mvvm/model/mvvm/signals/modellistenerbase.cpp
index 1887593ce9c..82925360cca 100644
--- a/mvvm/model/mvvm/signals/modellistenerbase.cpp
+++ b/mvvm/model/mvvm/signals/modellistenerbase.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/sessionmodel.h"
#include "mvvm/signals/modellistenerbase.h"
+#include "mvvm/model/sessionmodel.h"
#include "mvvm/signals/modelmapper.h"
#include <stdexcept>
diff --git a/mvvm/model/mvvm/signals/modelmapper.cpp b/mvvm/model/mvvm/signals/modelmapper.cpp
index 1e6c614b1af..b5151ceccc6 100644
--- a/mvvm/model/mvvm/signals/modelmapper.cpp
+++ b/mvvm/model/mvvm/signals/modelmapper.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/signals/callbackcontainer.h"
#include "mvvm/signals/modelmapper.h"
+#include "mvvm/signals/callbackcontainer.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/signals/modelmapper.h b/mvvm/model/mvvm/signals/modelmapper.h
index 0302db2e568..fcfa1cfe887 100644
--- a/mvvm/model/mvvm/signals/modelmapper.h
+++ b/mvvm/model/mvvm/signals/modelmapper.h
@@ -10,8 +10,8 @@
#ifndef MVVM_SIGNALS_MODELMAPPER_H
#define MVVM_SIGNALS_MODELMAPPER_H
-#include <memory>
#include "mvvm/interfaces/modellistenerinterface.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/model/mvvm/standarditems/axisitems.h b/mvvm/model/mvvm/standarditems/axisitems.h
index 38831074610..1e0b08aa47c 100644
--- a/mvvm/model/mvvm/standarditems/axisitems.h
+++ b/mvvm/model/mvvm/standarditems/axisitems.h
@@ -13,8 +13,8 @@
//! @file axisitems.h
//! Collection of axis items for 1D and 2D data/plotting support.
-#include <memory>
#include "mvvm/model/compounditem.h"
+#include <memory>
#include <vector>
namespace ModelView {
diff --git a/mvvm/model/mvvm/standarditems/colormapitem.cpp b/mvvm/model/mvvm/standarditems/colormapitem.cpp
index 19aea3e59b0..ed47571a00b 100644
--- a/mvvm/model/mvvm/standarditems/colormapitem.cpp
+++ b/mvvm/model/mvvm/standarditems/colormapitem.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/comboproperty.h"
#include "mvvm/standarditems/colormapitem.h"
+#include "mvvm/model/comboproperty.h"
#include "mvvm/standarditems/data2ditem.h"
#include "mvvm/standarditems/linkeditem.h"
#include "mvvm/standarditems/plottableitems.h"
diff --git a/mvvm/model/mvvm/standarditems/colormapviewportitem.cpp b/mvvm/model/mvvm/standarditems/colormapviewportitem.cpp
index 0e41f51274b..aefb21babcc 100644
--- a/mvvm/model/mvvm/standarditems/colormapviewportitem.cpp
+++ b/mvvm/model/mvvm/standarditems/colormapviewportitem.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
-#include <algorithm>
+#include "mvvm/standarditems/colormapviewportitem.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/colormapitem.h"
-#include "mvvm/standarditems/colormapviewportitem.h"
#include "mvvm/standarditems/data2ditem.h"
+#include <algorithm>
#include <vector>
namespace {
diff --git a/mvvm/model/mvvm/standarditems/data1ditem.cpp b/mvvm/model/mvvm/standarditems/data1ditem.cpp
index 5a49edd74df..b26e33de413 100644
--- a/mvvm/model/mvvm/standarditems/data1ditem.cpp
+++ b/mvvm/model/mvvm/standarditems/data1ditem.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/data1ditem.h"
+#include "mvvm/standarditems/axisitems.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/data2ditem.cpp b/mvvm/model/mvvm/standarditems/data2ditem.cpp
index a97f7c57d81..8cfc6481e0a 100644
--- a/mvvm/model/mvvm/standarditems/data2ditem.cpp
+++ b/mvvm/model/mvvm/standarditems/data2ditem.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/data2ditem.h"
+#include "mvvm/standarditems/axisitems.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/graphitem.cpp b/mvvm/model/mvvm/standarditems/graphitem.cpp
index 914acb57d75..ccf926be089 100644
--- a/mvvm/model/mvvm/standarditems/graphitem.cpp
+++ b/mvvm/model/mvvm/standarditems/graphitem.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
-#include <QColor>
+#include "mvvm/standarditems/graphitem.h"
#include "mvvm/model/comboproperty.h"
#include "mvvm/standarditems/data1ditem.h"
-#include "mvvm/standarditems/graphitem.h"
#include "mvvm/standarditems/linkeditem.h"
#include "mvvm/standarditems/plottableitems.h"
+#include <QColor>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/graphviewportitem.cpp b/mvvm/model/mvvm/standarditems/graphviewportitem.cpp
index 04d217e408b..70c84bcab9a 100644
--- a/mvvm/model/mvvm/standarditems/graphviewportitem.cpp
+++ b/mvvm/model/mvvm/standarditems/graphviewportitem.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include <algorithm>
-#include "mvvm/standarditems/graphitem.h"
#include "mvvm/standarditems/graphviewportitem.h"
+#include "mvvm/standarditems/graphitem.h"
+#include <algorithm>
#include <vector>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/linkeditem.cpp b/mvvm/model/mvvm/standarditems/linkeditem.cpp
index d0fa49651d6..47b8786f546 100644
--- a/mvvm/model/mvvm/standarditems/linkeditem.cpp
+++ b/mvvm/model/mvvm/standarditems/linkeditem.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/customvariants.h"
#include "mvvm/standarditems/linkeditem.h"
+#include "mvvm/model/customvariants.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/plottableitems.cpp b/mvvm/model/mvvm/standarditems/plottableitems.cpp
index 81ec4cffc6f..3feb0cc3827 100644
--- a/mvvm/model/mvvm/standarditems/plottableitems.cpp
+++ b/mvvm/model/mvvm/standarditems/plottableitems.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include <QColor>
-#include "mvvm/model/comboproperty.h"
#include "mvvm/standarditems/plottableitems.h"
+#include "mvvm/model/comboproperty.h"
+#include <QColor>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/vectoritem.cpp b/mvvm/model/mvvm/standarditems/vectoritem.cpp
index a0a4fb8898d..04698c1eaf3 100644
--- a/mvvm/model/mvvm/standarditems/vectoritem.cpp
+++ b/mvvm/model/mvvm/standarditems/vectoritem.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/standarditems/vectoritem.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/signals/itemmapper.h"
-#include "mvvm/standarditems/vectoritem.h"
#include <sstream>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/standarditems/viewportitem.cpp b/mvvm/model/mvvm/standarditems/viewportitem.cpp
index 1112b48fa90..f1b250186c3 100644
--- a/mvvm/model/mvvm/standarditems/viewportitem.cpp
+++ b/mvvm/model/mvvm/standarditems/viewportitem.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/standarditems/viewportitem.h"
#include "mvvm/model/modelutils.h"
#include "mvvm/standarditems/axisitems.h"
-#include "mvvm/standarditems/viewportitem.h"
using namespace ModelView;
diff --git a/mvvm/model/mvvm/utils/binutils.cpp b/mvvm/model/mvvm/utils/binutils.cpp
index 09f1feb489b..d04f8be9664 100644
--- a/mvvm/model/mvvm/utils/binutils.cpp
+++ b/mvvm/model/mvvm/utils/binutils.cpp
@@ -1,6 +1,6 @@
+#include "mvvm/utils/binutils.h"
#include <fstream>
#include <iostream>
-#include "mvvm/utils/binutils.h"
namespace {
//! Returns buffer size
diff --git a/mvvm/model/mvvm/utils/containerutils.h b/mvvm/model/mvvm/utils/containerutils.h
index 95095394912..a705fd03ae2 100644
--- a/mvvm/model/mvvm/utils/containerutils.h
+++ b/mvvm/model/mvvm/utils/containerutils.h
@@ -10,11 +10,11 @@
#ifndef MVVM_UTILS_CONTAINERUTILS_H
#define MVVM_UTILS_CONTAINERUTILS_H
+#include "mvvm/model_export.h"
#include <algorithm>
#include <complex>
#include <iterator>
#include <memory>
-#include "mvvm/model_export.h"
#include <string>
#include <type_traits>
#include <unordered_set>
diff --git a/mvvm/model/mvvm/utils/fileutils.cpp b/mvvm/model/mvvm/utils/fileutils.cpp
index fd1a69f5792..27f27a9d4d0 100644
--- a/mvvm/model/mvvm/utils/fileutils.cpp
+++ b/mvvm/model/mvvm/utils/fileutils.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/utils/fileutils.h"
#include <QDir>
#include <QFile>
#include <QFileInfo>
-#include "mvvm/utils/fileutils.h"
#include <stdexcept>
#ifdef ENABLE_FILESYSTEM
diff --git a/mvvm/model/mvvm/utils/numericutils.cpp b/mvvm/model/mvvm/utils/numericutils.cpp
index ee25ca902ed..5ac2eef15fc 100644
--- a/mvvm/model/mvvm/utils/numericutils.cpp
+++ b/mvvm/model/mvvm/utils/numericutils.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/utils/numericutils.h"
#include <algorithm>
#include <cmath>
#include <limits>
-#include "mvvm/utils/numericutils.h"
#include <random>
using namespace ModelView;
diff --git a/mvvm/model/mvvm/utils/progresshandler.h b/mvvm/model/mvvm/utils/progresshandler.h
index 79795952a9a..51cfeca1ec2 100644
--- a/mvvm/model/mvvm/utils/progresshandler.h
+++ b/mvvm/model/mvvm/utils/progresshandler.h
@@ -10,9 +10,9 @@
#ifndef MVVM_UTILS_PROGRESSHANDLER_H
#define MVVM_UTILS_PROGRESSHANDLER_H
+#include "mvvm/model_export.h"
#include <functional>
#include <mutex>
-#include "mvvm/model_export.h"
namespace ModelView {
diff --git a/mvvm/model/mvvm/utils/reallimits.cpp b/mvvm/model/mvvm/utils/reallimits.cpp
index 55a6d3919fb..f8be3308d82 100644
--- a/mvvm/model/mvvm/utils/reallimits.cpp
+++ b/mvvm/model/mvvm/utils/reallimits.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include <limits>
-#include "mvvm/utils/numericutils.h"
#include "mvvm/utils/reallimits.h"
+#include "mvvm/utils/numericutils.h"
+#include <limits>
namespace {
const double lmin = std::numeric_limits<double>::lowest();
diff --git a/mvvm/model/mvvm/utils/stringutils.cpp b/mvvm/model/mvvm/utils/stringutils.cpp
index 90832b7bd6f..5da8cd348f5 100644
--- a/mvvm/model/mvvm/utils/stringutils.cpp
+++ b/mvvm/model/mvvm/utils/stringutils.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
+#include "mvvm/utils/stringutils.h"
#include <algorithm>
#include <cmath>
#include <iomanip>
#include <iterator>
-#include "mvvm/utils/stringutils.h"
#include <sstream>
#include <string_view>
diff --git a/mvvm/model/mvvm/utils/threadsafestack.h b/mvvm/model/mvvm/utils/threadsafestack.h
index e74dd945554..b2b23b990a3 100644
--- a/mvvm/model/mvvm/utils/threadsafestack.h
+++ b/mvvm/model/mvvm/utils/threadsafestack.h
@@ -10,11 +10,11 @@
#ifndef MVVM_UTILS_THREADSAFESTACK_H
#define MVVM_UTILS_THREADSAFESTACK_H
+#include "mvvm/model_export.h"
#include <atomic>
#include <condition_variable>
#include <memory>
#include <mutex>
-#include "mvvm/model_export.h"
#include <stack>
#include <stdexcept>
#include <thread>
diff --git a/mvvm/tests/libtestmachinery/folderbasedtest.cpp b/mvvm/tests/libtestmachinery/folderbasedtest.cpp
index d28942b2323..d69eeb74bf3 100644
--- a/mvvm/tests/libtestmachinery/folderbasedtest.cpp
+++ b/mvvm/tests/libtestmachinery/folderbasedtest.cpp
@@ -8,31 +8,27 @@
// ************************************************************************** //
#include "folderbasedtest.h"
-#include "test_utils.h"
#include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
-FolderBasedTest::FolderBasedTest(const std::string& test_dir) : m_test_dir(test_dir)
-{
+FolderBasedTest::FolderBasedTest(const std::string& test_dir) : m_test_dir(test_dir) {
TestUtils::CreateTestDirectory(m_test_dir);
}
-std::string FolderBasedTest::testDir() const
-{
+std::string FolderBasedTest::testDir() const {
return m_test_dir;
}
//! Return full path to the test folder. Located in CMAKE_BINARY_DIR/test_output/<m_test_dir>.
-std::string FolderBasedTest::testPath() const
-{
+std::string FolderBasedTest::testPath() const {
return TestUtils::TestDirectoryPath(m_test_dir);
}
//! Creates an empty directory in main test folder.
//! Remove recursively previous one with the same name, if exist.
-std::string FolderBasedTest::createEmptyDir(const std::string& subdir) const
-{
+std::string FolderBasedTest::createEmptyDir(const std::string& subdir) const {
auto path = ModelView::Utils::join(testPath(), subdir);
ModelView::Utils::remove_all(path);
ModelView::Utils::create_directory(path);
diff --git a/mvvm/tests/libtestmachinery/folderbasedtest.h b/mvvm/tests/libtestmachinery/folderbasedtest.h
index 761ef56633f..5576219141f 100644
--- a/mvvm/tests/libtestmachinery/folderbasedtest.h
+++ b/mvvm/tests/libtestmachinery/folderbasedtest.h
@@ -15,8 +15,7 @@
//! Convenience class which creates a directory on disk for test content.
-class FolderBasedTest : public ::testing::Test
-{
+class FolderBasedTest : public ::testing::Test {
public:
FolderBasedTest(const std::string& test_dir);
~FolderBasedTest();
diff --git a/mvvm/tests/libtestmachinery/google_test.h b/mvvm/tests/libtestmachinery/google_test.h
index a9ecb9868d5..a2f026cdd0c 100644
--- a/mvvm/tests/libtestmachinery/google_test.h
+++ b/mvvm/tests/libtestmachinery/google_test.h
@@ -10,8 +10,8 @@
#ifndef GOOGLETEST_H
#define GOOGLETEST_H
-#include <gtest/gtest.h>
-#include "mvvm/model/customvariants.h"
#include "mvvm/model/comparators.h"
+#include "mvvm/model/customvariants.h"
+#include <gtest/gtest.h>
#endif
diff --git a/mvvm/tests/libtestmachinery/mockinterfaces.h b/mvvm/tests/libtestmachinery/mockinterfaces.h
index 9e6e08b4998..8d151700a89 100644
--- a/mvvm/tests/libtestmachinery/mockinterfaces.h
+++ b/mvvm/tests/libtestmachinery/mockinterfaces.h
@@ -10,15 +10,15 @@
#ifndef MOCKINTERFACES_h
#define MOCKINTERFACES_h
-#include <string>
#include "mvvm/model/tagrow.h"
+#include <string>
//! Various common utils for unit tests.
namespace ModelView {
class SessionItem;
class SessionModel;
-}
+} // namespace ModelView
//! Interface for testing callbacks comming from SessionItem within gmock framework.
diff --git a/mvvm/tests/libtestmachinery/mockwidgets.cpp b/mvvm/tests/libtestmachinery/mockwidgets.cpp
index 5836ff1444c..45d10a955db 100644
--- a/mvvm/tests/libtestmachinery/mockwidgets.cpp
+++ b/mvvm/tests/libtestmachinery/mockwidgets.cpp
@@ -16,19 +16,16 @@
// ----------------------------------------------------------------------------
-MockWidgetForItem::MockWidgetForItem(ModelView::SessionItem* item) : m_item(nullptr)
-{
+MockWidgetForItem::MockWidgetForItem(ModelView::SessionItem* item) : m_item(nullptr) {
setItem(item);
}
-MockWidgetForItem::~MockWidgetForItem()
-{
+MockWidgetForItem::~MockWidgetForItem() {
if (m_item)
m_item->mapper()->unsubscribe(this);
}
-void MockWidgetForItem::setItem(ModelView::SessionItem* item)
-{
+void MockWidgetForItem::setItem(ModelView::SessionItem* item) {
if (m_item == item)
return;
@@ -79,19 +76,16 @@ void MockWidgetForItem::setItem(ModelView::SessionItem* item)
// ----------------------------------------------------------------------------
-MockWidgetForModel::MockWidgetForModel(ModelView::SessionModel* model) : m_model(nullptr)
-{
+MockWidgetForModel::MockWidgetForModel(ModelView::SessionModel* model) : m_model(nullptr) {
setModel(model);
}
-MockWidgetForModel::~MockWidgetForModel()
-{
+MockWidgetForModel::~MockWidgetForModel() {
if (m_model)
m_model->mapper()->unsubscribe(this);
}
-void MockWidgetForModel::setModel(ModelView::SessionModel* model)
-{
+void MockWidgetForModel::setModel(ModelView::SessionModel* model) {
if (m_model == model)
return;
diff --git a/mvvm/tests/libtestmachinery/mockwidgets.h b/mvvm/tests/libtestmachinery/mockwidgets.h
index 9feb671df5d..3d45f9fc35e 100644
--- a/mvvm/tests/libtestmachinery/mockwidgets.h
+++ b/mvvm/tests/libtestmachinery/mockwidgets.h
@@ -13,16 +13,14 @@
#include "mockinterfaces.h"
#include <gmock/gmock.h>
-namespace ModelView
-{
+namespace ModelView {
class SessionItem;
class SessionModel;
} // namespace ModelView
//! Mock class for CallbackContainer.
-class CallbackMockWidget
-{
+class CallbackMockWidget {
public:
MOCK_METHOD1(onItemDestroy, void(ModelView::SessionItem* item));
MOCK_METHOD2(onDataChange, void(ModelView::SessionItem* item, int role));
@@ -30,8 +28,7 @@ public:
//! Mock widget to test ItemMapper functionality.
-class MockWidgetForItem : public ItemTestWidgetInterface
-{
+class MockWidgetForItem : public ItemTestWidgetInterface {
public:
MockWidgetForItem(ModelView::SessionItem* item);
~MockWidgetForItem();
@@ -52,8 +49,7 @@ private:
//! Mock class to test ModelMapper functionality.
-class MockWidgetForModel : public ModelTestWidgetInterface
-{
+class MockWidgetForModel : public ModelTestWidgetInterface {
public:
MockWidgetForModel(ModelView::SessionModel* model);
~MockWidgetForModel();
diff --git a/mvvm/tests/libtestmachinery/test_utils.cpp b/mvvm/tests/libtestmachinery/test_utils.cpp
index fa3cd68ec3a..5ba36354c08 100644
--- a/mvvm/tests/libtestmachinery/test_utils.cpp
+++ b/mvvm/tests/libtestmachinery/test_utils.cpp
@@ -8,75 +8,64 @@
// ************************************************************************** //
#include "test_utils.h"
+#include "mvvm/model/sessionmodel.h"
+#include "mvvm/serialization/jsonconverterinterfaces.h"
+#include "mvvm/serialization/jsonutils.h"
+#include "mvvm/utils/fileutils.h"
#include "testconfig.h" // this file is auto generated by the build system in build directory
#include <QFile>
#include <QJsonDocument>
#include <QJsonObject>
#include <QString>
#include <QTextStream>
-#include "mvvm/model/sessionmodel.h"
-#include "mvvm/serialization/jsonconverterinterfaces.h"
-#include "mvvm/serialization/jsonutils.h"
-#include "mvvm/utils/fileutils.h"
-#include <string>
#include <stdexcept>
-
+#include <string>
using namespace ModelView;
-namespace
-{
+namespace {
void SaveDocument(const QJsonDocument& document, const std::string& fileName);
}
-std::string TestUtils::TestOutputDir()
-{
+std::string TestUtils::TestOutputDir() {
return TestConfig::TestOutputDir(); // defined in auto-generated testconfig.h
}
-std::string TestUtils::CreateTestDirectory(const std::string& test_sub_dir)
-{
+std::string TestUtils::CreateTestDirectory(const std::string& test_sub_dir) {
std::string result = TestDirectoryPath(test_sub_dir);
Utils::create_directory(result);
return result;
}
-std::string TestUtils::TestDirectoryPath(const std::string& test_sub_dir)
-{
+std::string TestUtils::TestDirectoryPath(const std::string& test_sub_dir) {
return TestOutputDir() + std::string("/") + test_sub_dir;
}
-std::string TestUtils::TestFileName(const std::string& test_sub_dir, const std::string& file_name)
-{
+std::string TestUtils::TestFileName(const std::string& test_sub_dir, const std::string& file_name) {
return TestDirectoryPath(test_sub_dir) + std::string("/") + file_name;
}
-void TestUtils::SaveJson(const QJsonObject& object, const std::string& fileName)
-{
+void TestUtils::SaveJson(const QJsonObject& object, const std::string& fileName) {
QJsonDocument document(object);
SaveDocument(document, fileName);
}
-void TestUtils::SaveJson(const QJsonArray& object, const std::string& fileName)
-{
+void TestUtils::SaveJson(const QJsonArray& object, const std::string& fileName) {
QJsonDocument document(object);
SaveDocument(document, fileName);
}
-QString TestUtils::JsonToString(const QJsonObject& object)
-{
+QString TestUtils::JsonToString(const QJsonObject& object) {
QJsonDocument document(object);
return QString(document.toJson(QJsonDocument::Compact));
}
-QString TestUtils::ModelToJsonString(SessionModel& model)
-{
+QString TestUtils::ModelToJsonString(SessionModel& model) {
return QString::fromStdString(JsonUtils::ModelToJsonString(model));
}
-QJsonDocument TestUtils::LoadJson(const std::string& fileName)
-{
+QJsonDocument TestUtils::LoadJson(const std::string& fileName) {
QFile jsonFile(QString::fromStdString(fileName));
if (!jsonFile.open(QIODevice::ReadOnly))
@@ -85,8 +74,7 @@ QJsonDocument TestUtils::LoadJson(const std::string& fileName)
return QJsonDocument().fromJson(jsonFile.readAll());
}
-std::string TestUtils::CreateTestFile(const std::string& dirname, const std::string& fileName)
-{
+std::string TestUtils::CreateTestFile(const std::string& dirname, const std::string& fileName) {
std::string filename = dirname.empty() ? fileName : dirname + "/" + fileName;
QFile file(QString::fromStdString(filename));
@@ -101,8 +89,7 @@ std::string TestUtils::CreateTestFile(const std::string& dirname, const std::str
return filename;
}
-std::string TestUtils::CreateEmptyFile(const std::string& dirname, const std::string& fileName)
-{
+std::string TestUtils::CreateEmptyFile(const std::string& dirname, const std::string& fileName) {
std::string filename = dirname.empty() ? fileName : dirname + "/" + fileName;
QFile file(QString::fromStdString(filename));
@@ -112,11 +99,9 @@ std::string TestUtils::CreateEmptyFile(const std::string& dirname, const std::st
return filename;
}
-namespace
-{
+namespace {
-void SaveDocument(const QJsonDocument& document, const std::string& fileName)
-{
+void SaveDocument(const QJsonDocument& document, const std::string& fileName) {
QFile saveFile(QString::fromStdString(fileName));
if (!saveFile.open(QIODevice::WriteOnly))
diff --git a/mvvm/tests/libtestmachinery/test_utils.h b/mvvm/tests/libtestmachinery/test_utils.h
index e09a2e50593..fabbea39bed 100644
--- a/mvvm/tests/libtestmachinery/test_utils.h
+++ b/mvvm/tests/libtestmachinery/test_utils.h
@@ -10,9 +10,9 @@
#ifndef TESTUTILS_H
#define TESTUTILS_H
+#include "mvvm/model/customvariants.h"
#include <QString>
#include <memory>
-#include "mvvm/model/customvariants.h"
//! @file test_utils.h
//! @brief Collection of utility functions for various unit tests.
@@ -20,15 +20,13 @@
class QJsonObject;
class QJsonArray;
-namespace ModelView
-{
+namespace ModelView {
class SessionModel;
}
//! Various common utils for unit tests.
-namespace TestUtils
-{
+namespace TestUtils {
//! Returns full path to the main test folder, as defined by CMake at compile time.
//! Shoud point to CMAKE_BINARY_DIR/test_output
@@ -65,8 +63,7 @@ std::string CreateEmptyFile(const std::string& dirname, const std::string& fileN
//! Deletes items in the container and cleans container afterwards.
-template <typename T> void clean_items(T& items)
-{
+template <typename T> void clean_items(T& items) {
for (auto item : items)
delete item;
items.clear();
@@ -74,8 +71,7 @@ template <typename T> void clean_items(T& items)
//! Creates vector of unique_ptr of given type.
-template <typename B, typename D> auto create_row(int ncolumns)
-{
+template <typename B, typename D> auto create_row(int ncolumns) {
std::vector<std::unique_ptr<B>> result;
for (int i = 0; i < ncolumns; ++i)
result.emplace_back(std::make_unique<D>());
@@ -84,8 +80,7 @@ template <typename B, typename D> auto create_row(int ncolumns)
//! Creates vector of pointers from vector of unique_ptr.
-template <typename T> auto create_pointers(const std::vector<std::unique_ptr<T>>& vec)
-{
+template <typename T> auto create_pointers(const std::vector<std::unique_ptr<T>>& vec) {
std::vector<T*> result;
std::transform(vec.begin(), vec.end(), std::back_inserter(result),
[](auto& x) { return x.get(); });
@@ -94,8 +89,7 @@ template <typename T> auto create_pointers(const std::vector<std::unique_ptr<T>>
//! Creates vector of T from argument list. Used in EXPECT_EQ macros for convenience.
-template <typename T, typename... Args> std::vector<T> toVector(Args&&... args)
-{
+template <typename T, typename... Args> std::vector<T> toVector(Args&&... args) {
std::vector<T> v;
(v.push_back(T(args)), ...);
return v;
diff --git a/mvvm/tests/libtestmachinery/toyitems.cpp b/mvvm/tests/libtestmachinery/toyitems.cpp
index b416fb4035b..a4e5846f6ef 100644
--- a/mvvm/tests/libtestmachinery/toyitems.cpp
+++ b/mvvm/tests/libtestmachinery/toyitems.cpp
@@ -8,23 +8,21 @@
// ************************************************************************** //
#include "toyitems.h"
-#include <QColor>
#include "mvvm/model/comboproperty.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/signals/itemmapper.h"
#include "mvvm/standarditems/vectoritem.h"
+#include <QColor>
#include <stdexcept>
using namespace ToyItems;
-MultiLayerItem::MultiLayerItem() : CompoundItem(Constants::MultiLayerItemType)
-{
+MultiLayerItem::MultiLayerItem() : CompoundItem(Constants::MultiLayerItemType) {
registerTag(ModelView::TagInfo::universalTag(T_LAYERS, {Constants::LayerItemType}),
/*set_as_default*/ true);
}
-LayerItem::LayerItem() : CompoundItem(Constants::LayerItemType)
-{
+LayerItem::LayerItem() : CompoundItem(Constants::LayerItemType) {
addProperty(P_THICKNESS, 42.0);
addProperty(P_COLOR, QColor(Qt::green));
registerTag(ModelView::TagInfo::universalTag(T_PARTICLES, {Constants::ParticleItemType}),
@@ -33,16 +31,14 @@ LayerItem::LayerItem() : CompoundItem(Constants::LayerItemType)
// ----------------------------------------------------------------------------
-ParticleItem::ParticleItem() : CompoundItem(Constants::ParticleItemType)
-{
+ParticleItem::ParticleItem() : CompoundItem(Constants::ParticleItemType) {
addProperty<ModelView::VectorItem>(P_POSITION);
addProperty<ShapeGroupItem>(P_SHAPES);
}
// ----------------------------------------------------------------------------
-LatticeItem::LatticeItem() : CompoundItem(Constants::LatticeItemType)
-{
+LatticeItem::LatticeItem() : CompoundItem(Constants::LatticeItemType) {
addProperty(P_ROTATION_ANLE, 90.0);
addProperty(P_INTEGRATION, true);
@@ -52,8 +48,7 @@ LatticeItem::LatticeItem() : CompoundItem(Constants::LatticeItemType)
update_appearance();
}
-void LatticeItem::activate()
-{
+void LatticeItem::activate() {
auto onIntegrationFlagChange = [this](SessionItem*, std::string property) {
if (property == P_INTEGRATION)
update_appearance();
@@ -61,39 +56,34 @@ void LatticeItem::activate()
mapper()->setOnPropertyChange(onIntegrationFlagChange, this);
}
-void LatticeItem::update_appearance()
-{
+void LatticeItem::update_appearance() {
auto angle_item = getItem(P_ROTATION_ANLE);
angle_item->setEnabled(!property<bool>(P_INTEGRATION));
}
// ----------------------------------------------------------------------------
-CylinderItem::CylinderItem() : CompoundItem(Constants::CylinderItemType)
-{
+CylinderItem::CylinderItem() : CompoundItem(Constants::CylinderItemType) {
addProperty(P_RADIUS, 8.0);
addProperty(P_HEIGHT, 10.0);
}
// ----------------------------------------------------------------------------
-SphereItem::SphereItem() : CompoundItem(Constants::SphereItemType)
-{
+SphereItem::SphereItem() : CompoundItem(Constants::SphereItemType) {
addProperty(P_RADIUS, 8.0);
}
// ----------------------------------------------------------------------------
-AnysoPyramidItem::AnysoPyramidItem() : CompoundItem(Constants::AnysoPyramidItemType)
-{
+AnysoPyramidItem::AnysoPyramidItem() : CompoundItem(Constants::AnysoPyramidItemType) {
addProperty(P_LENGTH, 8.0);
addProperty(P_WIDTH, 8.0);
addProperty(P_HEIGHT, 8.0);
addProperty(P_ALPHA, 8.0);
}
-ShapeGroupItem::ShapeGroupItem() : GroupItem(Constants::ShapeGroupItemType)
-{
+ShapeGroupItem::ShapeGroupItem() : GroupItem(Constants::ShapeGroupItemType) {
registerItem<CylinderItem>("Cylinder");
registerItem<SphereItem>("Full sphere", /*make_selected*/ true);
registerItem<AnysoPyramidItem>("Anysotropical pyramid");
diff --git a/mvvm/tests/libtestmachinery/toyitems.h b/mvvm/tests/libtestmachinery/toyitems.h
index db8df1a8735..2820c0cc40b 100644
--- a/mvvm/tests/libtestmachinery/toyitems.h
+++ b/mvvm/tests/libtestmachinery/toyitems.h
@@ -12,17 +12,15 @@
#include "mvvm/model/compounditem.h"
#include "mvvm/model/groupitem.h"
-#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/itempool.h"
+#include "mvvm/model/sessionmodel.h"
#include <string>
//! Collection of toy items and models for testing purposes.
-namespace ToyItems
-{
+namespace ToyItems {
-namespace Constants
-{
+namespace Constants {
const ModelView::model_type MultiLayerItemType = "MultiLayer";
const ModelView::model_type LayerItemType = "Layer";
@@ -36,11 +34,9 @@ const ModelView::model_type AnysoPyramidItemType = "AnysoPyramid";
const ModelView::model_type ShapeGroupItemType = "ShapeGroup";
} // namespace Constants
-
//! Represents multilayer with collection of layers.
-class MultiLayerItem : public ModelView::CompoundItem
-{
+class MultiLayerItem : public ModelView::CompoundItem {
public:
static inline const std::string T_LAYERS = "T_LAYERS";
MultiLayerItem();
@@ -48,8 +44,7 @@ public:
//! Represents a layer, with thickness and color, and possibly populated with particles.
-class LayerItem : public ModelView::CompoundItem
-{
+class LayerItem : public ModelView::CompoundItem {
public:
static inline const std::string P_THICKNESS = "Thickness";
static inline const std::string P_COLOR = "Color";
@@ -59,8 +54,7 @@ public:
//! Represents a particle, with a position, and a selection of possible shapes.
-class ParticleItem : public ModelView::CompoundItem
-{
+class ParticleItem : public ModelView::CompoundItem {
public:
static inline const std::string P_POSITION = "Position";
static inline const std::string P_SHAPES = "Shapes";
@@ -70,8 +64,7 @@ public:
//! Represents a lattice.
-class LatticeItem : public ModelView::CompoundItem
-{
+class LatticeItem : public ModelView::CompoundItem {
public:
static inline const std::string P_ROTATION_ANLE = "Rotation";
static inline const std::string P_INTEGRATION = "Integration";
@@ -87,8 +80,7 @@ private:
//! Represents a cylindrical shape.
-class CylinderItem : public ModelView::CompoundItem
-{
+class CylinderItem : public ModelView::CompoundItem {
public:
static inline const std::string P_RADIUS = "Radius";
static inline const std::string P_HEIGHT = "Height";
@@ -98,8 +90,7 @@ public:
//! Represents a shpere.
-class SphereItem : public ModelView::CompoundItem
-{
+class SphereItem : public ModelView::CompoundItem {
public:
static inline const std::string P_RADIUS = "Radius";
@@ -108,8 +99,7 @@ public:
//! Represents an anysotropical pyramid.
-class AnysoPyramidItem : public ModelView::CompoundItem
-{
+class AnysoPyramidItem : public ModelView::CompoundItem {
public:
static inline const std::string P_LENGTH = "Length";
static inline const std::string P_WIDTH = "Width";
@@ -121,8 +111,7 @@ public:
//! Represents a group item holding a collection of shapes.
-class ShapeGroupItem : public ModelView::GroupItem
-{
+class ShapeGroupItem : public ModelView::GroupItem {
public:
ShapeGroupItem();
};
diff --git a/mvvm/tests/libtestmachinery/toymodel.cpp b/mvvm/tests/libtestmachinery/toymodel.cpp
index 2b0bf3a0eda..1188d7c905b 100644
--- a/mvvm/tests/libtestmachinery/toymodel.cpp
+++ b/mvvm/tests/libtestmachinery/toymodel.cpp
@@ -8,13 +8,11 @@
// ************************************************************************** //
#include "toymodel.h"
-#include "toyitems.h"
#include "mvvm/model/itemcatalogue.h"
+#include "toyitems.h"
-namespace
-{
-std::unique_ptr<ModelView::ItemCatalogue> CreateItemCatalogue()
-{
+namespace {
+std::unique_ptr<ModelView::ItemCatalogue> CreateItemCatalogue() {
auto result = std::make_unique<ModelView::ItemCatalogue>();
result->registerItem<ToyItems::MultiLayerItem>();
result->registerItem<ToyItems::LayerItem>();
@@ -28,13 +26,11 @@ std::unique_ptr<ModelView::ItemCatalogue> CreateItemCatalogue()
}
} // namespace
-ToyItems::SampleModel::SampleModel() : SessionModel("ToyModel")
-{
+ToyItems::SampleModel::SampleModel() : SessionModel("ToyModel") {
setItemCatalogue(CreateItemCatalogue());
}
ToyItems::SampleModel::SampleModel(std::shared_ptr<ModelView::ItemPool> pool)
- : SessionModel("ToyModel", pool)
-{
+ : SessionModel("ToyModel", pool) {
setItemCatalogue(CreateItemCatalogue());
}
diff --git a/mvvm/tests/libtestmachinery/toymodel.h b/mvvm/tests/libtestmachinery/toymodel.h
index e75db44a01b..5d392154027 100644
--- a/mvvm/tests/libtestmachinery/toymodel.h
+++ b/mvvm/tests/libtestmachinery/toymodel.h
@@ -10,16 +10,14 @@
#ifndef TOYMODEL_H
#define TOYMODEL_H
-#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/itempool.h"
+#include "mvvm/model/sessionmodel.h"
//! Collection of toy items and models for testing purposes.
-namespace ToyItems
-{
+namespace ToyItems {
-class SampleModel : public ModelView::SessionModel
-{
+class SampleModel : public ModelView::SessionModel {
public:
SampleModel();
SampleModel(std::shared_ptr<ModelView::ItemPool> pool);
diff --git a/mvvm/tests/libtestmachinery/widgetbasedtest.cpp b/mvvm/tests/libtestmachinery/widgetbasedtest.cpp
index 0ef681a54e9..4c9772a4e51 100644
--- a/mvvm/tests/libtestmachinery/widgetbasedtest.cpp
+++ b/mvvm/tests/libtestmachinery/widgetbasedtest.cpp
@@ -12,8 +12,7 @@
QApplication* WidgetBasedTest::m_app = nullptr;
-namespace
-{
+namespace {
// faking argc and argv
char progname[] = "testview";
char* argv[] = {&progname[0], nullptr};
@@ -22,13 +21,11 @@ int argc = 1;
WidgetBasedTest::WidgetBasedTest() {}
-void WidgetBasedTest::SetUpTestSuite()
-{
+void WidgetBasedTest::SetUpTestSuite() {
m_app = new QApplication(argc, argv);
}
-void WidgetBasedTest::TearDownTestSuite()
-{
+void WidgetBasedTest::TearDownTestSuite() {
delete m_app;
m_app = 0;
}
diff --git a/mvvm/tests/libtestmachinery/widgetbasedtest.h b/mvvm/tests/libtestmachinery/widgetbasedtest.h
index e5b7137d227..87ce5ddff3e 100644
--- a/mvvm/tests/libtestmachinery/widgetbasedtest.h
+++ b/mvvm/tests/libtestmachinery/widgetbasedtest.h
@@ -16,8 +16,7 @@ class QApplication;
//! Convenience class to setup QApplication for tests involving QWidget creation.
-class WidgetBasedTest : public ::testing::Test
-{
+class WidgetBasedTest : public ::testing::Test {
public:
WidgetBasedTest();
diff --git a/mvvm/tests/testintegration/TestAll.cpp b/mvvm/tests/testintegration/TestAll.cpp
index fd90e66746f..b304450576d 100644
--- a/mvvm/tests/testintegration/TestAll.cpp
+++ b/mvvm/tests/testintegration/TestAll.cpp
@@ -12,8 +12,7 @@
#include <QApplication>
#include <QStandardItem>
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);
ModelView::Comparators::registerComparators();
diff --git a/mvvm/tests/testintegration/standarditemserialization.test.cpp b/mvvm/tests/testintegration/standarditemserialization.test.cpp
index d5c860182dc..25934fa4dbd 100644
--- a/mvvm/tests/testintegration/standarditemserialization.test.cpp
+++ b/mvvm/tests/testintegration/standarditemserialization.test.cpp
@@ -8,18 +8,17 @@
// ************************************************************************** //
#include "google_test.h"
-#include <QDebug>
-#include <QJsonObject>
#include "mvvm/model/modelutils.h"
#include "mvvm/serialization/jsonmodelconverter.h"
#include "mvvm/standarditems/standarditemincludes.h"
+#include <QDebug>
+#include <QJsonObject>
using namespace ModelView;
//! Testing serialization of ToyItems using json converters.
-class StandardItemsSerializationTest : public ::testing::Test
-{
+class StandardItemsSerializationTest : public ::testing::Test {
public:
~StandardItemsSerializationTest();
};
@@ -28,8 +27,7 @@ StandardItemsSerializationTest::~StandardItemsSerializationTest() = default;
//! Checking that serialization works (not crashing) for all defined standard items.
-TEST_F(StandardItemsSerializationTest, allItems)
-{
+TEST_F(StandardItemsSerializationTest, allItems) {
SessionModel model;
model.insertItem<ColorMapItem>();
model.insertItem<ColorMapViewportItem>();
@@ -55,8 +53,7 @@ TEST_F(StandardItemsSerializationTest, allItems)
//! Creating graph with data. It has to be identical after serialization.
-TEST_F(StandardItemsSerializationTest, GraphItemAndDataSerialization)
-{
+TEST_F(StandardItemsSerializationTest, GraphItemAndDataSerialization) {
// preparing model, data item and graph pointing to it
SessionModel model;
auto graph_item = model.insertItem<GraphItem>();
@@ -82,8 +79,7 @@ TEST_F(StandardItemsSerializationTest, GraphItemAndDataSerialization)
//! Creating viewport with one graph. Serializing and restoring the model.
-TEST_F(StandardItemsSerializationTest, graphViewPortItemSerialization)
-{
+TEST_F(StandardItemsSerializationTest, graphViewPortItemSerialization) {
SessionModel model;
auto viewport_item = model.insertItem<GraphViewportItem>();
auto graph_item = model.insertItem<GraphItem>(viewport_item);
diff --git a/mvvm/tests/testintegration/toyitemslattice.test.cpp b/mvvm/tests/testintegration/toyitemslattice.test.cpp
index 96b6da3a269..6b896e1ee0e 100644
--- a/mvvm/tests/testintegration/toyitemslattice.test.cpp
+++ b/mvvm/tests/testintegration/toyitemslattice.test.cpp
@@ -16,8 +16,7 @@ using namespace ToyItems;
//! Test toy LatticeItem.
-class ToyItemsLatticeTest : public ::testing::Test
-{
+class ToyItemsLatticeTest : public ::testing::Test {
public:
~ToyItemsLatticeTest();
};
@@ -26,8 +25,7 @@ ToyItemsLatticeTest::~ToyItemsLatticeTest() = default;
//! Business logice (enabled/disabled).
-TEST_F(ToyItemsLatticeTest, ToyItemsLatticeTest)
-{
+TEST_F(ToyItemsLatticeTest, ToyItemsLatticeTest) {
ToyItems::SampleModel model;
auto lattice = model.insertItem<LatticeItem>();
diff --git a/mvvm/tests/testintegration/toyitemsserialization.test.cpp b/mvvm/tests/testintegration/toyitemsserialization.test.cpp
index 867dc466d2a..bca4fa5e5db 100644
--- a/mvvm/tests/testintegration/toyitemsserialization.test.cpp
+++ b/mvvm/tests/testintegration/toyitemsserialization.test.cpp
@@ -8,19 +8,18 @@
// ************************************************************************** //
#include "google_test.h"
+#include "mvvm/model/modelutils.h"
+#include "mvvm/serialization/jsonmodelconverter.h"
#include "toyitems.h"
#include "toymodel.h"
#include <QJsonObject>
-#include "mvvm/model/modelutils.h"
-#include "mvvm/serialization/jsonmodelconverter.h"
using namespace ModelView;
using namespace ToyItems;
//! Testing serialization of ToyItems using json converters.
-class ToyItemsSerializationTest : public ::testing::Test
-{
+class ToyItemsSerializationTest : public ::testing::Test {
public:
~ToyItemsSerializationTest();
};
@@ -30,8 +29,7 @@ ToyItemsSerializationTest::~ToyItemsSerializationTest() = default;
//! Checking ShapeGroupItem in a model.
//! Serialization/deserelization should give an item identical to original.
-TEST_F(ToyItemsSerializationTest, defaultShapeGroupItemInModel)
-{
+TEST_F(ToyItemsSerializationTest, defaultShapeGroupItemInModel) {
// model with single group item
SampleModel model;
auto group = model.insertItem<ShapeGroupItem>();
@@ -48,8 +46,7 @@ TEST_F(ToyItemsSerializationTest, defaultShapeGroupItemInModel)
//! Checking ShapeGroupItem in a model.
//! Serialization/deserelization should give an item identical to original.
-TEST_F(ToyItemsSerializationTest, modifiedShapeGroupItemInModel)
-{
+TEST_F(ToyItemsSerializationTest, modifiedShapeGroupItemInModel) {
SampleModel model;
auto group = model.insertItem<ShapeGroupItem>();
@@ -73,8 +70,7 @@ TEST_F(ToyItemsSerializationTest, modifiedShapeGroupItemInModel)
//! Insert all supported items in a model and check that after serialization
-TEST_F(ToyItemsSerializationTest, allItemsInAModel)
-{
+TEST_F(ToyItemsSerializationTest, allItemsInAModel) {
SampleModel model;
model.insertItem<ToyItems::MultiLayerItem>();
model.insertItem<ToyItems::LayerItem>();
diff --git a/mvvm/tests/testintegration/toyitemsshapegroup.test.cpp b/mvvm/tests/testintegration/toyitemsshapegroup.test.cpp
index f96859d15ab..b1652f8c6d7 100644
--- a/mvvm/tests/testintegration/toyitemsshapegroup.test.cpp
+++ b/mvvm/tests/testintegration/toyitemsshapegroup.test.cpp
@@ -8,20 +8,19 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QSignalSpy>
#include "mvvm/model/comboproperty.h"
#include "mvvm/viewmodel/defaultviewmodel.h"
#include "mvvm/viewmodel/propertyviewmodel.h"
#include "mvvm/viewmodel/standardviewitems.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QSignalSpy>
using namespace ModelView;
//! Tests of toy ShapeGroup in the context of model and viewmodel.
-class ToyItemsShapeGroupTest : public ::testing::Test
-{
+class ToyItemsShapeGroupTest : public ::testing::Test {
public:
~ToyItemsShapeGroupTest();
};
@@ -30,8 +29,7 @@ ToyItemsShapeGroupTest::~ToyItemsShapeGroupTest() = default;
//! Toy multilayer as produced bo toy SampleModel.
-TEST_F(ToyItemsShapeGroupTest, initialState)
-{
+TEST_F(ToyItemsShapeGroupTest, initialState) {
ToyItems::ShapeGroupItem item;
EXPECT_EQ(item.currentIndex(), 1);
@@ -53,8 +51,7 @@ TEST_F(ToyItemsShapeGroupTest, initialState)
std::vector<std::string>({"Cylinder", "Full sphere", "Anysotropical pyramid"}));
}
-TEST_F(ToyItemsShapeGroupTest, setCurrentType)
-{
+TEST_F(ToyItemsShapeGroupTest, setCurrentType) {
ToyItems::ShapeGroupItem item;
item.setCurrentType(ToyItems::Constants::CylinderItemType);
@@ -72,15 +69,13 @@ TEST_F(ToyItemsShapeGroupTest, setCurrentType)
std::vector<std::string>({"Cylinder", "Full sphere", "Anysotropical pyramid"}));
}
-TEST_F(ToyItemsShapeGroupTest, currentItemNoConst)
-{
+TEST_F(ToyItemsShapeGroupTest, currentItemNoConst) {
ToyItems::ShapeGroupItem item;
item.currentItem()->setProperty(ToyItems::SphereItem::P_RADIUS, 42.0);
EXPECT_EQ(item.currentItem()->property<double>(ToyItems::SphereItem::P_RADIUS), 42.0);
}
-TEST_F(ToyItemsShapeGroupTest, inModelContext)
-{
+TEST_F(ToyItemsShapeGroupTest, inModelContext) {
ToyItems::SampleModel model;
auto item = model.insertItem<ToyItems::ShapeGroupItem>();
ASSERT_TRUE(item != nullptr);
@@ -102,8 +97,7 @@ TEST_F(ToyItemsShapeGroupTest, inModelContext)
EXPECT_EQ(item->children().at(2)->model(), &model);
}
-TEST_F(ToyItemsShapeGroupTest, setDataInModelContext)
-{
+TEST_F(ToyItemsShapeGroupTest, setDataInModelContext) {
ToyItems::SampleModel model;
auto item = model.insertItem<ToyItems::ShapeGroupItem>();
ASSERT_TRUE(item != nullptr);
@@ -124,8 +118,7 @@ TEST_F(ToyItemsShapeGroupTest, setDataInModelContext)
//! ViewLabelItem and ViewDataItem from ShapeItem.
-TEST_F(ToyItemsShapeGroupTest, viewItemsFromShapeGroup)
-{
+TEST_F(ToyItemsShapeGroupTest, viewItemsFromShapeGroup) {
ToyItems::SampleModel model;
auto groupItem = model.insertItem<ToyItems::ShapeGroupItem>();
@@ -140,8 +133,7 @@ TEST_F(ToyItemsShapeGroupTest, viewItemsFromShapeGroup)
//! ShapeGroup item in DefaultViewModel.
-TEST_F(ToyItemsShapeGroupTest, inDefaultViewModelContext)
-{
+TEST_F(ToyItemsShapeGroupTest, inDefaultViewModelContext) {
ToyItems::SampleModel model;
auto groupItem = model.insertItem<ToyItems::ShapeGroupItem>();
@@ -191,8 +183,7 @@ TEST_F(ToyItemsShapeGroupTest, inDefaultViewModelContext)
//! ShapeGroup item in PropertyViewModel.
-TEST_F(ToyItemsShapeGroupTest, inPropertyViewModelContext)
-{
+TEST_F(ToyItemsShapeGroupTest, inPropertyViewModelContext) {
ToyItems::SampleModel model;
auto parent = model.insertItem<SessionItem>();
parent->registerTag(
diff --git a/mvvm/tests/testintegration/undoscenario.test.cpp b/mvvm/tests/testintegration/undoscenario.test.cpp
index 9d819d62c13..8c4858e8852 100644
--- a/mvvm/tests/testintegration/undoscenario.test.cpp
+++ b/mvvm/tests/testintegration/undoscenario.test.cpp
@@ -8,18 +8,17 @@
// ************************************************************************** //
#include "google_test.h"
-#include "qcustomplot.h"
#include "mvvm/interfaces/undostackinterface.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/plotting/viewportaxisplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
+#include "qcustomplot.h"
using namespace ModelView;
//! Testing various undo/redo scenario.
-class UndoScenarioTest : public ::testing::Test
-{
+class UndoScenarioTest : public ::testing::Test {
public:
~UndoScenarioTest();
};
@@ -29,8 +28,7 @@ UndoScenarioTest::~UndoScenarioTest() = default;
//! Check undo/redo of ViewportAxisItem range, when it is listened by the controller.
//! Real-life bug.
-TEST_F(UndoScenarioTest, undoViewportSetRange)
-{
+TEST_F(UndoScenarioTest, undoViewportSetRange) {
// initialzing model, custom plot and controller
SessionModel model;
auto axisItem = model.insertItem<ViewportAxisItem>();
diff --git a/mvvm/tests/testmodel/callbackcontainer.test.cpp b/mvvm/tests/testmodel/callbackcontainer.test.cpp
index 5ff52908fb6..f119f636ca1 100644
--- a/mvvm/tests/testmodel/callbackcontainer.test.cpp
+++ b/mvvm/tests/testmodel/callbackcontainer.test.cpp
@@ -9,10 +9,10 @@
#include "google_test.h"
#include "mockwidgets.h"
-#include <memory>
#include "mvvm/model/mvvm_types.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/signals/callbackcontainer.h"
+#include <memory>
using namespace ModelView;
using ::testing::_;
diff --git a/mvvm/tests/testmodel/compounditem.test.cpp b/mvvm/tests/testmodel/compounditem.test.cpp
index 57557ea0a92..26365fe46ad 100644
--- a/mvvm/tests/testmodel/compounditem.test.cpp
+++ b/mvvm/tests/testmodel/compounditem.test.cpp
@@ -8,11 +8,11 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
-#include <memory>
#include "mvvm/model/compounditem.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/sessionmodel.h"
+#include "test_utils.h"
+#include <memory>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/containeritem.test.cpp b/mvvm/tests/testmodel/containeritem.test.cpp
index 1877bd534bf..9c5cae8d551 100644
--- a/mvvm/tests/testmodel/containeritem.test.cpp
+++ b/mvvm/tests/testmodel/containeritem.test.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "google_test.h"
+#include "mvvm/standarditems/containeritem.h"
#include "test_utils.h"
#include <memory>
-#include "mvvm/standarditems/containeritem.h"
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/containerutils.test.cpp b/mvvm/tests/testmodel/containerutils.test.cpp
index b5dfc014e64..c543316b197 100644
--- a/mvvm/tests/testmodel/containerutils.test.cpp
+++ b/mvvm/tests/testmodel/containerutils.test.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "google_test.h"
-#include <complex>
#include "mvvm/model/sessionitem.h"
#include "mvvm/utils/containerutils.h"
+#include <complex>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/customvariants.test.cpp b/mvvm/tests/testmodel/customvariants.test.cpp
index 6ba172ee70e..c0ec1838a10 100644
--- a/mvvm/tests/testmodel/customvariants.test.cpp
+++ b/mvvm/tests/testmodel/customvariants.test.cpp
@@ -8,9 +8,6 @@
// ************************************************************************** //
#include "google_test.h"
-#include <QColor>
-#include <functional>
-#include <memory>
#include "mvvm/model/comboproperty.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/externalproperty.h"
@@ -19,6 +16,9 @@
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/model/variant_constants.h"
+#include <QColor>
+#include <functional>
+#include <memory>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/fileutils.test.cpp b/mvvm/tests/testmodel/fileutils.test.cpp
index 95be68b36bf..033f83555cf 100644
--- a/mvvm/tests/testmodel/fileutils.test.cpp
+++ b/mvvm/tests/testmodel/fileutils.test.cpp
@@ -9,9 +9,9 @@
#include "folderbasedtest.h"
#include "google_test.h"
+#include "mvvm/utils/fileutils.h"
#include "test_utils.h"
#include <QDir>
-#include "mvvm/utils/fileutils.h"
#include <stdexcept>
#include <string>
diff --git a/mvvm/tests/testmodel/graphitem.test.cpp b/mvvm/tests/testmodel/graphitem.test.cpp
index 4f97d7ca851..9f45e855957 100644
--- a/mvvm/tests/testmodel/graphitem.test.cpp
+++ b/mvvm/tests/testmodel/graphitem.test.cpp
@@ -9,13 +9,13 @@
#include "google_test.h"
#include "mockwidgets.h"
-#include <QColor>
#include "mvvm/model/sessionmodel.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/data1ditem.h"
#include "mvvm/standarditems/graphitem.h"
#include "mvvm/standarditems/linkeditem.h"
#include "mvvm/standarditems/plottableitems.h"
+#include <QColor>
using namespace ModelView;
using ::testing::_;
diff --git a/mvvm/tests/testmodel/itemconverterfactory.test.cpp b/mvvm/tests/testmodel/itemconverterfactory.test.cpp
index 85211edbd87..dcfd4d5b6bf 100644
--- a/mvvm/tests/testmodel/itemconverterfactory.test.cpp
+++ b/mvvm/tests/testmodel/itemconverterfactory.test.cpp
@@ -8,14 +8,14 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
-#include <QJsonObject>
#include "mvvm/factories/itemconverterfactory.h"
#include "mvvm/model/compounditem.h"
#include "mvvm/model/itemcatalogue.h"
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
+#include "test_utils.h"
+#include <QJsonObject>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/itemlistener.test.cpp b/mvvm/tests/testmodel/itemlistener.test.cpp
index dbbe33e9cf8..a2923d14e20 100644
--- a/mvvm/tests/testmodel/itemlistener.test.cpp
+++ b/mvvm/tests/testmodel/itemlistener.test.cpp
@@ -8,10 +8,10 @@
// ************************************************************************** //
#include "google_test.h"
-#include <memory>
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/signals/itemlistener.h"
+#include <memory>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/itemmanager.test.cpp b/mvvm/tests/testmodel/itemmanager.test.cpp
index 6fcaba603cf..d3339641619 100644
--- a/mvvm/tests/testmodel/itemmanager.test.cpp
+++ b/mvvm/tests/testmodel/itemmanager.test.cpp
@@ -8,11 +8,11 @@
// ************************************************************************** //
#include "google_test.h"
-#include <memory>
#include "mvvm/model/itemmanager.h"
#include "mvvm/model/itempool.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
+#include <memory>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/itempool.test.cpp b/mvvm/tests/testmodel/itempool.test.cpp
index 4d6616e3aa1..2c33284e315 100644
--- a/mvvm/tests/testmodel/itempool.test.cpp
+++ b/mvvm/tests/testmodel/itempool.test.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "google_test.h"
-#include <memory>
#include "mvvm/model/itempool.h"
#include "mvvm/model/sessionitem.h"
+#include <memory>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/itemutils.test.cpp b/mvvm/tests/testmodel/itemutils.test.cpp
index 8d2c3b58fe1..b6df97e68bf 100644
--- a/mvvm/tests/testmodel/itemutils.test.cpp
+++ b/mvvm/tests/testmodel/itemutils.test.cpp
@@ -8,7 +8,6 @@
// ************************************************************************** //
#include "google_test.h"
-#include <memory>
#include "mvvm/model/customvariants.h"
#include "mvvm/model/itemutils.h"
#include "mvvm/model/propertyitem.h"
@@ -16,6 +15,7 @@
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/standarditems/vectoritem.h"
+#include <memory>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsondocument.test.cpp b/mvvm/tests/testmodel/jsondocument.test.cpp
index 2bcb2244198..cd99cd5cedb 100644
--- a/mvvm/tests/testmodel/jsondocument.test.cpp
+++ b/mvvm/tests/testmodel/jsondocument.test.cpp
@@ -9,12 +9,12 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include "test_utils.h"
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/serialization/jsondocument.h"
+#include "test_utils.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsonitemcontainerconverter.test.cpp b/mvvm/tests/testmodel/jsonitemcontainerconverter.test.cpp
index b6f9e2a8c89..9e6dc2dc0c1 100644
--- a/mvvm/tests/testmodel/jsonitemcontainerconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsonitemcontainerconverter.test.cpp
@@ -9,10 +9,6 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include "test_utils.h"
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
#include "mvvm/model/mvvm_types.h"
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionitemcontainer.h"
@@ -21,6 +17,10 @@
#include "mvvm/serialization/jsonitemcontainerconverter.h"
#include "mvvm/serialization/jsonitemdataconverter.h"
#include "mvvm/serialization/jsonitemformatassistant.h"
+#include "test_utils.h"
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsonitemconverter.test.cpp b/mvvm/tests/testmodel/jsonitemconverter.test.cpp
index b2e65275d08..fbb22913b44 100644
--- a/mvvm/tests/testmodel/jsonitemconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsonitemconverter.test.cpp
@@ -9,10 +9,6 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include "test_utils.h"
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
#include "mvvm/model/compounditem.h"
#include "mvvm/model/itemcatalogue.h"
#include "mvvm/model/propertyitem.h"
@@ -21,6 +17,10 @@
#include "mvvm/serialization/jsonitem_types.h"
#include "mvvm/serialization/jsonitemconverter.h"
#include "mvvm/serialization/jsonitemformatassistant.h"
+#include "test_utils.h"
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsonitemdataconverter.test.cpp b/mvvm/tests/testmodel/jsonitemdataconverter.test.cpp
index d6eb902105a..79606943826 100644
--- a/mvvm/tests/testmodel/jsonitemdataconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsonitemdataconverter.test.cpp
@@ -9,15 +9,15 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include "test_utils.h"
-#include <QJsonArray>
-#include <QJsonObject>
#include "mvvm/model/customvariants.h"
#include "mvvm/model/mvvm_types.h"
#include "mvvm/model/sessionitemdata.h"
#include "mvvm/serialization/jsonitemdataconverter.h"
#include "mvvm/serialization/jsonitemformatassistant.h"
#include "mvvm/serialization/jsonvariantconverter.h"
+#include "test_utils.h"
+#include <QJsonArray>
+#include <QJsonObject>
#include <string>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsonitemformatassistant.test.cpp b/mvvm/tests/testmodel/jsonitemformatassistant.test.cpp
index 879834caf41..458910ecdcb 100644
--- a/mvvm/tests/testmodel/jsonitemformatassistant.test.cpp
+++ b/mvvm/tests/testmodel/jsonitemformatassistant.test.cpp
@@ -8,10 +8,10 @@
// ************************************************************************** //
#include "google_test.h"
-#include <QJsonArray>
-#include <QJsonObject>
#include "mvvm/serialization/jsonitemformatassistant.h"
#include "mvvm/serialization/jsonvariantconverter.h"
+#include <QJsonArray>
+#include <QJsonObject>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsonmodelconverter.test.cpp b/mvvm/tests/testmodel/jsonmodelconverter.test.cpp
index d8043891eca..438879330e2 100644
--- a/mvvm/tests/testmodel/jsonmodelconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsonmodelconverter.test.cpp
@@ -9,10 +9,6 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include "test_utils.h"
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
#include "mvvm/model/itempool.h"
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionitem.h"
@@ -21,6 +17,10 @@
#include "mvvm/serialization/jsonitem_types.h"
#include "mvvm/serialization/jsonitemformatassistant.h"
#include "mvvm/serialization/jsonmodelconverter.h"
+#include "test_utils.h"
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsontaginfoconverter.test.cpp b/mvvm/tests/testmodel/jsontaginfoconverter.test.cpp
index 659c93583e5..dae960e349e 100644
--- a/mvvm/tests/testmodel/jsontaginfoconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsontaginfoconverter.test.cpp
@@ -9,12 +9,12 @@
#include "folderbasedtest.h"
#include "google_test.h"
+#include "mvvm/model/taginfo.h"
+#include "mvvm/serialization/jsontaginfoconverter.h"
#include "test_utils.h"
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
-#include "mvvm/model/taginfo.h"
-#include "mvvm/serialization/jsontaginfoconverter.h"
#include <string>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsonutils.test.cpp b/mvvm/tests/testmodel/jsonutils.test.cpp
index ccd1d24087e..cd28b71ab65 100644
--- a/mvvm/tests/testmodel/jsonutils.test.cpp
+++ b/mvvm/tests/testmodel/jsonutils.test.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "google_test.h"
-#include <limits>
#include "mvvm/serialization/jsonutils.h"
#include "mvvm/utils/reallimits.h"
+#include <limits>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/jsonvariantconverter.test.cpp b/mvvm/tests/testmodel/jsonvariantconverter.test.cpp
index 647b4e4c74f..a4a6cdf878c 100644
--- a/mvvm/tests/testmodel/jsonvariantconverter.test.cpp
+++ b/mvvm/tests/testmodel/jsonvariantconverter.test.cpp
@@ -9,17 +9,17 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include "test_utils.h"
-#include <QColor>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
#include "mvvm/model/comboproperty.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/model/variant_constants.h"
#include "mvvm/serialization/jsonvariantconverter.h"
#include "mvvm/utils/reallimits.h"
+#include "test_utils.h"
+#include <QColor>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
#include <vector>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/modellistener.test.cpp b/mvvm/tests/testmodel/modellistener.test.cpp
index 6604c210266..debf14d8d46 100644
--- a/mvvm/tests/testmodel/modellistener.test.cpp
+++ b/mvvm/tests/testmodel/modellistener.test.cpp
@@ -8,10 +8,10 @@
// ************************************************************************** //
#include "google_test.h"
-#include <memory>
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/signals/modellistener.h"
+#include <memory>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/modelutils.test.cpp b/mvvm/tests/testmodel/modelutils.test.cpp
index 53c69d9a948..bbe4e8f0620 100644
--- a/mvvm/tests/testmodel/modelutils.test.cpp
+++ b/mvvm/tests/testmodel/modelutils.test.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "google_test.h"
+#include "mvvm/model/modelutils.h"
#include "toyitems.h"
#include "toymodel.h"
-#include "mvvm/model/modelutils.h"
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/numericutils.test.cpp b/mvvm/tests/testmodel/numericutils.test.cpp
index f1944e1b032..e5ebf169989 100644
--- a/mvvm/tests/testmodel/numericutils.test.cpp
+++ b/mvvm/tests/testmodel/numericutils.test.cpp
@@ -8,8 +8,8 @@
// ************************************************************************** //
#include "google_test.h"
-#include <cmath>
#include "mvvm/utils/numericutils.h"
+#include <cmath>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/path.test.cpp b/mvvm/tests/testmodel/path.test.cpp
index 1254a8e5e57..4806a7c95de 100644
--- a/mvvm/tests/testmodel/path.test.cpp
+++ b/mvvm/tests/testmodel/path.test.cpp
@@ -8,12 +8,12 @@
// ************************************************************************** //
#include "google_test.h"
-#include <memory>
#include "mvvm/model/modelutils.h"
#include "mvvm/model/path.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
+#include <memory>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/plottableitems.test.cpp b/mvvm/tests/testmodel/plottableitems.test.cpp
index 67dcf1cb8ae..89dcf17a5ca 100644
--- a/mvvm/tests/testmodel/plottableitems.test.cpp
+++ b/mvvm/tests/testmodel/plottableitems.test.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "google_test.h"
-#include <QColor>
#include "mvvm/model/comboproperty.h"
#include "mvvm/standarditems/plottableitems.h"
+#include <QColor>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/project.test.cpp b/mvvm/tests/testmodel/project.test.cpp
index cd92a94373b..3b0f3348920 100644
--- a/mvvm/tests/testmodel/project.test.cpp
+++ b/mvvm/tests/testmodel/project.test.cpp
@@ -9,13 +9,13 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include "test_utils.h"
-#include <cctype>
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/project/project.h"
#include "mvvm/project/project_types.h"
#include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
+#include <cctype>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/projectmanager.test.cpp b/mvvm/tests/testmodel/projectmanager.test.cpp
index 3af9ab0c886..63e9786f464 100644
--- a/mvvm/tests/testmodel/projectmanager.test.cpp
+++ b/mvvm/tests/testmodel/projectmanager.test.cpp
@@ -9,13 +9,13 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include "test_utils.h"
-#include <cctype>
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/project/project_types.h"
#include "mvvm/project/projectmanager.h"
#include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
+#include <cctype>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/projectmanagerdecorator.test.cpp b/mvvm/tests/testmodel/projectmanagerdecorator.test.cpp
index 577dccc119b..1a0f180a9b1 100644
--- a/mvvm/tests/testmodel/projectmanagerdecorator.test.cpp
+++ b/mvvm/tests/testmodel/projectmanagerdecorator.test.cpp
@@ -9,12 +9,12 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include <cctype>
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/project/project_types.h"
#include "mvvm/project/projectmanagerdecorator.h"
#include "mvvm/utils/fileutils.h"
+#include <cctype>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/projectutils.test.cpp b/mvvm/tests/testmodel/projectutils.test.cpp
index b5d6f15bc9f..a0b816f5942 100644
--- a/mvvm/tests/testmodel/projectutils.test.cpp
+++ b/mvvm/tests/testmodel/projectutils.test.cpp
@@ -9,7 +9,6 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include "test_utils.h"
#include "mvvm/interfaces/applicationmodelsinterface.h"
#include "mvvm/interfaces/projectinterface.h"
#include "mvvm/model/propertyitem.h"
@@ -17,6 +16,7 @@
#include "mvvm/project/project_types.h"
#include "mvvm/project/projectutils.h"
#include "mvvm/utils/fileutils.h"
+#include "test_utils.h"
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/reallimits.test.cpp b/mvvm/tests/testmodel/reallimits.test.cpp
index 77f8a87356e..5d7120e2910 100644
--- a/mvvm/tests/testmodel/reallimits.test.cpp
+++ b/mvvm/tests/testmodel/reallimits.test.cpp
@@ -8,8 +8,8 @@
// ************************************************************************** //
#include "google_test.h"
-#include <limits>
#include "mvvm/utils/reallimits.h"
+#include <limits>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/sessionitem.test.cpp b/mvvm/tests/testmodel/sessionitem.test.cpp
index ab49bc65e7e..06801726f43 100644
--- a/mvvm/tests/testmodel/sessionitem.test.cpp
+++ b/mvvm/tests/testmodel/sessionitem.test.cpp
@@ -8,13 +8,13 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
-#include <memory>
#include "mvvm/model/itempool.h"
#include "mvvm/model/itemutils.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/model/variant_constants.h"
+#include "test_utils.h"
+#include <memory>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/sessionitemcontainer.test.cpp b/mvvm/tests/testmodel/sessionitemcontainer.test.cpp
index cbd0dd6b04e..f1d6c88cbc5 100644
--- a/mvvm/tests/testmodel/sessionitemcontainer.test.cpp
+++ b/mvvm/tests/testmodel/sessionitemcontainer.test.cpp
@@ -8,9 +8,9 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionitemcontainer.h"
+#include "test_utils.h"
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/sessionitemtags.test.cpp b/mvvm/tests/testmodel/sessionitemtags.test.cpp
index e88ec463fe0..ed93c8de4f7 100644
--- a/mvvm/tests/testmodel/sessionitemtags.test.cpp
+++ b/mvvm/tests/testmodel/sessionitemtags.test.cpp
@@ -8,10 +8,10 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionitemtags.h"
#include "mvvm/model/taginfo.h"
+#include "test_utils.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/sessionmodel.test.cpp b/mvvm/tests/testmodel/sessionmodel.test.cpp
index 410f74e4d5f..665f1556fa7 100644
--- a/mvvm/tests/testmodel/sessionmodel.test.cpp
+++ b/mvvm/tests/testmodel/sessionmodel.test.cpp
@@ -8,7 +8,6 @@
// ************************************************************************** //
#include "google_test.h"
-#include <memory>
#include "mvvm/model/compounditem.h"
#include "mvvm/model/itempool.h"
#include "mvvm/model/itemutils.h"
@@ -16,6 +15,7 @@
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
+#include <memory>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/stringutils.test.cpp b/mvvm/tests/testmodel/stringutils.test.cpp
index a8a847407ed..7e2d5594b1b 100644
--- a/mvvm/tests/testmodel/stringutils.test.cpp
+++ b/mvvm/tests/testmodel/stringutils.test.cpp
@@ -8,8 +8,8 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "mvvm/utils/stringutils.h"
+#include "test_utils.h"
using namespace ModelView;
using namespace TestUtils;
diff --git a/mvvm/tests/testmodel/threadsafestack.test.cpp b/mvvm/tests/testmodel/threadsafestack.test.cpp
index 69fe3e440fa..4af8f82a925 100644
--- a/mvvm/tests/testmodel/threadsafestack.test.cpp
+++ b/mvvm/tests/testmodel/threadsafestack.test.cpp
@@ -8,8 +8,8 @@
// ************************************************************************** //
#include "google_test.h"
-#include <future>
#include "mvvm/utils/threadsafestack.h"
+#include <future>
using namespace ModelView;
diff --git a/mvvm/tests/testmodel/undostack.test.cpp b/mvvm/tests/testmodel/undostack.test.cpp
index 585800d5364..8a44fa3c6fb 100644
--- a/mvvm/tests/testmodel/undostack.test.cpp
+++ b/mvvm/tests/testmodel/undostack.test.cpp
@@ -8,8 +8,6 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
#include "mvvm/commands/commandadapter.h"
#include "mvvm/commands/setvaluecommand.h"
#include "mvvm/commands/undostack.h"
@@ -22,6 +20,8 @@
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/data1ditem.h"
#include "mvvm/standarditems/graphitem.h"
+#include "toyitems.h"
+#include "toymodel.h"
using namespace ModelView;
diff --git a/mvvm/tests/testview/axistitlecontroller.test.cpp b/mvvm/tests/testview/axistitlecontroller.test.cpp
index 9aa40836d9b..f39622ed986 100644
--- a/mvvm/tests/testview/axistitlecontroller.test.cpp
+++ b/mvvm/tests/testview/axistitlecontroller.test.cpp
@@ -8,11 +8,11 @@
// ************************************************************************** //
#include "google_test.h"
-#include "qcustomplot.h"
-#include <QFont>
#include "mvvm/model/sessionmodel.h"
#include "mvvm/plotting/axistitlecontroller.h"
#include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
+#include <QFont>
using namespace ModelView;
diff --git a/mvvm/tests/testview/colormapplotcontroller.test.cpp b/mvvm/tests/testview/colormapplotcontroller.test.cpp
index 7ad1a56ca3b..657d3b306a7 100644
--- a/mvvm/tests/testview/colormapplotcontroller.test.cpp
+++ b/mvvm/tests/testview/colormapplotcontroller.test.cpp
@@ -9,14 +9,14 @@
#include "customplot_test_utils.h"
#include "google_test.h"
-#include "qcustomplot.h"
-#include <QSignalSpy>
#include "mvvm/model/comboproperty.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/plotting/colormapplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/colormapitem.h"
#include "mvvm/standarditems/data2ditem.h"
+#include "qcustomplot.h"
+#include <QSignalSpy>
using namespace ModelView;
diff --git a/mvvm/tests/testview/colormapviewportplotcontroller.test.cpp b/mvvm/tests/testview/colormapviewportplotcontroller.test.cpp
index 4c7fcd4b8a7..5faa3e4fb88 100644
--- a/mvvm/tests/testview/colormapviewportplotcontroller.test.cpp
+++ b/mvvm/tests/testview/colormapviewportplotcontroller.test.cpp
@@ -9,7 +9,6 @@
#include "customplot_test_utils.h"
#include "google_test.h"
-#include "qcustomplot.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/plotting/colormapviewportplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
@@ -17,6 +16,7 @@
#include "mvvm/standarditems/colormapviewportitem.h"
#include "mvvm/standarditems/data1ditem.h"
#include "mvvm/standarditems/data2ditem.h"
+#include "qcustomplot.h"
#include <qcustomplot.h>
using namespace ModelView;
diff --git a/mvvm/tests/testview/customplotsceneadapter.test.cpp b/mvvm/tests/testview/customplotsceneadapter.test.cpp
index 3056f213e59..218e996ac2e 100644
--- a/mvvm/tests/testview/customplotsceneadapter.test.cpp
+++ b/mvvm/tests/testview/customplotsceneadapter.test.cpp
@@ -8,8 +8,8 @@
// ************************************************************************** //
#include "google_test.h"
-#include "qcustomplot.h"
#include "mvvm/plotting/customplotsceneadapter.h"
+#include "qcustomplot.h"
using namespace ModelView;
diff --git a/mvvm/tests/testview/data1dplotcontroller.test.cpp b/mvvm/tests/testview/data1dplotcontroller.test.cpp
index 6851a83138b..dec0fee193b 100644
--- a/mvvm/tests/testview/data1dplotcontroller.test.cpp
+++ b/mvvm/tests/testview/data1dplotcontroller.test.cpp
@@ -9,12 +9,12 @@
#include "customplot_test_utils.h"
#include "google_test.h"
-#include "qcustomplot.h"
-#include <algorithm>
#include "mvvm/model/sessionmodel.h"
#include "mvvm/plotting/data1dplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/data1ditem.h"
+#include "qcustomplot.h"
+#include <algorithm>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testview/data2dplotcontroller.test.cpp b/mvvm/tests/testview/data2dplotcontroller.test.cpp
index d6d995a2740..5e6998de2c7 100644
--- a/mvvm/tests/testview/data2dplotcontroller.test.cpp
+++ b/mvvm/tests/testview/data2dplotcontroller.test.cpp
@@ -9,12 +9,12 @@
#include "customplot_test_utils.h"
#include "google_test.h"
-#include "qcustomplot.h"
-#include <QSignalSpy>
#include "mvvm/model/sessionmodel.h"
#include "mvvm/plotting/data2dplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/data2ditem.h"
+#include "qcustomplot.h"
+#include <QSignalSpy>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testview/graphplotcontroller.test.cpp b/mvvm/tests/testview/graphplotcontroller.test.cpp
index 9c9b3ac68ca..5c4893df3ee 100644
--- a/mvvm/tests/testview/graphplotcontroller.test.cpp
+++ b/mvvm/tests/testview/graphplotcontroller.test.cpp
@@ -9,8 +9,6 @@
#include "customplot_test_utils.h"
#include "google_test.h"
-#include "qcustomplot.h"
-#include <QSignalSpy>
#include "mvvm/model/comboproperty.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/plotting/graphplotcontroller.h"
@@ -18,6 +16,8 @@
#include "mvvm/standarditems/data1ditem.h"
#include "mvvm/standarditems/graphitem.h"
#include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
+#include <QSignalSpy>
using namespace ModelView;
diff --git a/mvvm/tests/testview/graphviewportplotcontroller.test.cpp b/mvvm/tests/testview/graphviewportplotcontroller.test.cpp
index ae9d32f1b71..ff0aaaa341e 100644
--- a/mvvm/tests/testview/graphviewportplotcontroller.test.cpp
+++ b/mvvm/tests/testview/graphviewportplotcontroller.test.cpp
@@ -9,7 +9,6 @@
#include "customplot_test_utils.h"
#include "google_test.h"
-#include "qcustomplot.h"
#include "mvvm/interfaces/undostackinterface.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/plotting/graphviewportplotcontroller.h"
@@ -17,6 +16,7 @@
#include "mvvm/standarditems/data1ditem.h"
#include "mvvm/standarditems/graphitem.h"
#include "mvvm/standarditems/graphviewportitem.h"
+#include "qcustomplot.h"
using namespace ModelView;
diff --git a/mvvm/tests/testview/pencontroller.test.cpp b/mvvm/tests/testview/pencontroller.test.cpp
index ee587e3d1c5..caeb9582086 100644
--- a/mvvm/tests/testview/pencontroller.test.cpp
+++ b/mvvm/tests/testview/pencontroller.test.cpp
@@ -9,10 +9,10 @@
#include "customplot_test_utils.h"
#include "google_test.h"
-#include "qcustomplot.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/plotting/pencontroller.h"
#include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
#include <stdexcept>
diff --git a/mvvm/tests/testview/propertyflatview.test.cpp b/mvvm/tests/testview/propertyflatview.test.cpp
index f6b94bd80c3..5953d35f42a 100644
--- a/mvvm/tests/testview/propertyflatview.test.cpp
+++ b/mvvm/tests/testview/propertyflatview.test.cpp
@@ -8,12 +8,12 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QGridLayout>
#include "mvvm/model/sessionmodel.h"
#include "mvvm/standarditems/vectoritem.h"
#include "mvvm/widgets/propertyflatview.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QGridLayout>
using namespace ModelView;
diff --git a/mvvm/tests/testview/viewportaxisplotcontroller.test.cpp b/mvvm/tests/testview/viewportaxisplotcontroller.test.cpp
index 5cf764e76cf..a340d548259 100644
--- a/mvvm/tests/testview/viewportaxisplotcontroller.test.cpp
+++ b/mvvm/tests/testview/viewportaxisplotcontroller.test.cpp
@@ -10,12 +10,12 @@
#include "customplot_test_utils.h"
#include "google_test.h"
#include "mockwidgets.h"
-#include "qcustomplot.h"
-#include <QSignalSpy>
#include "mvvm/model/sessionmodel.h"
#include "mvvm/plotting/viewportaxisplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
+#include <QSignalSpy>
using namespace ModelView;
using ::testing::_;
diff --git a/mvvm/tests/testview/widgetutils.test.cpp b/mvvm/tests/testview/widgetutils.test.cpp
index fe9c99e7f20..edf7e83f281 100644
--- a/mvvm/tests/testview/widgetutils.test.cpp
+++ b/mvvm/tests/testview/widgetutils.test.cpp
@@ -8,10 +8,10 @@
// ************************************************************************** //
#include "google_test.h"
+#include "mvvm/widgets/widgetutils.h"
#include "test_utils.h"
#include <QDebug>
#include <QDir>
-#include "mvvm/widgets/widgetutils.h"
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/TestToyLayerItem.cpp b/mvvm/tests/testviewmodel/TestToyLayerItem.cpp
index c79ba03fbfe..c14128f6e98 100644
--- a/mvvm/tests/testviewmodel/TestToyLayerItem.cpp
+++ b/mvvm/tests/testviewmodel/TestToyLayerItem.cpp
@@ -8,13 +8,13 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QSignalSpy>
#include "mvvm/standarditems/vectoritem.h"
#include "mvvm/viewmodel/defaultviewmodel.h"
#include "mvvm/viewmodel/standardviewitems.h"
#include "mvvm/viewmodel/topitemsviewmodel.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QSignalSpy>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/TestToyMultiLayerItem.cpp b/mvvm/tests/testviewmodel/TestToyMultiLayerItem.cpp
index 58dbaa60a83..d0052f43c84 100644
--- a/mvvm/tests/testviewmodel/TestToyMultiLayerItem.cpp
+++ b/mvvm/tests/testviewmodel/TestToyMultiLayerItem.cpp
@@ -8,12 +8,12 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QSignalSpy>
#include "mvvm/viewmodel/defaultviewmodel.h"
#include "mvvm/viewmodel/standardviewitems.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QSignalSpy>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/TestToyParticleItem.cpp b/mvvm/tests/testviewmodel/TestToyParticleItem.cpp
index fc69ed769e7..42c8c0e64f0 100644
--- a/mvvm/tests/testviewmodel/TestToyParticleItem.cpp
+++ b/mvvm/tests/testviewmodel/TestToyParticleItem.cpp
@@ -8,12 +8,12 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QSignalSpy>
#include "mvvm/model/itemutils.h"
#include "mvvm/viewmodel/defaultviewmodel.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QSignalSpy>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/defaulteditorfactory.test.cpp b/mvvm/tests/testviewmodel/defaulteditorfactory.test.cpp
index 3074f2424d0..dff7315cb2b 100644
--- a/mvvm/tests/testviewmodel/defaulteditorfactory.test.cpp
+++ b/mvvm/tests/testviewmodel/defaulteditorfactory.test.cpp
@@ -8,10 +8,6 @@
// ************************************************************************** //
#include "google_test.h"
-#include "widgetbasedtest.h"
-#include <QSpinBox>
-#include <QStandardItemModel>
-#include <limits>
#include "mvvm/editors/booleditor.h"
#include "mvvm/editors/coloreditor.h"
#include "mvvm/editors/combopropertyeditor.h"
@@ -31,6 +27,10 @@
#include "mvvm/utils/reallimits.h"
#include "mvvm/viewmodel/defaultviewmodel.h"
#include "mvvm/viewmodel/viewmodeldelegate.h"
+#include "widgetbasedtest.h"
+#include <QSpinBox>
+#include <QStandardItemModel>
+#include <limits>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/defaultviewmodel.test.cpp b/mvvm/tests/testviewmodel/defaultviewmodel.test.cpp
index 3dc8fb1df34..3793b646b9a 100644
--- a/mvvm/tests/testviewmodel/defaultviewmodel.test.cpp
+++ b/mvvm/tests/testviewmodel/defaultviewmodel.test.cpp
@@ -9,10 +9,6 @@
#include "folderbasedtest.h"
#include "google_test.h"
-#include "test_utils.h"
-#include <QDebug>
-#include <QJsonObject>
-#include <QSignalSpy>
#include "mvvm/model/compounditem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
@@ -28,6 +24,10 @@
#include "mvvm/viewmodel/defaultviewmodel.h"
#include "mvvm/viewmodel/standardviewitems.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include "test_utils.h"
+#include <QDebug>
+#include <QJsonObject>
+#include <QSignalSpy>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/labeldatarowstrategy.test.cpp b/mvvm/tests/testviewmodel/labeldatarowstrategy.test.cpp
index b810b9591fd..bcb9ae95cc5 100644
--- a/mvvm/tests/testviewmodel/labeldatarowstrategy.test.cpp
+++ b/mvvm/tests/testviewmodel/labeldatarowstrategy.test.cpp
@@ -8,10 +8,10 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/viewmodel/labeldatarowstrategy.h"
#include "mvvm/viewmodel/standardviewitems.h"
+#include "test_utils.h"
namespace {
const int expected_column_count = 2;
diff --git a/mvvm/tests/testviewmodel/propertiesrowstrategy.test.cpp b/mvvm/tests/testviewmodel/propertiesrowstrategy.test.cpp
index 0e8aa72c2e2..46b5d82ac28 100644
--- a/mvvm/tests/testviewmodel/propertiesrowstrategy.test.cpp
+++ b/mvvm/tests/testviewmodel/propertiesrowstrategy.test.cpp
@@ -8,12 +8,12 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/standarditems/vectoritem.h"
#include "mvvm/viewmodel/propertiesrowstrategy.h"
#include "mvvm/viewmodel/standardviewitems.h"
+#include "test_utils.h"
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/propertyflatviewmodel.test.cpp b/mvvm/tests/testviewmodel/propertyflatviewmodel.test.cpp
index 17ba5698a41..610e10d2a24 100644
--- a/mvvm/tests/testviewmodel/propertyflatviewmodel.test.cpp
+++ b/mvvm/tests/testviewmodel/propertyflatviewmodel.test.cpp
@@ -8,14 +8,14 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/standarditems/vectoritem.h"
#include "mvvm/viewmodel/propertyflatviewmodel.h"
+#include "toyitems.h"
+#include "toymodel.h"
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/propertytableviewmodel.test.cpp b/mvvm/tests/testviewmodel/propertytableviewmodel.test.cpp
index 03aa346c693..f5180844588 100644
--- a/mvvm/tests/testviewmodel/propertytableviewmodel.test.cpp
+++ b/mvvm/tests/testviewmodel/propertytableviewmodel.test.cpp
@@ -8,13 +8,13 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/standarditems/vectoritem.h"
#include "mvvm/viewmodel/propertytableviewmodel.h"
+#include "toyitems.h"
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/propertyviewmodel.test.cpp b/mvvm/tests/testviewmodel/propertyviewmodel.test.cpp
index 2858d3aef57..0cc6342a47a 100644
--- a/mvvm/tests/testviewmodel/propertyviewmodel.test.cpp
+++ b/mvvm/tests/testviewmodel/propertyviewmodel.test.cpp
@@ -8,14 +8,14 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/standarditems/vectoritem.h"
#include "mvvm/viewmodel/propertyviewmodel.h"
+#include "toyitems.h"
+#include "toymodel.h"
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/scientificspinbox.test.cpp b/mvvm/tests/testviewmodel/scientificspinbox.test.cpp
index f1ea2becab7..587e05fa76a 100644
--- a/mvvm/tests/testviewmodel/scientificspinbox.test.cpp
+++ b/mvvm/tests/testviewmodel/scientificspinbox.test.cpp
@@ -8,8 +8,8 @@
// ************************************************************************** //
#include "google_test.h"
-#include <limits>
#include "mvvm/editors/scientificspinbox.h"
+#include <limits>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/standardchildrenstrategies.test.cpp b/mvvm/tests/testviewmodel/standardchildrenstrategies.test.cpp
index 1b828f7c15d..0ea8669c589 100644
--- a/mvvm/tests/testviewmodel/standardchildrenstrategies.test.cpp
+++ b/mvvm/tests/testviewmodel/standardchildrenstrategies.test.cpp
@@ -8,14 +8,14 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
#include "mvvm/model/compounditem.h"
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/standarditems/vectoritem.h"
#include "mvvm/viewmodel/standardchildrenstrategies.h"
+#include "toyitems.h"
+#include "toymodel.h"
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/standardviewitems.test.cpp b/mvvm/tests/testviewmodel/standardviewitems.test.cpp
index 60c2d80b0cd..882776b6bfc 100644
--- a/mvvm/tests/testviewmodel/standardviewitems.test.cpp
+++ b/mvvm/tests/testviewmodel/standardviewitems.test.cpp
@@ -8,10 +8,10 @@
// ************************************************************************** //
#include "google_test.h"
-#include <QColor>
-#include <memory>
#include "mvvm/model/sessionitem.h"
#include "mvvm/viewmodel/standardviewitems.h"
+#include <QColor>
+#include <memory>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/topitemsviewmodel.test.cpp b/mvvm/tests/testviewmodel/topitemsviewmodel.test.cpp
index 351f6b1971a..aacc02faad5 100644
--- a/mvvm/tests/testviewmodel/topitemsviewmodel.test.cpp
+++ b/mvvm/tests/testviewmodel/topitemsviewmodel.test.cpp
@@ -8,15 +8,15 @@
// ************************************************************************** //
#include "google_test.h"
-#include "toyitems.h"
-#include "toymodel.h"
-#include <QSignalSpy>
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/model/taginfo.h"
#include "mvvm/standarditems/vectoritem.h"
#include "mvvm/viewmodel/topitemsviewmodel.h"
+#include "toyitems.h"
+#include "toymodel.h"
+#include <QSignalSpy>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/viewitem.test.cpp b/mvvm/tests/testviewmodel/viewitem.test.cpp
index a5354c9bd17..1b76b39a939 100644
--- a/mvvm/tests/testviewmodel/viewitem.test.cpp
+++ b/mvvm/tests/testviewmodel/viewitem.test.cpp
@@ -8,8 +8,8 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "mvvm/viewmodel/viewitem.h"
+#include "test_utils.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/viewmodelbase.test.cpp b/mvvm/tests/testviewmodel/viewmodelbase.test.cpp
index 7c98d59eab9..1816c44d134 100644
--- a/mvvm/tests/testviewmodel/viewmodelbase.test.cpp
+++ b/mvvm/tests/testviewmodel/viewmodelbase.test.cpp
@@ -8,12 +8,12 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
-#include <QSignalSpy>
-#include <QStandardItemModel>
#include "mvvm/model/sessionitem.h"
#include "mvvm/viewmodel/standardviewitems.h"
#include "mvvm/viewmodel/viewmodelbase.h"
+#include "test_utils.h"
+#include <QSignalSpy>
+#include <QStandardItemModel>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/viewmodelcontroller.test.cpp b/mvvm/tests/testviewmodel/viewmodelcontroller.test.cpp
index 7ce89ab181c..c889c914051 100644
--- a/mvvm/tests/testviewmodel/viewmodelcontroller.test.cpp
+++ b/mvvm/tests/testviewmodel/viewmodelcontroller.test.cpp
@@ -8,8 +8,6 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
-#include <QSignalSpy>
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/standarditems/vectoritem.h"
@@ -18,6 +16,8 @@
#include "mvvm/viewmodel/standardviewitems.h"
#include "mvvm/viewmodel/viewmodelbase.h"
#include "mvvm/viewmodel/viewmodelcontroller.h"
+#include "test_utils.h"
+#include <QSignalSpy>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/viewmodeldelegate.test.cpp b/mvvm/tests/testviewmodel/viewmodeldelegate.test.cpp
index 5317c92d42a..46627a0f80a 100644
--- a/mvvm/tests/testviewmodel/viewmodeldelegate.test.cpp
+++ b/mvvm/tests/testviewmodel/viewmodeldelegate.test.cpp
@@ -8,15 +8,15 @@
// ************************************************************************** //
#include "google_test.h"
-#include "widgetbasedtest.h"
-#include <QDataWidgetMapper>
-#include <QStyleOptionViewItem>
#include "mvvm/editors/customeditor.h"
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/standarditems/vectoritem.h"
#include "mvvm/viewmodel/defaultviewmodel.h"
#include "mvvm/viewmodel/viewmodeldelegate.h"
+#include "widgetbasedtest.h"
+#include <QDataWidgetMapper>
+#include <QStyleOptionViewItem>
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/viewmodelfactory.test.cpp b/mvvm/tests/testviewmodel/viewmodelfactory.test.cpp
index 7523dca8b36..46d16dc3d60 100644
--- a/mvvm/tests/testviewmodel/viewmodelfactory.test.cpp
+++ b/mvvm/tests/testviewmodel/viewmodelfactory.test.cpp
@@ -8,13 +8,13 @@
// ************************************************************************** //
#include "google_test.h"
-#include "test_utils.h"
#include "mvvm/factories/viewmodelfactory.h"
#include "mvvm/model/propertyitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/viewmodel/labeldatarowstrategy.h"
#include "mvvm/viewmodel/standardchildrenstrategies.h"
#include "mvvm/viewmodel/standardviewitems.h"
+#include "test_utils.h"
using namespace ModelView;
diff --git a/mvvm/tests/testviewmodel/viewmodelutils.test.cpp b/mvvm/tests/testviewmodel/viewmodelutils.test.cpp
index 9ac3272b28f..0bd3ab405dd 100644
--- a/mvvm/tests/testviewmodel/viewmodelutils.test.cpp
+++ b/mvvm/tests/testviewmodel/viewmodelutils.test.cpp
@@ -8,9 +8,6 @@
// ************************************************************************** //
#include "google_test.h"
-#include <QColor>
-#include <QModelIndexList>
-#include <QStandardItemModel>
#include "mvvm/model/mvvm_types.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
@@ -18,6 +15,9 @@
#include "mvvm/viewmodel/propertytableviewmodel.h"
#include "mvvm/viewmodel/standardviewitems.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include <QColor>
+#include <QModelIndexList>
+#include <QStandardItemModel>
namespace {
QList<QStandardItem*> get_items(std::vector<int> data) {
diff --git a/mvvm/view/mvvm/plotting/axistitlecontroller.cpp b/mvvm/view/mvvm/plotting/axistitlecontroller.cpp
index b5d2b613304..e589d3182eb 100644
--- a/mvvm/view/mvvm/plotting/axistitlecontroller.cpp
+++ b/mvvm/view/mvvm/plotting/axistitlecontroller.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
#include "mvvm/plotting/axistitlecontroller.h"
#include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/axistitlecontroller.h b/mvvm/view/mvvm/plotting/axistitlecontroller.h
index bed3f985ceb..cbf1cb84eda 100644
--- a/mvvm/view/mvvm/plotting/axistitlecontroller.h
+++ b/mvvm/view/mvvm/plotting/axistitlecontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_AXISTITLECONTROLLER_H
#define MVVM_PLOTTING_AXISTITLECONTROLLER_H
-#include <memory>
#include "mvvm/signals/itemlistener.h"
#include "mvvm/view_export.h"
+#include <memory>
class QCPAxis;
diff --git a/mvvm/view/mvvm/plotting/colormapcanvas.cpp b/mvvm/view/mvvm/plotting/colormapcanvas.cpp
index 940c9fd7e21..522d8ae3ec7 100644
--- a/mvvm/view/mvvm/plotting/colormapcanvas.cpp
+++ b/mvvm/view/mvvm/plotting/colormapcanvas.cpp
@@ -7,7 +7,6 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
#include "mvvm/plotting/colormapcanvas.h"
#include "mvvm/plotting/colormapviewportplotcontroller.h"
#include "mvvm/plotting/customplotsceneadapter.h"
@@ -15,6 +14,7 @@
#include "mvvm/plotting/statusstringreporterfactory.h"
#include "mvvm/standarditems/colormapviewportitem.h"
#include "mvvm/widgets/statuslabel.h"
+#include "qcustomplot.h"
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/colormapcanvas.h b/mvvm/view/mvvm/plotting/colormapcanvas.h
index 6b60aba1dab..699f4192695 100644
--- a/mvvm/view/mvvm/plotting/colormapcanvas.h
+++ b/mvvm/view/mvvm/plotting/colormapcanvas.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_COLORMAPCANVAS_H
#define MVVM_PLOTTING_COLORMAPCANVAS_H
+#include "mvvm/view_export.h"
#include <QWidget>
#include <memory>
-#include "mvvm/view_export.h"
namespace ModelView {
diff --git a/mvvm/view/mvvm/plotting/colormapinfoformatter.cpp b/mvvm/view/mvvm/plotting/colormapinfoformatter.cpp
index 92a47214df8..55933a52cb1 100644
--- a/mvvm/view/mvvm/plotting/colormapinfoformatter.cpp
+++ b/mvvm/view/mvvm/plotting/colormapinfoformatter.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
#include "mvvm/plotting/colormapinfoformatter.h"
#include "mvvm/utils/stringutils.h"
+#include "qcustomplot.h"
#include <sstream>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/colormapplotcontroller.cpp b/mvvm/view/mvvm/plotting/colormapplotcontroller.cpp
index 32603832fe9..81a0b3efa4d 100644
--- a/mvvm/view/mvvm/plotting/colormapplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/colormapplotcontroller.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
-#include <map>
-#include "mvvm/model/comboproperty.h"
#include "mvvm/plotting/colormapplotcontroller.h"
+#include "mvvm/model/comboproperty.h"
#include "mvvm/plotting/data2dplotcontroller.h"
#include "mvvm/standarditems/colormapitem.h"
#include "mvvm/standarditems/data2ditem.h"
+#include "qcustomplot.h"
+#include <map>
namespace {
using gradient_map_t = std::map<std::string, QCPColorGradient::GradientPreset>;
diff --git a/mvvm/view/mvvm/plotting/colormapplotcontroller.h b/mvvm/view/mvvm/plotting/colormapplotcontroller.h
index 200cf154884..582d75ef569 100644
--- a/mvvm/view/mvvm/plotting/colormapplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/colormapplotcontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_COLORMAPPLOTCONTROLLER_H
#define MVVM_PLOTTING_COLORMAPPLOTCONTROLLER_H
-#include <memory>
#include "mvvm/signals/itemlistener.h"
#include "mvvm/view_export.h"
+#include <memory>
class QCustomPlot;
class QCPColorScale;
diff --git a/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.cpp b/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.cpp
index efe8fa77168..b72378c3d90 100644
--- a/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.cpp
@@ -7,14 +7,14 @@
//
// ************************************************************************** //
-#include <list>
-#include "mvvm/plotting/colormapplotcontroller.h"
#include "mvvm/plotting/colormapviewportplotcontroller.h"
+#include "mvvm/plotting/colormapplotcontroller.h"
#include "mvvm/plotting/colorscaleplotcontroller.h"
#include "mvvm/plotting/viewportaxisplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/colormapitem.h"
#include "mvvm/standarditems/colormapviewportitem.h"
+#include <list>
#include <qcustomplot.h>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.h b/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.h
index 3f30fea8f54..46968220dc8 100644
--- a/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/colormapviewportplotcontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_COLORMAPVIEWPORTPLOTCONTROLLER_H
#define MVVM_PLOTTING_COLORMAPVIEWPORTPLOTCONTROLLER_H
-#include <memory>
#include "mvvm/signals/itemlistener.h"
#include "mvvm/view_export.h"
+#include <memory>
class QCustomPlot;
diff --git a/mvvm/view/mvvm/plotting/colorscaleplotcontroller.cpp b/mvvm/view/mvvm/plotting/colorscaleplotcontroller.cpp
index a3c62a56e50..8fb9793bc12 100644
--- a/mvvm/view/mvvm/plotting/colorscaleplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/colorscaleplotcontroller.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
#include "mvvm/plotting/colorscaleplotcontroller.h"
#include "mvvm/plotting/viewportaxisplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
+#include "qcustomplot.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/colorscaleplotcontroller.h b/mvvm/view/mvvm/plotting/colorscaleplotcontroller.h
index b802f28d40a..67f454bb126 100644
--- a/mvvm/view/mvvm/plotting/colorscaleplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/colorscaleplotcontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_COLORSCALEPLOTCONTROLLER_H
#define MVVM_PLOTTING_COLORSCALEPLOTCONTROLLER_H
-#include <memory>
#include "mvvm/signals/itemlistener.h"
#include "mvvm/view_export.h"
+#include <memory>
class QCPColorScale;
diff --git a/mvvm/view/mvvm/plotting/customplotproxywidget.cpp b/mvvm/view/mvvm/plotting/customplotproxywidget.cpp
index c7669b5fb7d..5e858581753 100644
--- a/mvvm/view/mvvm/plotting/customplotproxywidget.cpp
+++ b/mvvm/view/mvvm/plotting/customplotproxywidget.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
+#include "mvvm/plotting/customplotproxywidget.h"
#include <QEvent>
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent>
#include <QGraphicsSceneWheelEvent>
#include <QWidget>
-#include "mvvm/plotting/customplotproxywidget.h"
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/customplotproxywidget.h b/mvvm/view/mvvm/plotting/customplotproxywidget.h
index e4296b9c770..7cf53140f80 100644
--- a/mvvm/view/mvvm/plotting/customplotproxywidget.h
+++ b/mvvm/view/mvvm/plotting/customplotproxywidget.h
@@ -10,8 +10,8 @@
#ifndef MVVM_PLOTTING_CUSTOMPLOTPROXYWIDGET_H
#define MVVM_PLOTTING_CUSTOMPLOTPROXYWIDGET_H
-#include <QGraphicsProxyWidget>
#include "mvvm/view_export.h"
+#include <QGraphicsProxyWidget>
class QWidget;
diff --git a/mvvm/view/mvvm/plotting/customplotsceneadapter.h b/mvvm/view/mvvm/plotting/customplotsceneadapter.h
index 97d6b1d20e5..d6bae5d0f72 100644
--- a/mvvm/view/mvvm/plotting/customplotsceneadapter.h
+++ b/mvvm/view/mvvm/plotting/customplotsceneadapter.h
@@ -10,8 +10,8 @@
#ifndef MVVM_PLOTTING_CUSTOMPLOTSCENEADAPTER_H
#define MVVM_PLOTTING_CUSTOMPLOTSCENEADAPTER_H
-#include <memory>
#include "mvvm/plotting/sceneadapterinterface.h"
+#include <memory>
class QCustomPlot;
diff --git a/mvvm/view/mvvm/plotting/data1dplotcontroller.cpp b/mvvm/view/mvvm/plotting/data1dplotcontroller.cpp
index 91b528ec118..3e988dabc9e 100644
--- a/mvvm/view/mvvm/plotting/data1dplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/data1dplotcontroller.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
#include "mvvm/plotting/data1dplotcontroller.h"
#include "mvvm/standarditems/data1ditem.h"
+#include "qcustomplot.h"
#include <stdexcept>
namespace {
diff --git a/mvvm/view/mvvm/plotting/data1dplotcontroller.h b/mvvm/view/mvvm/plotting/data1dplotcontroller.h
index d8d3a603aee..c0036e2ca92 100644
--- a/mvvm/view/mvvm/plotting/data1dplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/data1dplotcontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_DATA1DPLOTCONTROLLER_H
#define MVVM_PLOTTING_DATA1DPLOTCONTROLLER_H
-#include <memory>
#include "mvvm/signals/itemlistener.h"
#include "mvvm/view_export.h"
+#include <memory>
class QCPGraph;
diff --git a/mvvm/view/mvvm/plotting/data2dplotcontroller.cpp b/mvvm/view/mvvm/plotting/data2dplotcontroller.cpp
index 20ed1cd33d3..caea348c427 100644
--- a/mvvm/view/mvvm/plotting/data2dplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/data2dplotcontroller.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
-#include <algorithm>
#include "mvvm/plotting/data2dplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/data2ditem.h"
+#include "qcustomplot.h"
+#include <algorithm>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/data2dplotcontroller.h b/mvvm/view/mvvm/plotting/data2dplotcontroller.h
index 5b5e29ed11c..0b8042dbaa0 100644
--- a/mvvm/view/mvvm/plotting/data2dplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/data2dplotcontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_DATA2DPLOTCONTROLLER_H
#define MVVM_PLOTTING_DATA2DPLOTCONTROLLER_H
-#include <memory>
#include "mvvm/signals/itemlistener.h"
#include "mvvm/view_export.h"
+#include <memory>
class QCPColorMap;
diff --git a/mvvm/view/mvvm/plotting/graphcanvas.cpp b/mvvm/view/mvvm/plotting/graphcanvas.cpp
index d548143105d..423d6bc848f 100644
--- a/mvvm/view/mvvm/plotting/graphcanvas.cpp
+++ b/mvvm/view/mvvm/plotting/graphcanvas.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
-#include <QBoxLayout>
-#include "mvvm/plotting/customplotsceneadapter.h"
#include "mvvm/plotting/graphcanvas.h"
+#include "mvvm/plotting/customplotsceneadapter.h"
#include "mvvm/plotting/graphviewportplotcontroller.h"
#include "mvvm/plotting/statusstringreporter.h"
#include "mvvm/plotting/statusstringreporterfactory.h"
#include "mvvm/standarditems/graphviewportitem.h"
#include "mvvm/widgets/statuslabel.h"
+#include "qcustomplot.h"
+#include <QBoxLayout>
namespace {
diff --git a/mvvm/view/mvvm/plotting/graphcanvas.h b/mvvm/view/mvvm/plotting/graphcanvas.h
index b7b0d4b8d65..a656e64a17b 100644
--- a/mvvm/view/mvvm/plotting/graphcanvas.h
+++ b/mvvm/view/mvvm/plotting/graphcanvas.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_GRAPHCANVAS_H
#define MVVM_PLOTTING_GRAPHCANVAS_H
+#include "mvvm/view_export.h"
#include <QWidget>
#include <memory>
-#include "mvvm/view_export.h"
namespace ModelView {
diff --git a/mvvm/view/mvvm/plotting/graphplotcontroller.cpp b/mvvm/view/mvvm/plotting/graphplotcontroller.cpp
index 56217c3bba8..91c3b26d284 100644
--- a/mvvm/view/mvvm/plotting/graphplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/graphplotcontroller.cpp
@@ -7,14 +7,14 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
+#include "mvvm/plotting/graphplotcontroller.h"
#include "mvvm/model/comboproperty.h"
#include "mvvm/plotting/data1dplotcontroller.h"
-#include "mvvm/plotting/graphplotcontroller.h"
#include "mvvm/plotting/pencontroller.h"
#include "mvvm/standarditems/data1ditem.h"
#include "mvvm/standarditems/graphitem.h"
#include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/graphplotcontroller.h b/mvvm/view/mvvm/plotting/graphplotcontroller.h
index 4139e85280a..2044fc53c6f 100644
--- a/mvvm/view/mvvm/plotting/graphplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/graphplotcontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_GRAPHPLOTCONTROLLER_H
#define MVVM_PLOTTING_GRAPHPLOTCONTROLLER_H
-#include <memory>
#include "mvvm/signals/itemlistener.h"
#include "mvvm/view_export.h"
+#include <memory>
class QCustomPlot;
diff --git a/mvvm/view/mvvm/plotting/graphviewportplotcontroller.cpp b/mvvm/view/mvvm/plotting/graphviewportplotcontroller.cpp
index 8cafb3015e6..3704640eeb1 100644
--- a/mvvm/view/mvvm/plotting/graphviewportplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/graphviewportplotcontroller.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include <list>
-#include "mvvm/plotting/graphplotcontroller.h"
#include "mvvm/plotting/graphviewportplotcontroller.h"
+#include "mvvm/plotting/graphplotcontroller.h"
#include "mvvm/plotting/viewportaxisplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/graphitem.h"
#include "mvvm/standarditems/graphviewportitem.h"
+#include <list>
#include <qcustomplot.h>
#include <stdexcept>
diff --git a/mvvm/view/mvvm/plotting/graphviewportplotcontroller.h b/mvvm/view/mvvm/plotting/graphviewportplotcontroller.h
index 6e1103fb411..20c283d55eb 100644
--- a/mvvm/view/mvvm/plotting/graphviewportplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/graphviewportplotcontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_GRAPHVIEWPORTPLOTCONTROLLER_H
#define MVVM_PLOTTING_GRAPHVIEWPORTPLOTCONTROLLER_H
-#include <memory>
#include "mvvm/signals/itemlistener.h"
#include "mvvm/view_export.h"
+#include <memory>
class QCustomPlot;
diff --git a/mvvm/view/mvvm/plotting/mousemovereporter.cpp b/mvvm/view/mvvm/plotting/mousemovereporter.cpp
index 4b188857829..cc40bcad275 100644
--- a/mvvm/view/mvvm/plotting/mousemovereporter.cpp
+++ b/mvvm/view/mvvm/plotting/mousemovereporter.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
-#include <QMouseEvent>
#include "mvvm/plotting/mousemovereporter.h"
#include "mvvm/plotting/mouseposinfo.h"
+#include <QMouseEvent>
#include <qcustomplot.h>
#include <stdexcept>
diff --git a/mvvm/view/mvvm/plotting/mousemovereporter.h b/mvvm/view/mvvm/plotting/mousemovereporter.h
index b7ba01ef023..fab98fed9f3 100644
--- a/mvvm/view/mvvm/plotting/mousemovereporter.h
+++ b/mvvm/view/mvvm/plotting/mousemovereporter.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_MOUSEMOVEREPORTER_H
#define MVVM_PLOTTING_MOUSEMOVEREPORTER_H
+#include "mvvm/view_export.h"
#include <functional>
#include <memory>
-#include "mvvm/view_export.h"
class QCustomPlot;
diff --git a/mvvm/view/mvvm/plotting/pencontroller.cpp b/mvvm/view/mvvm/plotting/pencontroller.cpp
index 186df2e329b..3bd2a0561e0 100644
--- a/mvvm/view/mvvm/plotting/pencontroller.cpp
+++ b/mvvm/view/mvvm/plotting/pencontroller.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
-#include "mvvm/model/comboproperty.h"
#include "mvvm/plotting/pencontroller.h"
+#include "mvvm/model/comboproperty.h"
#include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/pencontroller.h b/mvvm/view/mvvm/plotting/pencontroller.h
index f5732bede7e..ffbe122e9ef 100644
--- a/mvvm/view/mvvm/plotting/pencontroller.h
+++ b/mvvm/view/mvvm/plotting/pencontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_PENCONTROLLER_H
#define MVVM_PLOTTING_PENCONTROLLER_H
-#include <memory>
#include "mvvm/signals/itemlistener.h"
#include "mvvm/view_export.h"
+#include <memory>
class QCPGraph;
diff --git a/mvvm/view/mvvm/plotting/statusstringreporter.cpp b/mvvm/view/mvvm/plotting/statusstringreporter.cpp
index dad75916f77..c62b02a97bb 100644
--- a/mvvm/view/mvvm/plotting/statusstringreporter.cpp
+++ b/mvvm/view/mvvm/plotting/statusstringreporter.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/plotting/statusstringreporter.h"
#include "mvvm/plotting/mousemovereporter.h"
#include "mvvm/plotting/mouseposinfo.h"
#include "mvvm/plotting/statusstringformatterinterface.h"
-#include "mvvm/plotting/statusstringreporter.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/statusstringreporter.h b/mvvm/view/mvvm/plotting/statusstringreporter.h
index 127ce71de54..491aa716e32 100644
--- a/mvvm/view/mvvm/plotting/statusstringreporter.h
+++ b/mvvm/view/mvvm/plotting/statusstringreporter.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_STATUSSTRINGREPORTER_H
#define MVVM_PLOTTING_STATUSSTRINGREPORTER_H
+#include "mvvm/view_export.h"
#include <functional>
#include <memory>
-#include "mvvm/view_export.h"
#include <string>
class QCustomPlot;
diff --git a/mvvm/view/mvvm/plotting/statusstringreporterfactory.cpp b/mvvm/view/mvvm/plotting/statusstringreporterfactory.cpp
index db3f39611f1..8b8b2c40736 100644
--- a/mvvm/view/mvvm/plotting/statusstringreporterfactory.cpp
+++ b/mvvm/view/mvvm/plotting/statusstringreporterfactory.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/plotting/statusstringreporterfactory.h"
#include "mvvm/plotting/colormapinfoformatter.h"
#include "mvvm/plotting/graphinfoformatter.h"
#include "mvvm/plotting/statusstringreporter.h"
-#include "mvvm/plotting/statusstringreporterfactory.h"
namespace ModelView {
diff --git a/mvvm/view/mvvm/plotting/statusstringreporterfactory.h b/mvvm/view/mvvm/plotting/statusstringreporterfactory.h
index 6c245dd3a64..68be69c3f4d 100644
--- a/mvvm/view/mvvm/plotting/statusstringreporterfactory.h
+++ b/mvvm/view/mvvm/plotting/statusstringreporterfactory.h
@@ -12,9 +12,9 @@
//! Contains factory methods to create StatusStringReporter
+#include "mvvm/view_export.h"
#include <functional>
#include <memory>
-#include "mvvm/view_export.h"
class QCustomPlot;
diff --git a/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.cpp b/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.cpp
index ffaa2510d7a..73159663380 100644
--- a/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.cpp
+++ b/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include "qcustomplot.h"
-#include <QObject>
+#include "mvvm/plotting/viewportaxisplotcontroller.h"
#include "mvvm/plotting/axistitlecontroller.h"
#include "mvvm/plotting/customplotutils.h"
-#include "mvvm/plotting/viewportaxisplotcontroller.h"
#include "mvvm/standarditems/axisitems.h"
#include "mvvm/standarditems/plottableitems.h"
+#include "qcustomplot.h"
+#include <QObject>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.h b/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.h
index 9a11292e295..894b12e36eb 100644
--- a/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.h
+++ b/mvvm/view/mvvm/plotting/viewportaxisplotcontroller.h
@@ -10,9 +10,9 @@
#ifndef MVVM_PLOTTING_VIEWPORTAXISPLOTCONTROLLER_H
#define MVVM_PLOTTING_VIEWPORTAXISPLOTCONTROLLER_H
-#include <memory>
#include "mvvm/signals/itemlistener.h"
#include "mvvm/view_export.h"
+#include <memory>
class QCPAxis;
diff --git a/mvvm/view/mvvm/widgets/adjustingscrollarea.cpp b/mvvm/view/mvvm/widgets/adjustingscrollarea.cpp
index 85c246dc16c..d33dded7234 100644
--- a/mvvm/view/mvvm/widgets/adjustingscrollarea.cpp
+++ b/mvvm/view/mvvm/widgets/adjustingscrollarea.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/widgets/adjustingscrollarea.h"
#include <QEvent>
#include <QScrollBar>
-#include "mvvm/widgets/adjustingscrollarea.h"
using namespace ModelView;
diff --git a/mvvm/view/mvvm/widgets/adjustingscrollarea.h b/mvvm/view/mvvm/widgets/adjustingscrollarea.h
index 5c05fa72e28..f8bc8d09e3b 100644
--- a/mvvm/view/mvvm/widgets/adjustingscrollarea.h
+++ b/mvvm/view/mvvm/widgets/adjustingscrollarea.h
@@ -10,8 +10,8 @@
#ifndef MVVM_WIDGETS_ADJUSTINGSCROLLAREA_H
#define MVVM_WIDGETS_ADJUSTINGSCROLLAREA_H
-#include <QScrollArea>
#include "mvvm/view_export.h"
+#include <QScrollArea>
namespace ModelView {
diff --git a/mvvm/view/mvvm/widgets/allitemstreeview.cpp b/mvvm/view/mvvm/widgets/allitemstreeview.cpp
index bca6df54855..81b21ea9a6f 100644
--- a/mvvm/view/mvvm/widgets/allitemstreeview.cpp
+++ b/mvvm/view/mvvm/widgets/allitemstreeview.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/widgets/allitemstreeview.h"
#include "mvvm/factories/viewmodelfactory.h"
#include "mvvm/viewmodel/viewmodel.h"
-#include "mvvm/widgets/allitemstreeview.h"
namespace ModelView {
AllItemsTreeView::AllItemsTreeView(SessionModel* model, QWidget* parent) : ItemsTreeView(parent) {
diff --git a/mvvm/view/mvvm/widgets/collapsiblebar.cpp b/mvvm/view/mvvm/widgets/collapsiblebar.cpp
index 5d9e6ab59bb..11b874bdfa5 100644
--- a/mvvm/view/mvvm/widgets/collapsiblebar.cpp
+++ b/mvvm/view/mvvm/widgets/collapsiblebar.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
+#include "mvvm/widgets/collapsiblebar.h"
+#include "mvvm/widgets/widgetutils.h"
#include <QEvent>
#include <QHBoxLayout>
#include <QIcon>
#include <QLabel>
#include <QMouseEvent>
-#include "mvvm/widgets/collapsiblebar.h"
-#include "mvvm/widgets/widgetutils.h"
using namespace ModelView;
diff --git a/mvvm/view/mvvm/widgets/collapsiblebar.h b/mvvm/view/mvvm/widgets/collapsiblebar.h
index 89c5fe4699f..20057ce5211 100644
--- a/mvvm/view/mvvm/widgets/collapsiblebar.h
+++ b/mvvm/view/mvvm/widgets/collapsiblebar.h
@@ -10,8 +10,8 @@
#ifndef MVVM_WIDGETS_COLLAPSIBLEBAR_H
#define MVVM_WIDGETS_COLLAPSIBLEBAR_H
-#include <QFrame>
#include "mvvm/view_export.h"
+#include <QFrame>
class QLabel;
class QString;
diff --git a/mvvm/view/mvvm/widgets/collapsiblelistwidget.cpp b/mvvm/view/mvvm/widgets/collapsiblelistwidget.cpp
index ec5a8a3bc9e..a18b91998f1 100644
--- a/mvvm/view/mvvm/widgets/collapsiblelistwidget.cpp
+++ b/mvvm/view/mvvm/widgets/collapsiblelistwidget.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/widgets/collapsiblelistwidget.h"
+#include "mvvm/widgets/collapsiblebar.h"
#include <QSplitter>
#include <QVBoxLayout>
-#include "mvvm/widgets/collapsiblebar.h"
-#include "mvvm/widgets/collapsiblelistwidget.h"
using namespace ModelView;
diff --git a/mvvm/view/mvvm/widgets/collapsiblelistwidget.h b/mvvm/view/mvvm/widgets/collapsiblelistwidget.h
index c1609780355..f338b45018d 100644
--- a/mvvm/view/mvvm/widgets/collapsiblelistwidget.h
+++ b/mvvm/view/mvvm/widgets/collapsiblelistwidget.h
@@ -10,8 +10,8 @@
#ifndef MVVM_WIDGETS_COLLAPSIBLELISTWIDGET_H
#define MVVM_WIDGETS_COLLAPSIBLELISTWIDGET_H
-#include <QWidget>
#include "mvvm/view_export.h"
+#include <QWidget>
class QSplitter;
class QString;
diff --git a/mvvm/view/mvvm/widgets/itemstreeview.cpp b/mvvm/view/mvvm/widgets/itemstreeview.cpp
index 7332e4265c1..b3b5b168722 100644
--- a/mvvm/view/mvvm/widgets/itemstreeview.cpp
+++ b/mvvm/view/mvvm/widgets/itemstreeview.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
-#include <QTreeView>
-#include <QVBoxLayout>
+#include "mvvm/widgets/itemstreeview.h"
#include "mvvm/viewmodel/viewmodel.h"
#include "mvvm/viewmodel/viewmodeldelegate.h"
-#include "mvvm/widgets/itemstreeview.h"
+#include <QTreeView>
+#include <QVBoxLayout>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/widgets/itemstreeview.h b/mvvm/view/mvvm/widgets/itemstreeview.h
index cf56c5651a7..525ab4ad88f 100644
--- a/mvvm/view/mvvm/widgets/itemstreeview.h
+++ b/mvvm/view/mvvm/widgets/itemstreeview.h
@@ -10,9 +10,9 @@
#ifndef MVVM_WIDGETS_ITEMSTREEVIEW_H
#define MVVM_WIDGETS_ITEMSTREEVIEW_H
+#include "mvvm/view_export.h"
#include <QWidget>
#include <memory>
-#include "mvvm/view_export.h"
class QTreeView;
class QItemSelection;
diff --git a/mvvm/view/mvvm/widgets/itemstreeviewinterface.h b/mvvm/view/mvvm/widgets/itemstreeviewinterface.h
index 84111136798..1dbf4236131 100644
--- a/mvvm/view/mvvm/widgets/itemstreeviewinterface.h
+++ b/mvvm/view/mvvm/widgets/itemstreeviewinterface.h
@@ -10,8 +10,8 @@
#ifndef MVVM_WIDGETS_ITEMSTREEVIEWINTERFACE_H
#define MVVM_WIDGETS_ITEMSTREEVIEWINTERFACE_H
-#include <QWidget>
#include "mvvm/view_export.h"
+#include <QWidget>
class QTreeView;
diff --git a/mvvm/view/mvvm/widgets/layoututils.cpp b/mvvm/view/mvvm/widgets/layoututils.cpp
index 59ce36254d0..c53e988f440 100644
--- a/mvvm/view/mvvm/widgets/layoututils.cpp
+++ b/mvvm/view/mvvm/widgets/layoututils.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
+#include "mvvm/widgets/layoututils.h"
#include <QBoxLayout>
#include <QGridLayout>
#include <QLayoutItem>
#include <QWidget>
-#include "mvvm/widgets/layoututils.h"
namespace {
void remove(QGridLayout* layout, int row, int column, bool deleteWidgets);
diff --git a/mvvm/view/mvvm/widgets/propertyflatview.cpp b/mvvm/view/mvvm/widgets/propertyflatview.cpp
index 1c2fb898388..f312d4159b6 100644
--- a/mvvm/view/mvvm/widgets/propertyflatview.cpp
+++ b/mvvm/view/mvvm/widgets/propertyflatview.cpp
@@ -7,10 +7,7 @@
//
// ************************************************************************** //
-#include <QDataWidgetMapper>
-#include <QDebug>
-#include <QGridLayout>
-#include <QLabel>
+#include "mvvm/widgets/propertyflatview.h"
#include "mvvm/editors/customeditor.h"
#include "mvvm/editors/defaulteditorfactory.h"
#include "mvvm/factories/viewmodelfactory.h"
@@ -20,7 +17,10 @@
#include "mvvm/viewmodel/viewmodel.h"
#include "mvvm/viewmodel/viewmodeldelegate.h"
#include "mvvm/widgets/layoututils.h"
-#include "mvvm/widgets/propertyflatview.h"
+#include <QDataWidgetMapper>
+#include <QDebug>
+#include <QGridLayout>
+#include <QLabel>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/widgets/propertyflatview.h b/mvvm/view/mvvm/widgets/propertyflatview.h
index f2abce6e99d..e7916eb75b8 100644
--- a/mvvm/view/mvvm/widgets/propertyflatview.h
+++ b/mvvm/view/mvvm/widgets/propertyflatview.h
@@ -10,9 +10,9 @@
#ifndef MVVM_WIDGETS_PROPERTYFLATVIEW_H
#define MVVM_WIDGETS_PROPERTYFLATVIEW_H
+#include "mvvm/view_export.h"
#include <QWidget>
#include <memory>
-#include "mvvm/view_export.h"
namespace ModelView {
diff --git a/mvvm/view/mvvm/widgets/propertytreeview.cpp b/mvvm/view/mvvm/widgets/propertytreeview.cpp
index 514a4a00415..8414f4ba2a8 100644
--- a/mvvm/view/mvvm/widgets/propertytreeview.cpp
+++ b/mvvm/view/mvvm/widgets/propertytreeview.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
-#include <QTreeView>
+#include "mvvm/widgets/propertytreeview.h"
#include "mvvm/factories/viewmodelfactory.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/viewmodel/viewmodel.h"
-#include "mvvm/widgets/propertytreeview.h"
+#include <QTreeView>
using namespace ModelView;
diff --git a/mvvm/view/mvvm/widgets/statuslabel.cpp b/mvvm/view/mvvm/widgets/statuslabel.cpp
index 0cecd623abd..69e1670cf1e 100644
--- a/mvvm/view/mvvm/widgets/statuslabel.cpp
+++ b/mvvm/view/mvvm/widgets/statuslabel.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
+#include "mvvm/widgets/statuslabel.h"
+#include "mvvm/editors/styleutils.h"
+#include "mvvm/widgets/widgetutils.h"
#include <QColor>
#include <QFont>
#include <QPainter>
-#include "mvvm/editors/styleutils.h"
-#include "mvvm/widgets/statuslabel.h"
-#include "mvvm/widgets/widgetutils.h"
using namespace ModelView;
diff --git a/mvvm/view/mvvm/widgets/statuslabel.h b/mvvm/view/mvvm/widgets/statuslabel.h
index a6347ac9079..2368b25a3f8 100644
--- a/mvvm/view/mvvm/widgets/statuslabel.h
+++ b/mvvm/view/mvvm/widgets/statuslabel.h
@@ -10,8 +10,8 @@
#ifndef MVVM_WIDGETS_STATUSLABEL_H
#define MVVM_WIDGETS_STATUSLABEL_H
-#include <QFrame>
#include "mvvm/view_export.h"
+#include <QFrame>
class QPaintEvent;
diff --git a/mvvm/view/mvvm/widgets/topitemstreeview.cpp b/mvvm/view/mvvm/widgets/topitemstreeview.cpp
index 50ce0f3e39e..3bfb946b22c 100644
--- a/mvvm/view/mvvm/widgets/topitemstreeview.cpp
+++ b/mvvm/view/mvvm/widgets/topitemstreeview.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/widgets/topitemstreeview.h"
#include "mvvm/factories/viewmodelfactory.h"
#include "mvvm/viewmodel/viewmodel.h"
-#include "mvvm/widgets/topitemstreeview.h"
namespace ModelView {
TopItemsTreeView::TopItemsTreeView(SessionModel* model, QWidget* parent) : ItemsTreeView(parent) {
diff --git a/mvvm/view/mvvm/widgets/widgetutils.cpp b/mvvm/view/mvvm/widgets/widgetutils.cpp
index acdb8eeb936..315cfa5b8d7 100644
--- a/mvvm/view/mvvm/widgets/widgetutils.cpp
+++ b/mvvm/view/mvvm/widgets/widgetutils.cpp
@@ -7,6 +7,8 @@
//
// ************************************************************************** //
+#include "mvvm/widgets/widgetutils.h"
+#include "mvvm/utils/numericutils.h"
#include <QApplication>
#include <QColor>
#include <QDir>
@@ -14,8 +16,6 @@
#include <QLabel>
#include <QMainWindow>
#include <QSize>
-#include "mvvm/utils/numericutils.h"
-#include "mvvm/widgets/widgetutils.h"
namespace {
diff --git a/mvvm/view/mvvm/widgets/widgetutils.h b/mvvm/view/mvvm/widgets/widgetutils.h
index 4a968a631d7..17b67f6bc1c 100644
--- a/mvvm/view/mvvm/widgets/widgetutils.h
+++ b/mvvm/view/mvvm/widgets/widgetutils.h
@@ -10,9 +10,9 @@
#ifndef MVVM_WIDGETS_UTILS_H
#define MVVM_WIDGETS_UTILS_H
+#include "mvvm/view_export.h"
#include <QString>
#include <QStringList>
-#include "mvvm/view_export.h"
#include <string>
#include <vector>
diff --git a/mvvm/viewmodel/mvvm/editors/booleditor.cpp b/mvvm/viewmodel/mvvm/editors/booleditor.cpp
index e3051bf8cf7..280de2fbf1c 100644
--- a/mvvm/viewmodel/mvvm/editors/booleditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/booleditor.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/editors/booleditor.h"
#include <QCheckBox>
#include <QHBoxLayout>
-#include "mvvm/editors/booleditor.h"
#include <stdexcept>
namespace {
diff --git a/mvvm/viewmodel/mvvm/editors/coloreditor.cpp b/mvvm/viewmodel/mvvm/editors/coloreditor.cpp
index 2a8f4e39871..93707c65443 100644
--- a/mvvm/viewmodel/mvvm/editors/coloreditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/coloreditor.cpp
@@ -7,13 +7,13 @@
//
// ************************************************************************** //
-#include <QColorDialog>
-#include <QHBoxLayout>
-#include <QLabel>
#include "mvvm/editors/coloreditor.h"
#include "mvvm/editors/customeventfilters.h"
#include "mvvm/editors/styleutils.h"
#include "mvvm/model/customvariants.h"
+#include <QColorDialog>
+#include <QHBoxLayout>
+#include <QLabel>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/editors/combopropertyeditor.cpp b/mvvm/viewmodel/mvvm/editors/combopropertyeditor.cpp
index 6ff74158093..5969ba30d9d 100644
--- a/mvvm/viewmodel/mvvm/editors/combopropertyeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/combopropertyeditor.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QComboBox>
-#include <QVBoxLayout>
#include "mvvm/editors/combopropertyeditor.h"
#include "mvvm/model/comboproperty.h"
+#include <QComboBox>
+#include <QVBoxLayout>
namespace {
QStringList toList(const std::vector<std::string>& container) {
diff --git a/mvvm/viewmodel/mvvm/editors/customeditor.h b/mvvm/viewmodel/mvvm/editors/customeditor.h
index e41c0fbb609..13286c69b13 100644
--- a/mvvm/viewmodel/mvvm/editors/customeditor.h
+++ b/mvvm/viewmodel/mvvm/editors/customeditor.h
@@ -10,9 +10,9 @@
#ifndef MVVM_EDITORS_CUSTOMEDITOR_H
#define MVVM_EDITORS_CUSTOMEDITOR_H
-#include <QWidget>
#include "mvvm/core/variant.h"
#include "mvvm/viewmodel_export.h"
+#include <QWidget>
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/editors/customeventfilters.cpp b/mvvm/viewmodel/mvvm/editors/customeventfilters.cpp
index 45c3a93f69d..8ca9be8a8f8 100644
--- a/mvvm/viewmodel/mvvm/editors/customeventfilters.cpp
+++ b/mvvm/viewmodel/mvvm/editors/customeventfilters.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/editors/customeventfilters.h"
#include <QAbstractSpinBox>
#include <QComboBox>
#include <QEvent>
-#include "mvvm/editors/customeventfilters.h"
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/editors/customeventfilters.h b/mvvm/viewmodel/mvvm/editors/customeventfilters.h
index da4c96b72f8..c05c3c63aa4 100644
--- a/mvvm/viewmodel/mvvm/editors/customeventfilters.h
+++ b/mvvm/viewmodel/mvvm/editors/customeventfilters.h
@@ -10,8 +10,8 @@
#ifndef MVVM_EDITORS_CUSTOMEVENTFILTERS_H
#define MVVM_EDITORS_CUSTOMEVENTFILTERS_H
-#include <QObject>
#include "mvvm/viewmodel_export.h"
+#include <QObject>
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.cpp b/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.cpp
index 9eba0a7ebb1..72a12faa6cc 100644
--- a/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.cpp
+++ b/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/editors/customeditor.h"
#include "mvvm/editors/defaulteditorfactory.h"
+#include "mvvm/editors/customeditor.h"
#include "mvvm/editors/editor_constants.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/sessionitem.h"
diff --git a/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.h b/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.h
index 58091529463..60e472d37c8 100644
--- a/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.h
+++ b/mvvm/viewmodel/mvvm/editors/defaulteditorfactory.h
@@ -13,10 +13,10 @@
//! @file defaulteditorfactory.h
//! Defines DefaultEditorFactory and auxiliary classes for custom view model delegates.
-#include <map>
-#include <memory>
#include "mvvm/editors/editorbuilders.h"
#include "mvvm/interfaces/editorfactoryinterface.h"
+#include <map>
+#include <memory>
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/editors/doubleeditor.cpp b/mvvm/viewmodel/mvvm/editors/doubleeditor.cpp
index 3605808b14d..0540d970dc2 100644
--- a/mvvm/viewmodel/mvvm/editors/doubleeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/doubleeditor.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QDoubleSpinBox>
-#include <QVBoxLayout>
#include "mvvm/editors/doubleeditor.h"
#include "mvvm/utils/numericutils.h"
+#include <QDoubleSpinBox>
+#include <QVBoxLayout>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/editors/editorbuilders.cpp b/mvvm/viewmodel/mvvm/editors/editorbuilders.cpp
index ef4f147c3a0..ce32e995583 100644
--- a/mvvm/viewmodel/mvvm/editors/editorbuilders.cpp
+++ b/mvvm/viewmodel/mvvm/editors/editorbuilders.cpp
@@ -7,13 +7,12 @@
//
// ************************************************************************** //
-#include <cmath>
+#include "mvvm/editors/editorbuilders.h"
#include "mvvm/editors/booleditor.h"
#include "mvvm/editors/coloreditor.h"
#include "mvvm/editors/combopropertyeditor.h"
#include "mvvm/editors/doubleeditor.h"
#include "mvvm/editors/editor_constants.h"
-#include "mvvm/editors/editorbuilders.h"
#include "mvvm/editors/externalpropertyeditor.h"
#include "mvvm/editors/integereditor.h"
#include "mvvm/editors/scientificdoubleeditor.h"
@@ -22,6 +21,7 @@
#include "mvvm/model/customvariants.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/utils/reallimits.h"
+#include <cmath>
namespace {
double singleStep(int decimals) {
diff --git a/mvvm/viewmodel/mvvm/editors/editorbuilders.h b/mvvm/viewmodel/mvvm/editors/editorbuilders.h
index c20446197b0..ce70043e926 100644
--- a/mvvm/viewmodel/mvvm/editors/editorbuilders.h
+++ b/mvvm/viewmodel/mvvm/editors/editorbuilders.h
@@ -10,9 +10,9 @@
#ifndef MVVM_EDITORS_EDITORBUILDERS_H
#define MVVM_EDITORS_EDITORBUILDERS_H
+#include "mvvm/viewmodel_export.h"
#include <functional>
#include <memory>
-#include "mvvm/viewmodel_export.h"
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.cpp b/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.cpp
index d8702f18961..e66092d8e0f 100644
--- a/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
+#include "mvvm/editors/externalpropertycomboeditor.h"
+#include "mvvm/model/externalproperty.h"
#include <QColor>
#include <QComboBox>
#include <QStandardItemModel>
#include <QVBoxLayout>
-#include "mvvm/editors/externalpropertycomboeditor.h"
-#include "mvvm/model/externalproperty.h"
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.h b/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.h
index 5eff44573e0..8b11362556a 100644
--- a/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.h
+++ b/mvvm/viewmodel/mvvm/editors/externalpropertycomboeditor.h
@@ -10,8 +10,8 @@
#ifndef EXTERNALPROPERTYCOMBOEDITOR_H
#define EXTERNALPROPERTYCOMBOEDITOR_H
-#include <functional>
#include "mvvm/editors/customeditor.h"
+#include <functional>
#include <vector>
class QComboBox;
diff --git a/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.cpp b/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.cpp
index 931d0798397..fd9699895d7 100644
--- a/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.cpp
@@ -7,15 +7,15 @@
//
// ************************************************************************** //
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QMessageBox>
-#include <QToolButton>
-#include "mvvm/editors/customeventfilters.h"
#include "mvvm/editors/externalpropertyeditor.h"
+#include "mvvm/editors/customeventfilters.h"
#include "mvvm/editors/styleutils.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/externalproperty.h"
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMessageBox>
+#include <QToolButton>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.h b/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.h
index f77a5c2ac78..a7986319fd0 100644
--- a/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.h
+++ b/mvvm/viewmodel/mvvm/editors/externalpropertyeditor.h
@@ -10,8 +10,8 @@
#ifndef MVVM_EDITORS_EXTERNALPROPERTYEDITOR_H
#define MVVM_EDITORS_EXTERNALPROPERTYEDITOR_H
-#include <functional>
#include "mvvm/editors/customeditor.h"
+#include <functional>
class QLabel;
diff --git a/mvvm/viewmodel/mvvm/editors/integereditor.cpp b/mvvm/viewmodel/mvvm/editors/integereditor.cpp
index 5e322db9e42..0e1c9ebf738 100644
--- a/mvvm/viewmodel/mvvm/editors/integereditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/integereditor.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/editors/integereditor.h"
#include <QSpinBox>
#include <QVBoxLayout>
#include <cmath>
-#include "mvvm/editors/integereditor.h"
#include <stdexcept>
namespace {
diff --git a/mvvm/viewmodel/mvvm/editors/scientificdoubleeditor.cpp b/mvvm/viewmodel/mvvm/editors/scientificdoubleeditor.cpp
index 899f90319fb..ad63f8c17e8 100644
--- a/mvvm/viewmodel/mvvm/editors/scientificdoubleeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/scientificdoubleeditor.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
+#include "mvvm/editors/scientificdoubleeditor.h"
+#include "mvvm/utils/numericutils.h"
#include <QDoubleValidator>
#include <QLineEdit>
#include <QVBoxLayout>
-#include "mvvm/editors/scientificdoubleeditor.h"
-#include "mvvm/utils/numericutils.h"
#include <stdexcept>
namespace {
diff --git a/mvvm/viewmodel/mvvm/editors/scientificspinbox.cpp b/mvvm/viewmodel/mvvm/editors/scientificspinbox.cpp
index f0d7b16c022..0e00059f993 100644
--- a/mvvm/viewmodel/mvvm/editors/scientificspinbox.cpp
+++ b/mvvm/viewmodel/mvvm/editors/scientificspinbox.cpp
@@ -7,11 +7,11 @@
//
// ************************************************************************** //
+#include "mvvm/editors/scientificspinbox.h"
+#include "mvvm/editors/editor_constants.h"
#include <QLineEdit>
#include <cmath>
#include <limits>
-#include "mvvm/editors/editor_constants.h"
-#include "mvvm/editors/scientificspinbox.h"
namespace {
const double upper_switch = 1000;
diff --git a/mvvm/viewmodel/mvvm/editors/scientificspinbox.h b/mvvm/viewmodel/mvvm/editors/scientificspinbox.h
index 21be03bc9c4..dea670f3a51 100644
--- a/mvvm/viewmodel/mvvm/editors/scientificspinbox.h
+++ b/mvvm/viewmodel/mvvm/editors/scientificspinbox.h
@@ -10,8 +10,8 @@
#ifndef MVVM_WIDGETS_SCIENTIFICSPINBOX_H
#define MVVM_WIDGETS_SCIENTIFICSPINBOX_H
-#include <QAbstractSpinBox>
#include "mvvm/viewmodel_export.h"
+#include <QAbstractSpinBox>
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/editors/scientificspinboxeditor.cpp b/mvvm/viewmodel/mvvm/editors/scientificspinboxeditor.cpp
index eaba7fe06c3..58335932e68 100644
--- a/mvvm/viewmodel/mvvm/editors/scientificspinboxeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/scientificspinboxeditor.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
-#include "mvvm/editors/scientificspinbox.h"
#include "mvvm/editors/scientificspinboxeditor.h"
+#include "mvvm/editors/scientificspinbox.h"
#include "mvvm/utils/numericutils.h"
+#include <QVBoxLayout>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/editors/selectablecomboboxeditor.cpp b/mvvm/viewmodel/mvvm/editors/selectablecomboboxeditor.cpp
index a339debcc5a..4b96d766c24 100644
--- a/mvvm/viewmodel/mvvm/editors/selectablecomboboxeditor.cpp
+++ b/mvvm/viewmodel/mvvm/editors/selectablecomboboxeditor.cpp
@@ -13,6 +13,10 @@
// https://gist.github.com/mistic100/c3b7f3eabc65309687153fe3e0a9a720
// ----------------------------------------------------------------------------
+#include "mvvm/editors/selectablecomboboxeditor.h"
+#include "mvvm/editors/customeventfilters.h"
+#include "mvvm/model/comboproperty.h"
+#include "mvvm/utils/containerutils.h"
#include <QAbstractItemView>
#include <QComboBox>
#include <QLineEdit>
@@ -21,10 +25,6 @@
#include <QStandardItemModel>
#include <QStyledItemDelegate>
#include <QVBoxLayout>
-#include "mvvm/editors/customeventfilters.h"
-#include "mvvm/editors/selectablecomboboxeditor.h"
-#include "mvvm/model/comboproperty.h"
-#include "mvvm/utils/containerutils.h"
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerbuilder.h b/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerbuilder.h
index 44be7052f7f..d3ef503fdf0 100644
--- a/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerbuilder.h
+++ b/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerbuilder.h
@@ -10,9 +10,9 @@
#ifndef MVVM_FACTORIES_VIEWMODELCONTROLLERBUILDER_H
#define MVVM_FACTORIES_VIEWMODELCONTROLLERBUILDER_H
-#include <memory>
#include "mvvm/viewmodel/viewmodelcontroller.h"
#include "mvvm/viewmodel_export.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerfactory.h b/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerfactory.h
index 7687e9ad4a9..a148c561020 100644
--- a/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerfactory.h
+++ b/mvvm/viewmodel/mvvm/factories/viewmodelcontrollerfactory.h
@@ -10,9 +10,9 @@
#ifndef MVVM_FACTORIES_VIEWMODELCONTROLLERFACTORY_H
#define MVVM_FACTORIES_VIEWMODELCONTROLLERFACTORY_H
-#include <memory>
#include "mvvm/factories/viewmodelcontrollerbuilder.h"
#include "mvvm/viewmodel_export.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/factories/viewmodelfactory.h b/mvvm/viewmodel/mvvm/factories/viewmodelfactory.h
index 098757c4bcf..c99f782fb54 100644
--- a/mvvm/viewmodel/mvvm/factories/viewmodelfactory.h
+++ b/mvvm/viewmodel/mvvm/factories/viewmodelfactory.h
@@ -10,10 +10,10 @@
#ifndef MVVM_VIEWMODEL_STANDARDVIEWMODELS_H
#define MVVM_VIEWMODEL_STANDARDVIEWMODELS_H
-#include <memory>
#include "mvvm/factories/viewmodelcontrollerfactory.h"
#include "mvvm/viewmodel/viewmodel.h"
#include "mvvm/viewmodel_export.h"
+#include <memory>
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/interfaces/editorfactoryinterface.h b/mvvm/viewmodel/mvvm/interfaces/editorfactoryinterface.h
index 7645d81d3af..c11c87429e2 100644
--- a/mvvm/viewmodel/mvvm/interfaces/editorfactoryinterface.h
+++ b/mvvm/viewmodel/mvvm/interfaces/editorfactoryinterface.h
@@ -10,8 +10,8 @@
#ifndef MVVM_EDITORS_EDITORFACTORYINTERFACE_H
#define MVVM_EDITORS_EDITORFACTORYINTERFACE_H
-#include <memory>
#include "mvvm/viewmodel_export.h"
+#include <memory>
#include <string>
class QModelIndex;
diff --git a/mvvm/viewmodel/mvvm/interfaces/rowstrategyinterface.h b/mvvm/viewmodel/mvvm/interfaces/rowstrategyinterface.h
index e10771d259e..b88cdfd616d 100644
--- a/mvvm/viewmodel/mvvm/interfaces/rowstrategyinterface.h
+++ b/mvvm/viewmodel/mvvm/interfaces/rowstrategyinterface.h
@@ -10,9 +10,9 @@
#ifndef MVVM_INTERFACES_ROWSTRATEGYINTERFACE_H
#define MVVM_INTERFACES_ROWSTRATEGYINTERFACE_H
+#include "mvvm/viewmodel_export.h"
#include <QStringList>
#include <memory>
-#include "mvvm/viewmodel_export.h"
#include <vector>
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/viewmodel/defaultcelldecorator.cpp b/mvvm/viewmodel/mvvm/viewmodel/defaultcelldecorator.cpp
index 19d46f45899..8aaac1d2172 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/defaultcelldecorator.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/defaultcelldecorator.cpp
@@ -7,14 +7,14 @@
//
// ************************************************************************** //
-#include <QModelIndex>
-#include <QStyleOptionViewItem>
+#include "mvvm/viewmodel/defaultcelldecorator.h"
#include "mvvm/editors/editor_constants.h"
#include "mvvm/editors/scientificspinbox.h"
#include "mvvm/model/comboproperty.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/externalproperty.h"
-#include "mvvm/viewmodel/defaultcelldecorator.h"
+#include <QModelIndex>
+#include <QStyleOptionViewItem>
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/labeldatarowstrategy.cpp b/mvvm/viewmodel/mvvm/viewmodel/labeldatarowstrategy.cpp
index e460cfbde86..1d5329e4600 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/labeldatarowstrategy.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/labeldatarowstrategy.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/sessionitem.h"
#include "mvvm/viewmodel/labeldatarowstrategy.h"
+#include "mvvm/model/sessionitem.h"
#include "mvvm/viewmodel/standardviewitems.h"
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/propertiesrowstrategy.cpp b/mvvm/viewmodel/mvvm/viewmodel/propertiesrowstrategy.cpp
index f52769c7c75..8c22ead1b87 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/propertiesrowstrategy.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/propertiesrowstrategy.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/viewmodel/propertiesrowstrategy.h"
#include "mvvm/model/itemutils.h"
#include "mvvm/model/sessionitem.h"
-#include "mvvm/viewmodel/propertiesrowstrategy.h"
#include "mvvm/viewmodel/standardviewitems.h"
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/standardchildrenstrategies.cpp b/mvvm/viewmodel/mvvm/viewmodel/standardchildrenstrategies.cpp
index 029c810e3d8..398890b4de0 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/standardchildrenstrategies.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/standardchildrenstrategies.cpp
@@ -7,9 +7,9 @@
//
// ************************************************************************** //
+#include "mvvm/viewmodel/standardchildrenstrategies.h"
#include "mvvm/model/groupitem.h"
#include "mvvm/model/itemutils.h"
-#include "mvvm/viewmodel/standardchildrenstrategies.h"
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/standardviewitems.cpp b/mvvm/viewmodel/mvvm/viewmodel/standardviewitems.cpp
index 6c28926f728..2a858df7144 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/standardviewitems.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/standardviewitems.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/model/sessionitem.h"
#include "mvvm/viewmodel/standardviewitems.h"
+#include "mvvm/model/sessionitem.h"
#include "mvvm/viewmodel/viewmodelutils.h"
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/standardviewmodelcontrollers.cpp b/mvvm/viewmodel/mvvm/viewmodel/standardviewmodelcontrollers.cpp
index 15718039284..80d1ebd1e8e 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/standardviewmodelcontrollers.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/standardviewmodelcontrollers.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
+#include "mvvm/viewmodel/standardviewmodelcontrollers.h"
#include "mvvm/model/groupitem.h"
#include "mvvm/viewmodel/labeldatarowstrategy.h"
#include "mvvm/viewmodel/propertiesrowstrategy.h"
#include "mvvm/viewmodel/standardchildrenstrategies.h"
#include "mvvm/viewmodel/standardviewitems.h"
-#include "mvvm/viewmodel/standardviewmodelcontrollers.h"
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/topitemsviewmodel.cpp b/mvvm/viewmodel/mvvm/viewmodel/topitemsviewmodel.cpp
index ade7ca84fc2..acc85518705 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/topitemsviewmodel.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/topitemsviewmodel.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/viewmodel/standardviewmodelcontrollers.h"
#include "mvvm/viewmodel/topitemsviewmodel.h"
+#include "mvvm/viewmodel/standardviewmodelcontrollers.h"
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewitem.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewitem.cpp
index ac5c0087fbe..d36f97ee63f 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewitem.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewitem.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
-#include <algorithm>
+#include "mvvm/viewmodel/viewitem.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/utils/containerutils.h"
-#include "mvvm/viewmodel/viewitem.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include <algorithm>
#include <stdexcept>
#include <vector>
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewitem.h b/mvvm/viewmodel/mvvm/viewmodel/viewitem.h
index ec1dbd90eaf..dd0442794e8 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewitem.h
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewitem.h
@@ -10,9 +10,9 @@
#ifndef MVVM_VIEWMODEL_VIEWITEM_H
#define MVVM_VIEWMODEL_VIEWITEM_H
-#include <memory>
#include "mvvm/core/variant.h"
#include "mvvm/viewmodel_export.h"
+#include <memory>
#include <vector>
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodel.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewmodel.cpp
index 738d142a1e6..2d22d1b5675 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodel.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodel.cpp
@@ -7,10 +7,10 @@
//
// ************************************************************************** //
+#include "mvvm/viewmodel/viewmodel.h"
#include "mvvm/model/sessionitem.h"
#include "mvvm/model/sessionmodel.h"
#include "mvvm/viewmodel/standardviewitems.h"
-#include "mvvm/viewmodel/viewmodel.h"
#include "mvvm/viewmodel/viewmodelcontroller.h"
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.cpp
index 1a370912376..f4cbf5c004a 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.cpp
@@ -7,8 +7,8 @@
//
// ************************************************************************** //
-#include "mvvm/viewmodel/standardviewitems.h"
#include "mvvm/viewmodel/viewmodelbase.h"
+#include "mvvm/viewmodel/standardviewitems.h"
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.h b/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.h
index 2f7b0b16152..ecea1b35991 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.h
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelbase.h
@@ -10,9 +10,9 @@
#ifndef MVVM_VIEWMODEL_VIEWMODELBASE_H
#define MVVM_VIEWMODEL_VIEWMODELBASE_H
+#include "mvvm/viewmodel_export.h"
#include <QAbstractItemModel>
#include <memory>
-#include "mvvm/viewmodel_export.h"
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.cpp
index 26bf0ec6c46..5d534a6df19 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.cpp
@@ -7,7 +7,7 @@
//
// ************************************************************************** //
-#include <map>
+#include "mvvm/viewmodel/viewmodelcontroller.h"
#include "mvvm/interfaces/childrenstrategyinterface.h"
#include "mvvm/interfaces/rowstrategyinterface.h"
#include "mvvm/model/itemutils.h"
@@ -18,8 +18,8 @@
#include "mvvm/utils/containerutils.h"
#include "mvvm/viewmodel/standardviewitems.h"
#include "mvvm/viewmodel/viewmodelbase.h"
-#include "mvvm/viewmodel/viewmodelcontroller.h"
#include "mvvm/viewmodel/viewmodelutils.h"
+#include <map>
#include <stdexcept>
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.h b/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.h
index 5f0ce702ef6..cf9fb5f8acc 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.h
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelcontroller.h
@@ -10,11 +10,11 @@
#ifndef MVVM_VIEWMODEL_REFVIEWMODELCONTROLLER_H
#define MVVM_VIEWMODEL_REFVIEWMODELCONTROLLER_H
-#include <QStringList>
-#include <memory>
#include "mvvm/model/tagrow.h"
#include "mvvm/signals/modellistener.h"
#include "mvvm/viewmodel_export.h"
+#include <QStringList>
+#include <memory>
#include <vector>
class QStandardItem;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.cpp
index 21fc2561c46..94a7c0b2740 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.cpp
@@ -7,12 +7,12 @@
//
// ************************************************************************** //
-#include <QApplication>
+#include "mvvm/viewmodel/viewmodeldelegate.h"
#include "mvvm/editors/customeditor.h"
#include "mvvm/editors/defaulteditorfactory.h"
#include "mvvm/model/comboproperty.h"
#include "mvvm/viewmodel/defaultcelldecorator.h"
-#include "mvvm/viewmodel/viewmodeldelegate.h"
+#include <QApplication>
namespace {
const double scale_default_height_factor{1.2};
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.h b/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.h
index 03394577d3a..21cfa4b9471 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.h
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodeldelegate.h
@@ -10,9 +10,9 @@
#ifndef MVVM_VIEWMODEL_VIEWMODELDELEGATE_H
#define MVVM_VIEWMODEL_VIEWMODELDELEGATE_H
+#include "mvvm/viewmodel_export.h"
#include <QStyledItemDelegate>
#include <memory>
-#include "mvvm/viewmodel_export.h"
namespace ModelView {
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.cpp b/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.cpp
index ee18a56d0ee..fd4a57d0258 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.cpp
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.cpp
@@ -7,8 +7,7 @@
//
// ************************************************************************** //
-#include <QStandardItemModel>
-#include <iterator>
+#include "mvvm/viewmodel/viewmodelutils.h"
#include "mvvm/model/customvariants.h"
#include "mvvm/model/externalproperty.h"
#include "mvvm/model/itemutils.h"
@@ -16,7 +15,8 @@
#include "mvvm/model/sessionitem.h"
#include "mvvm/viewmodel/viewitem.h"
#include "mvvm/viewmodel/viewmodel.h"
-#include "mvvm/viewmodel/viewmodelutils.h"
+#include <QStandardItemModel>
+#include <iterator>
#include <set>
using namespace ModelView;
diff --git a/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.h b/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.h
index 94c5df64543..b582458ac1e 100644
--- a/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.h
+++ b/mvvm/viewmodel/mvvm/viewmodel/viewmodelutils.h
@@ -10,11 +10,11 @@
#ifndef MVVM_VIEWMODEL_VIEWMODELUTILS_H
#define MVVM_VIEWMODEL_VIEWMODELUTILS_H
+#include "mvvm/viewmodel_export.h"
#include <QModelIndex>
#include <QModelIndexList>
#include <QVector>
#include <functional>
-#include "mvvm/viewmodel_export.h"
#include <vector>
class QStandardItemModel;
--
GitLab