From 9a6c11fb7f487c521f4205fc9fd1103cdf29a790 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Fri, 9 Feb 2024 19:35:07 +0100
Subject: [PATCH] replace 'dfileItems2' by 'dfileItems'
---
GUI/Model/Files/DatafilesQModel.cpp | 6 +++---
GUI/Model/Files/DatafilesSet.h | 2 +-
GUI/Model/Project/LinkInstrumentManager.cpp | 4 ++--
GUI/View/Views/SimulationView.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/GUI/Model/Files/DatafilesQModel.cpp b/GUI/Model/Files/DatafilesQModel.cpp
index 8de96f4307b..497d179ece4 100644
--- a/GUI/Model/Files/DatafilesQModel.cpp
+++ b/GUI/Model/Files/DatafilesQModel.cpp
@@ -51,7 +51,7 @@ void DatafilesQModel::removeDatafileItemAt(int row)
DatafileItem* DatafilesQModel::topMostItem() const
{
if (m_model->size() > 0)
- return m_model->dfileItems2().at(0);
+ return m_model->dfileItems().at(0);
return nullptr;
}
@@ -69,7 +69,7 @@ QModelIndex DatafilesQModel::index(int row, int column, const QModelIndex& paren
return createIndex(row, column, nullptr);
if (parent == indexOfHeadline())
- return createIndex(row, column, m_model->dfileItems2().at(row));
+ return createIndex(row, column, m_model->dfileItems().at(row));
return {};
}
@@ -145,7 +145,7 @@ DatafileItem* DatafilesQModel::itemForIndex(const QModelIndex& index) const
QModelIndex DatafilesQModel::indexForItem(DatafileItem* item) const
{
for (size_t i = 0; i < m_model->size(); ++i)
- if (m_model->dfileItems2().at(i) == item)
+ if (m_model->dfileItems().at(i) == item)
return createIndex(i, 0, item);
return {};
}
diff --git a/GUI/Model/Files/DatafilesSet.h b/GUI/Model/Files/DatafilesSet.h
index 8b2c120646c..6d882059aa5 100644
--- a/GUI/Model/Files/DatafilesSet.h
+++ b/GUI/Model/Files/DatafilesSet.h
@@ -39,7 +39,7 @@ public:
void setCurrentIndex(int index) { m_current_index = index; }
size_t size() const { return m_dfile_items.size(); }
- const OwningVector<DatafileItem>& dfileItems2() const { return m_dfile_items; }
+ const OwningVector<DatafileItem>& dfileItems() const { return m_dfile_items; }
QStringList realItemNames() const;
int currentIndex() const { return m_current_index; }
void writeTo(QXmlStreamWriter* w) const;
diff --git a/GUI/Model/Project/LinkInstrumentManager.cpp b/GUI/Model/Project/LinkInstrumentManager.cpp
index b199230ef60..794e0574bdd 100644
--- a/GUI/Model/Project/LinkInstrumentManager.cpp
+++ b/GUI/Model/Project/LinkInstrumentManager.cpp
@@ -121,7 +121,7 @@ void LinkInstrumentManager::onInstrumentChanged(const InstrumentItem* instrument
{
// Run through all DatafileItem and refresh linking to match possible change in detector
// axes definition.
- for (auto* dfi : m_doc->datafiles()->dfileItems2())
+ for (auto* dfi : m_doc->datafiles()->dfileItems())
if (dfi->instrumentId() == instrument->id()) {
if (!instrument->alignedWith(dfi)) {
dfi->unlinkFromInstrument();
@@ -134,7 +134,7 @@ void LinkInstrumentManager::onInstrumentChanged(const InstrumentItem* instrument
void LinkInstrumentManager::onInstrumentAddedOrRemoved()
{
// remove links in realItems (in case of a linked instrument was removed)
- for (auto* dfi : m_doc->datafiles()->dfileItems2())
+ for (auto* dfi : m_doc->datafiles()->dfileItems())
if (!m_doc->instruments()->instrumentExists(dfi->instrumentId()))
dfi->unlinkFromInstrument();
}
diff --git a/GUI/View/Views/SimulationView.cpp b/GUI/View/Views/SimulationView.cpp
index 3bbd17db679..5c5602370aa 100644
--- a/GUI/View/Views/SimulationView.cpp
+++ b/GUI/View/Views/SimulationView.cpp
@@ -412,5 +412,5 @@ const DatafileItem* SimulationView::selectedDatafileItem() const
const int idx = m_real_data_combo->currentIndex() - 1;
if (idx < 0 || idx > (int)gDoc->datafiles()->size())
return nullptr; // usage: -1 stands for "None"
- return gDoc->datafiles()->dfileItems2().at(idx);
+ return gDoc->datafiles()->dfileItems().at(idx);
}
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index ac39bace164..ef972f4a438 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -20,7 +20,7 @@ QList<DatafileItem*> linkedRealDataItems(DatafilesSet& realModel,
ASSERT(instrumentItem);
QList<DatafileItem*> result;
- for (auto* dfi : realModel.dfileItems2()) {
+ for (auto* dfi : realModel.dfileItems()) {
const QString linkedIdentifier = dfi->instrumentId();
const QString instrumentIdentifier = instrumentItem->id();
--
GitLab