From 214d454ae90bdb492d919413bf6210046b9120a0 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Sun, 3 Mar 2024 16:51:44 +0100
Subject: [PATCH] replace 'instrumentsModifier' by 'instrumentsRW'

---
 GUI/Model/Project/ProjectDocument.h       | 2 +-
 GUI/View/Views/InstrumentView.cpp         | 2 +-
 Tests/Unit/GUI/TestAutosaveController.cpp | 8 ++++----
 Tests/Unit/GUI/TestProjectDocument.cpp    | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index f39ef953dee..171af4090d2 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -76,7 +76,7 @@ public:
     const JobsSet* jobs() const { return m_jobs.get(); };
     const SimulationOptionsItem* simulationOptionsItem() const { return m_options.get(); };
 
-    InstrumentsSet* instrumentsModifier() { return m_instruments.get(); };
+    InstrumentsSet* instrumentsRW() { return m_instruments.get(); };
     SamplesSet* samplesModifier() { return m_samples.get(); };
     DatafilesSet* datafilesModifier() { return m_datafiles.get(); };
     JobsSet* jobsModifier() { return m_jobs.get(); };
diff --git a/GUI/View/Views/InstrumentView.cpp b/GUI/View/Views/InstrumentView.cpp
index e81e58b9753..fbf4ae54c9d 100644
--- a/GUI/View/Views/InstrumentView.cpp
+++ b/GUI/View/Views/InstrumentView.cpp
@@ -32,7 +32,7 @@
 #include <QTextEdit>
 
 InstrumentView::InstrumentView()
-    : m_set(gDoc->instrumentsModifier())
+    : m_set(gDoc->instrumentsRW())
     , m_qlistview(new SetView(m_set))
     , m_scroll_area(new QScrollArea)
 {
diff --git a/Tests/Unit/GUI/TestAutosaveController.cpp b/Tests/Unit/GUI/TestAutosaveController.cpp
index c9428d15909..b118f35cb22 100644
--- a/Tests/Unit/GUI/TestAutosaveController.cpp
+++ b/Tests/Unit/GUI/TestAutosaveController.cpp
@@ -19,7 +19,7 @@ protected:
     // helper method to modify something in a model
     void modelsModifier(ProjectDocument& doc)
     {
-        auto* instrument = doc.instrumentsModifier()->at(0);
+        auto* instrument = doc.instrumentsRW()->at(0);
         instrument->setName(QUuid::createUuid().toString());
         emit gDoc->instruments()->currentModified();
     }
@@ -40,7 +40,7 @@ TEST_F(TestAutosaveController, autoSaveController)
 
     gDoc = std::make_unique<ProjectDocument>();
     auto* instrument = new Scatter2DInstrumentItem;
-    gDoc->instrumentsModifier()->add_item(instrument);
+    gDoc->instrumentsRW()->add_item(instrument);
     instrument->setName("GISAS");
     gDoc->saveProjectFileWithData(projectFileName);
 
@@ -85,7 +85,7 @@ TEST_F(TestAutosaveController, autoSaveControllerNewDocument)
 {
     gDoc = std::make_unique<ProjectDocument>();
     auto* instrument = new Scatter2DInstrumentItem;
-    gDoc->instrumentsModifier()->add_item(instrument);
+    gDoc->instrumentsRW()->add_item(instrument);
     instrument->setName("GISAS");
 
     const int autosave_time(100);
@@ -120,7 +120,7 @@ TEST_F(TestAutosaveController, autosaveEnabled)
 
     gDoc->setProjectFullPath(projectFileName);
     auto* instrument = new Scatter2DInstrumentItem;
-    gDoc->instrumentsModifier()->add_item(instrument);
+    gDoc->instrumentsRW()->add_item(instrument);
     instrument->setName("GISAS");
 
     DatafileItem* realData =
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index d1dd8e0bd90..cb855391722 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -20,7 +20,7 @@ protected:
     //! helper method to modify something in a model
     void modelsModifier(ProjectDocument& doc)
     {
-        auto* instrument = doc.instrumentsModifier()->at(0);
+        auto* instrument = doc.instrumentsRW()->at(0);
         instrument->setName(QUuid::createUuid().toString());
         emit gDoc->instruments()->currentModified();
     }
@@ -42,7 +42,7 @@ TEST_F(TestProjectDocument, projectDocument)
     EXPECT_EQ(gDoc->projectFullPath(), QString());
 
     auto* instrument = new Scatter2DInstrumentItem;
-    gDoc->instrumentsModifier()->add_item(instrument);
+    gDoc->instrumentsRW()->add_item(instrument);
     instrument->setName("GISAS");
 
     // Checking document name and isModified status after project save
@@ -79,7 +79,7 @@ TEST_F(TestProjectDocument, projectDocumentWithData)
     const QString ext = QString(GUI::Util::Project::projectFileExtension);
 
     auto* instrument = new Scatter2DInstrumentItem;
-    gDoc->instrumentsModifier()->add_item(instrument);
+    gDoc->instrumentsRW()->add_item(instrument);
     instrument->setName("GISAS");
     DatafileItem* realData =
         UTest::GUI::createRealData2D("TestData", *gDoc->datafilesModifier(), 0.);
@@ -113,7 +113,7 @@ TEST_F(TestProjectDocument, failingProjectSave)
 
     gDoc = std::make_unique<ProjectDocument>();
     auto* instrument = new Scatter2DInstrumentItem;
-    gDoc->instrumentsModifier()->add_item(instrument);
+    gDoc->instrumentsRW()->add_item(instrument);
     instrument->setName("GISAS");
     modelsModifier(*gDoc);
 
-- 
GitLab