From 988bfd75fac421414e271cbf5a4c4fd00ae93923 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 15 Feb 2024 21:10:42 +0100
Subject: [PATCH] rm fcts MasksQModel::prjnsSet
---
GUI/Model/Data/Data2DItem.cpp | 10 +++++-----
GUI/Model/Mask/MasksQModel.cpp | 11 -----------
GUI/Model/Mask/MasksQModel.h | 2 --
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/GUI/Model/Data/Data2DItem.cpp b/GUI/Model/Data/Data2DItem.cpp
index ff247e8b736..7910e24b71b 100644
--- a/GUI/Model/Data/Data2DItem.cpp
+++ b/GUI/Model/Data/Data2DItem.cpp
@@ -281,7 +281,7 @@ void Data2DItem::writeTo(QXmlStreamWriter* w) const
// masks and projections
if (m_model) {
- if (auto* mi = m_model->masksSet()) {
+ if (const auto* mi = m_model->masksSet()) {
w->writeStartElement(Tag::MaskContainer);
mi->writeTo(w);
w->writeEndElement();
@@ -290,7 +290,7 @@ void Data2DItem::writeTo(QXmlStreamWriter* w) const
// projections
if (m_proj_model) {
- if (auto* pi = m_proj_model->prjnsSet()) {
+ if (const auto* pi = m_proj_model->masksSet()) {
w->writeStartElement(Tag::ProjectionContainer);
pi->writeTo(w);
w->writeEndElement();
@@ -333,7 +333,7 @@ void Data2DItem::readFrom(QXmlStreamReader* r)
// projections
} else if (tag == Tag::ProjectionContainer) {
- getOrCreateProjectionModel()->prjnsSet()->readFrom(r);
+ getOrCreateProjectionModel()->masksSet()->readFrom(r);
XML::gotoEndElementOfTag(r, tag);
} else
@@ -396,12 +396,12 @@ Datafield* Data2DItem::createMaskedField() const
ProjectionsSet* Data2DItem::projectionsSet()
{
- return m_proj_model ? m_proj_model->prjnsSet() : nullptr;
+ return m_proj_model ? dynamic_cast<ProjectionsSet*>(m_proj_model->masksSet()) : nullptr;
}
const ProjectionsSet* Data2DItem::projectionsSet() const
{
- return m_proj_model ? m_proj_model->prjnsSet() : nullptr;
+ return m_proj_model ? dynamic_cast<const ProjectionsSet*>(m_proj_model->masksSet()) : nullptr;
}
MasksQModel* Data2DItem::getOrCreateProjectionModel()
diff --git a/GUI/Model/Mask/MasksQModel.cpp b/GUI/Model/Mask/MasksQModel.cpp
index a627e7e3d58..d0cb9c091ea 100644
--- a/GUI/Model/Mask/MasksQModel.cpp
+++ b/GUI/Model/Mask/MasksQModel.cpp
@@ -16,7 +16,6 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Model/Mask/MasksSet.h"
-#include "GUI/Model/Mask/ProjectionsSet.h"
// Implementation of MasksQModel is based on the Qt source code for QStringListModel
@@ -105,16 +104,6 @@ void MasksQModel::clear()
QAbstractListModel::endResetModel();
}
-ProjectionsSet* MasksQModel::prjnsSet()
-{
- return dynamic_cast<ProjectionsSet*>(m_masks);
-}
-
-const ProjectionsSet* MasksQModel::prjnsSet() const
-{
- return dynamic_cast<const ProjectionsSet*>(m_masks);
-}
-
void MasksQModel::moveUp()
{
for (const QModelIndex& itemIndex : m_selection_model->selectedIndexes()) {
diff --git a/GUI/Model/Mask/MasksQModel.h b/GUI/Model/Mask/MasksQModel.h
index 692ecda6e84..afdb9129ffb 100644
--- a/GUI/Model/Mask/MasksQModel.h
+++ b/GUI/Model/Mask/MasksQModel.h
@@ -60,8 +60,6 @@ public:
MasksSet* masksSet() { return m_masks; }
const MasksSet* masksSet() const { return m_masks; }
- ProjectionsSet* prjnsSet();
- const ProjectionsSet* prjnsSet() const;
private:
MasksSet* m_masks;
--
GitLab