diff --git a/GUI/Support/Data/ID.h b/GUI/Model/Project/ID.h similarity index 83% rename from GUI/Support/Data/ID.h rename to GUI/Model/Project/ID.h index c34227989881619ec7058e7938e800e12af6283c..2a032d7b0e5f3a33a2bc82ffbd3ee10f9c642e78 100644 --- a/GUI/Support/Data/ID.h +++ b/GUI/Model/Project/ID.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/Support/Data/ID.h +//! @file GUI/Model/Project/ID.h //! @brief Defines shared enums. //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_GUI_SUPPORT_DATA_ID_H -#define BORNAGAIN_GUI_SUPPORT_DATA_ID_H +#ifndef BORNAGAIN_GUI_MODEL_PROJECT_ID_H +#define BORNAGAIN_GUI_MODEL_PROJECT_ID_H namespace GUI { @@ -29,4 +29,4 @@ enum ViewId { Datafile, Instrument, Sample, Simulation, Job }; } // namespace GUI::ID -#endif // BORNAGAIN_GUI_SUPPORT_DATA_ID_H +#endif // BORNAGAIN_GUI_MODEL_PROJECT_ID_H diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp index b47872a557ffd5f07a0ec24eef25a5b78a3de40a..c29300a45cb7e297021c57c7f3f57c7593aea9e3 100644 --- a/GUI/Model/Project/ProjectDocument.cpp +++ b/GUI/Model/Project/ProjectDocument.cpp @@ -19,10 +19,10 @@ #include "GUI/Model/File/DatafilesSet.h" #include "GUI/Model/Job/JobsSet.h" #include "GUI/Model/Material/MaterialItem.h" +#include "GUI/Model/Project/ID.h" #include "GUI/Model/Project/ProjectUtil.h" #include "GUI/Model/Sample/ItemWithMaterial.h" #include "GUI/Model/Sample/SamplesSet.h" -#include "GUI/Support/Data/ID.h" #include "GUI/Support/Data/SimulationOptionsItem.h" #include "GUI/Support/Util/Path.h" #include "GUI/Support/XML/UtilXML.h" diff --git a/GUI/View/Device/DistributionEditor.h b/GUI/View/Device/DistributionEditor.h index f01e628ce01d084560a1471579f4f871ae904619..cc0c1df5b3bf60545857e93acf1604ae5e08c98c 100644 --- a/GUI/View/Device/DistributionEditor.h +++ b/GUI/View/Device/DistributionEditor.h @@ -15,7 +15,7 @@ #ifndef BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONEDITOR_H #define BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONEDITOR_H -#include "GUI/Support/Data/ID.h" +#include "GUI/Model/Project/ID.h" #include "GUI/View/Device/DistributionSelector.h" // MeanConfig #include "GUI/View/Widget/GroupBoxes.h" #include <optional> diff --git a/GUI/View/Device/DistributionSelector.h b/GUI/View/Device/DistributionSelector.h index 6a61fbfc3fce8bc03313eb653b4dfc8eb780fa28..f9974003c3e34df8915cad850fcf197d59ef4dd6 100644 --- a/GUI/View/Device/DistributionSelector.h +++ b/GUI/View/Device/DistributionSelector.h @@ -15,7 +15,7 @@ #ifndef BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONSELECTOR_H #define BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONSELECTOR_H -#include "GUI/Support/Data/ID.h" +#include "GUI/Model/Project/ID.h" #include <QComboBox> #include <QFormLayout> #include <QWidget> diff --git a/GUI/View/Main/CentralWidget.h b/GUI/View/Main/CentralWidget.h index 49a313dda7c7f1a1f6890c94d980fec304483de8..8fd198eff42892e4dedef803530497a088d9ac07 100644 --- a/GUI/View/Main/CentralWidget.h +++ b/GUI/View/Main/CentralWidget.h @@ -15,7 +15,7 @@ #ifndef BORNAGAIN_GUI_VIEW_MAIN_CENTRALWIDGET_H #define BORNAGAIN_GUI_VIEW_MAIN_CENTRALWIDGET_H -#include "GUI/Support/Data/ID.h" +#include "GUI/Model/Project/ID.h" #include <QButtonGroup> #include <QProgressBar> #include <QStackedLayout> diff --git a/GUI/View/View/JobView.cpp b/GUI/View/View/JobView.cpp index 63c4d7f0b270a83d13f4a0605d1986f1a1e7e1cc..22703c6d71f98aaf7ae62111601b238aeb0457cd 100644 --- a/GUI/View/View/JobView.cpp +++ b/GUI/View/View/JobView.cpp @@ -16,8 +16,8 @@ #include "GUI/Model/Data/DataItem.h" #include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Job/JobsSet.h" +#include "GUI/Model/Project/ID.h" #include "GUI/Model/Project/ProjectDocument.h" -#include "GUI/Support/Data/ID.h" #include "GUI/Support/Data/SimulationOptionsItem.h" #include "GUI/View/Dock/DocksController.h" #include "GUI/View/Fit/FitActivityPanel.h"