From 48c123e0616fc7164b8db6ca810b17cf9fccb954 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 13 Feb 2024 23:15:30 +0100
Subject: [PATCH] anticipate forthcoming changes
---
GUI/Model/Mask/MasksSet.cpp | 9 ++++++---
GUI/Model/Mask/MasksSet.h | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/GUI/Model/Mask/MasksSet.cpp b/GUI/Model/Mask/MasksSet.cpp
index 81799480752..a28383952e4 100644
--- a/GUI/Model/Mask/MasksSet.cpp
+++ b/GUI/Model/Mask/MasksSet.cpp
@@ -13,7 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Mask/MasksSet.h"
+#include "GUI/Model/Descriptor/PolyItem.h"
#include "GUI/Model/Mask/MaskItems.h"
+#include "GUI/Support/XML/UtilXML.h"
#include <QRegularExpression>
namespace {
@@ -99,9 +101,10 @@ void MasksSet::updateMaskNames()
const auto reg = QRegularExpression("[0-9]");
QMap<QString, int> numMasksByType;
- for (const auto& m_mask_item : m_mask_items) {
+ for (const auto& p : m_mask_items) {
+ MaskItem* t = p.certainItem();
- QString name = m_mask_item.certainItem()->maskName();
+ QString name = t->maskName();
name.remove(reg);
int numMasks = 1;
@@ -112,7 +115,7 @@ void MasksSet::updateMaskNames()
numMasksByType.insert(name, numMasks);
name += QString::number(numMasks);
- m_mask_item.certainItem()->setMaskName(name);
+ t->setMaskName(name);
}
}
diff --git a/GUI/Model/Mask/MasksSet.h b/GUI/Model/Mask/MasksSet.h
index 5dd0c66c71b..346c48604ae 100644
--- a/GUI/Model/Mask/MasksSet.h
+++ b/GUI/Model/Mask/MasksSet.h
@@ -19,6 +19,7 @@
#include "GUI/Model/Descriptor/PolyVector.h"
#include "GUI/Model/Mask/MasksCatalog.h"
#include <QModelIndex>
+#include <QXmlStreamWriter>
class MaskItem;
class MessageService;
--
GitLab