rm obsolete MaterialModelStore

GUI/Model/Material/MaterialModel.cpp

@@ -14,7 +14,6 @@
 
 #include "GUI/Model/Material/MaterialModel.h"
 #include "GUI/Model/Material/MaterialItem.h"
-#include "GUI/Model/Material/MaterialModelStore.h"
 #include <QColor>
 #include <QUuid>
 #include <random>
@@ -47,14 +46,6 @@ MaterialModel::MaterialModel(QObject* parent)
     : SessionModel(GUI::Session::XML::MaterialModelTag, parent)
 {
     setObjectName(GUI::Session::XML::MaterialModelTag);
-    if (GUI::Model::MaterialModelStore::materialModel() == nullptr)
-        GUI::Model::MaterialModelStore::subscribe(this);
-}
-
-MaterialModel::~MaterialModel()
-{
-    if (GUI::Model::MaterialModelStore::materialModel() == this)
-        GUI::Model::MaterialModelStore::unsubscribe(this);
 }
 
 void MaterialModel::clear()

GUI/Model/Material/MaterialModel.h

@@ -24,7 +24,6 @@ class MaterialModel : public SessionModel {
 
 public:
     explicit MaterialModel(QObject* parent = nullptr);
-    ~MaterialModel() override;
 
     void clear() override;
 

GUI/Model/Material/MaterialModelStore.cpp

-//  ************************************************************************************************
-//
-//  BornAgain: simulate and fit reflection and scattering
-//
-//! @file      GUI/Model/Material/MaterialModelStore.cpp
-//! @brief     Implements namespace MaterialModelStore
-//!
-//! @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/MaterialModelStore.h"
-#include "GUI/Util/Error.h"
-
-namespace {
-MaterialModel* theMaterialModel = nullptr;
-}
-
-namespace GUI::Model::MaterialModelStore {
-
-MaterialModel* materialModel()
-{
-    return theMaterialModel;
-}
-
-void subscribe(MaterialModel* materialModel)
-{
-    if (theMaterialModel != nullptr)
-        throw Error("GUI::Model::MaterialModelStore::subscribe() -> Error. Attempt to subscribe "
-                    "MaterialModel twice.");
-
-    theMaterialModel = materialModel;
-}
-
-void unsubscribe(MaterialModel* materialModel)
-{
-    if (theMaterialModel != materialModel)
-        throw Error("GUI::Model::MaterialModelStore::unsubscribe -> Error. Attempt to unsubscribe "
-                    "MaterialModel before it was subscribed.");
-
-    theMaterialModel = nullptr;
-}
-} // namespace GUI::Model::MaterialModelStore

GUI/Model/Material/MaterialModelStore.h

-//  ************************************************************************************************
-//
-//  BornAgain: simulate and fit reflection and scattering
-//
-//! @file      GUI/Model/Material/MaterialModelStore.h
-//! @brief     Defines namespace GUI::Model::MaterialModelStore
-//!
-//! @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_MATERIALMODELSTORE_H
-#define BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALMODELSTORE_H
-
-class MaterialModel;
-
-//! The MaterialModelStore holds an instance of the MaterialModel class
-
-namespace GUI::Model::MaterialModelStore {
-
-MaterialModel* materialModel();
-void subscribe(MaterialModel* materialModel);
-void unsubscribe(MaterialModel* materialModel);
-
-} // namespace GUI::Model::MaterialModelStore
-
-#endif // BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALMODELSTORE_H

GUI/Model/Sample/ItemWithMaterial.cpp

@@ -18,7 +18,6 @@
 #include "GUI/Model/Material/MaterialItem.h"
 #include "GUI/Model/Material/MaterialItemContainer.h"
 #include "GUI/Model/Material/MaterialModel.h"
-#include "GUI/Model/Material/MaterialModelStore.h"
 #include <QColor>
 
 void ItemWithMaterial::setMaterial(const MaterialItem* materialItem)

GUI/View/MaterialEditor/MaterialEditorDialog.cpp

@@ -16,7 +16,6 @@
 #include "GUI/Application/ApplicationSettings.h"
 #include "GUI/Model/Material/MaterialItem.h"
 #include "GUI/Model/Material/MaterialModel.h"
-#include "GUI/Model/Material/MaterialModelStore.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Sample/ItemWithMaterial.h"
 #include "GUI/Model/Sample/SampleModel.h"

GUI/View/SampleDesigner/MaterialInplaceForm.cpp

@@ -15,7 +15,6 @@
 #include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
 #include "GUI/Model/Material/MaterialItem.h"
 #include "GUI/Model/Material/MaterialModel.h"
-#include "GUI/Model/Material/MaterialModelStore.h"
 #include "GUI/Model/Sample/ItemWithMaterial.h"
 #include "GUI/Model/Session/ModelPath.h"
 #include "GUI/Model/State/SessionData.h"