diff --git a/GUI/Model/From/GUIDomainSampleVisitor.cpp b/GUI/Model/From/GUIDomainSampleVisitor.cpp index f79484de254a2ab051b78b77793e138327e0812d..848e6f156a4d08dff35c44cbe3b2d3f2c651658e 100644 --- a/GUI/Model/From/GUIDomainSampleVisitor.cpp +++ b/GUI/Model/From/GUIDomainSampleVisitor.cpp @@ -16,7 +16,6 @@ #include "Base/Const/Units.h" #include "GUI/Model/From/FromDomain.h" #include "GUI/Model/Material/MaterialItem.h" -#include "GUI/Model/Material/MaterialItemUtils.h" #include "GUI/Model/Material/MaterialModel.h" #include "GUI/Model/Sample/FormFactorItems.h" #include "GUI/Model/Sample/InterferenceItems.h" diff --git a/GUI/Model/Job/JobModelFunctions.cpp b/GUI/Model/Job/JobModelFunctions.cpp index 728affd0dd1807e46c77ca1e7f511374867ac304..e7f99ef7ed3fb615d0d41a87a846e7b35cc20a5b 100644 --- a/GUI/Model/Job/JobModelFunctions.cpp +++ b/GUI/Model/Job/JobModelFunctions.cpp @@ -30,7 +30,6 @@ #include "GUI/Model/Job/JobItemUtils.h" #include "GUI/Model/Material/MaterialItem.h" #include "GUI/Model/Material/MaterialItemContainer.h" -#include "GUI/Model/Material/MaterialItemUtils.h" #include "GUI/Model/Sample/ItemWithMaterial.h" #include "GUI/Model/Sample/MultiLayerItem.h" #include "GUI/Util/Error.h" diff --git a/GUI/Model/Material/MaterialItemUtils.cpp b/GUI/Model/Material/MaterialItemUtils.cpp deleted file mode 100644 index fb42c1f1a77ec8191d73254f5892b23dfbfb11ef..0000000000000000000000000000000000000000 --- a/GUI/Model/Material/MaterialItemUtils.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// ************************************************************************************************ -// -// BornAgain: simulate and fit reflection and scattering -// -//! @file GUI/Model/Material/MaterialItemUtils.cpp -//! @brief Implements class MaterialItemUtils -//! -//! @homepage http://www.bornagainproject.org -//! @license GNU General Public License v3 or higher (see COPYING) -//! @copyright Forschungszentrum Jülich GmbH 2018 -//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS) -// -// ************************************************************************************************ - -#include "GUI/Model/Material/MaterialItemUtils.h" - -#include <deque> -#include <random> diff --git a/GUI/Model/Material/MaterialItemUtils.h b/GUI/Model/Material/MaterialItemUtils.h deleted file mode 100644 index d3c419f37b031571c0f7b2b3eb556d231adbcb6b..0000000000000000000000000000000000000000 --- a/GUI/Model/Material/MaterialItemUtils.h +++ /dev/null @@ -1,24 +0,0 @@ -// ************************************************************************************************ -// -// BornAgain: simulate and fit reflection and scattering -// -//! @file GUI/Model/Material/MaterialItemUtils.h -//! @brief Defines namespace GUI::MaterialUtil -//! -//! @homepage http://www.bornagainproject.org -//! @license GNU General Public License v3 or higher (see COPYING) -//! @copyright Forschungszentrum Jülich GmbH 2018 -//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS) -// -// ************************************************************************************************ - -#ifndef BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEMUTILS_H -#define BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEMUTILS_H - -#include <QColor> - -namespace GUI::MaterialUtil { - -} // namespace GUI::MaterialUtil - -#endif // BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALITEMUTILS_H diff --git a/GUI/Model/Material/MaterialModel.cpp b/GUI/Model/Material/MaterialModel.cpp index 6d502353f1a3272adf0e11c823bc7302c79617b5..80ade671442ab72297e005bbe625aad2f87594c9 100644 --- a/GUI/Model/Material/MaterialModel.cpp +++ b/GUI/Model/Material/MaterialModel.cpp @@ -14,8 +14,8 @@ #include "GUI/Model/Material/MaterialModel.h" #include "GUI/Model/Material/MaterialItem.h" -#include "GUI/Model/Material/MaterialItemUtils.h" #include "GUI/Model/Material/MaterialModelStore.h" +#include <QColor> #include <QUuid> #include <random> diff --git a/GUI/Model/Sample/ItemWithMaterial.cpp b/GUI/Model/Sample/ItemWithMaterial.cpp index aa3c5848363a93ad7a81da2646c700d2d66f0139..e77158c42eefade5cbeff677bc68ef52e7354eab 100644 --- a/GUI/Model/Sample/ItemWithMaterial.cpp +++ b/GUI/Model/Sample/ItemWithMaterial.cpp @@ -17,9 +17,9 @@ #include "GUI/Model/Job/JobModelFunctions.h" #include "GUI/Model/Material/MaterialItem.h" #include "GUI/Model/Material/MaterialItemContainer.h" -#include "GUI/Model/Material/MaterialItemUtils.h" #include "GUI/Model/Material/MaterialModel.h" #include "GUI/Model/Material/MaterialModelStore.h" +#include <QColor> void ItemWithMaterial::setMaterial(const MaterialItem* materialItem) { diff --git a/GUI/Model/Sample/LayerItem.cpp b/GUI/Model/Sample/LayerItem.cpp index c3574dcb0dbb47fa6f278d967360a4e71deecd6c..f34e9f1c4421db82d16c04d4e691104cbbb1b030 100644 --- a/GUI/Model/Sample/LayerItem.cpp +++ b/GUI/Model/Sample/LayerItem.cpp @@ -14,7 +14,6 @@ #include "GUI/Model/Sample/LayerItem.h" #include "GUI/Model/Group/GroupInfo.h" -#include "GUI/Model/Material/MaterialItemUtils.h" #include "GUI/Model/Sample/LayerRoughnessItems.h" #include "GUI/Model/Sample/MesoCrystalItem.h" #include "GUI/Model/Sample/MultiLayerItem.h" @@ -25,8 +24,9 @@ #include "GUI/Model/Types/DoubleDescriptor.h" #include "GUI/Model/Types/UIntDescriptor.h" #include "GUI/Util/Error.h" - +#include <QColor> #include <boost/polymorphic_cast.hpp> + using boost::polymorphic_cast; namespace { diff --git a/GUI/Model/Sample/ParticleItem.cpp b/GUI/Model/Sample/ParticleItem.cpp index 4c138bbb2e49fb57a0277a0e87b67dd587f40dd8..cd88e0018e78fe9853ac280908dd439bd6ef5f05 100644 --- a/GUI/Model/Sample/ParticleItem.cpp +++ b/GUI/Model/Sample/ParticleItem.cpp @@ -17,7 +17,6 @@ #include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Job/JobModelFunctions.h" #include "GUI/Model/Material/MaterialItem.h" -#include "GUI/Model/Material/MaterialItemUtils.h" #include "GUI/Model/Sample/FormFactorItems.h" #include "GUI/Model/Sample/ParticleCoreShellItem.h" #include "GUI/Model/Sample/ParticleLayoutItem.h" diff --git a/GUI/Model/Sample/SampleModel.cpp b/GUI/Model/Sample/SampleModel.cpp index 4f89486f06d0f44a8f148a863dbeb743d2d45589..b2071b98ee5e77e2e55105e549fbd4b42bdefd8d 100644 --- a/GUI/Model/Sample/SampleModel.cpp +++ b/GUI/Model/Sample/SampleModel.cpp @@ -14,7 +14,6 @@ #include "GUI/Model/Sample/SampleModel.h" #include "GUI/Model/Group/PropertyItem.h" -#include "GUI/Model/Material/MaterialItemUtils.h" #include "GUI/Model/Sample/ItemWithMaterial.h" #include "GUI/Model/Sample/MultiLayerItem.h" #include "GUI/Model/Session/ModelUtils.h" diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp index 66fb2465cfb67ef242e5d33c5c8667d6a307bd0c..6bef3d85162c3295d4a342f7fc157ba88d4c75a3 100644 --- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp +++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp @@ -15,7 +15,6 @@ #include "GUI/View/MaterialEditor/MaterialEditorDialog.h" #include "GUI/Application/ApplicationSettings.h" #include "GUI/Model/Material/MaterialItem.h" -#include "GUI/Model/Material/MaterialItemUtils.h" #include "GUI/Model/Material/MaterialModel.h" #include "GUI/Model/Material/MaterialModelStore.h" #include "GUI/Model/Project/ProjectDocument.h" diff --git a/GUI/View/Tool/DesignerHelper.cpp b/GUI/View/Tool/DesignerHelper.cpp index 747f84d71f20dc2c203facd09b17dab04ef5d1fb..f43170d333654e0ea094956f90018d3f349375a9 100644 --- a/GUI/View/Tool/DesignerHelper.cpp +++ b/GUI/View/Tool/DesignerHelper.cpp @@ -13,7 +13,6 @@ // ************************************************************************************************ #include "GUI/View/Tool/DesignerHelper.h" -#include "GUI/Model/Material/MaterialItemUtils.h" #include "GUI/View/Tool/StyleUtils.h" #include <QPainter> #include <cmath> diff --git a/Tests/Unit/GUI/TestMaterialModel.cpp b/Tests/Unit/GUI/TestMaterialModel.cpp index a3a780cbf35f3da492990934db05e4c7c2c196b7..c71d7bff5d3268861568266693f1cd4e7161616a 100644 --- a/Tests/Unit/GUI/TestMaterialModel.cpp +++ b/Tests/Unit/GUI/TestMaterialModel.cpp @@ -1,6 +1,5 @@ #include "GUI/Model/Material/MaterialDataItems.h" #include "GUI/Model/Material/MaterialItem.h" -#include "GUI/Model/Material/MaterialItemUtils.h" #include "GUI/Model/Material/MaterialModel.h" #include "Tests/GTestWrapper/google_test.h" #include <memory>