From ce6d0da0e864d43499772af7c93c53dabfa2a547 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Fri, 9 Feb 2024 18:59:21 +0100
Subject: [PATCH] disambiguate, simplify
---
GUI/Model/Files/DatafilesQModel.cpp | 2 +-
GUI/Model/Files/DatafilesSet.cpp | 5 ++---
GUI/Model/Files/DatafilesSet.h | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/GUI/Model/Files/DatafilesQModel.cpp b/GUI/Model/Files/DatafilesQModel.cpp
index 0bf5de323d1..d4b57faa482 100644
--- a/GUI/Model/Files/DatafilesQModel.cpp
+++ b/GUI/Model/Files/DatafilesQModel.cpp
@@ -50,7 +50,7 @@ void DatafilesQModel::removeDatafileItem(DatafileItem* item)
const int row = m_items.indexOf(item);
beginRemoveRows(indexOfHeadline(), row, row);
m_items.removeAll(item);
- m_model->removeDatafileItem(item);
+ m_model->deleteDatafileItem(item);
endRemoveRows();
}
diff --git a/GUI/Model/Files/DatafilesSet.cpp b/GUI/Model/Files/DatafilesSet.cpp
index a2076586129..86d2e0ddb68 100644
--- a/GUI/Model/Files/DatafilesSet.cpp
+++ b/GUI/Model/Files/DatafilesSet.cpp
@@ -38,7 +38,7 @@ void DatafilesSet::appendDatafileItem(DatafileItem* dfi)
m_dfile_items.emplace_back(dfi);
}
-void DatafilesSet::removeDatafileItem(DatafileItem* dfi)
+void DatafilesSet::deleteDatafileItem(DatafileItem* dfi)
{
ASSERT(dfi);
m_dfile_items.delete_element(dfi);
@@ -46,8 +46,7 @@ void DatafilesSet::removeDatafileItem(DatafileItem* dfi)
void DatafilesSet::clear()
{
- for (auto* dfi : m_dfile_items)
- removeDatafileItem(dfi);
+ m_dfile_items.clear();
}
QVector<DataItem*> DatafilesSet::dataItems() const
diff --git a/GUI/Model/Files/DatafilesSet.h b/GUI/Model/Files/DatafilesSet.h
index d6a5ae02fe2..827c260eb12 100644
--- a/GUI/Model/Files/DatafilesSet.h
+++ b/GUI/Model/Files/DatafilesSet.h
@@ -32,7 +32,7 @@ public:
~DatafilesSet();
void appendDatafileItem(DatafileItem* dfi);
- void removeDatafileItem(DatafileItem* dfi);
+ void deleteDatafileItem(DatafileItem* dfi);
void clear();
void readFrom(QXmlStreamReader* r);
void readDatafiles(const QString& projectDir, MessageService* messageService);
--
GitLab