From b3618ae2c5a9d0cba5523b0b92eec331c8441a6a Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Dec 2023 09:11:16 +0100
Subject: [PATCH] rename EActivityType -> EMaskMode
---
GUI/View/Canvas/MaskToolbox.cpp | 2 +-
GUI/View/Scene/MaskFlags.h | 4 ++--
GUI/View/Setup/ProjectionsToolpanel.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/GUI/View/Canvas/MaskToolbox.cpp b/GUI/View/Canvas/MaskToolbox.cpp
index b681412384a..51b65d30fb3 100644
--- a/GUI/View/Canvas/MaskToolbox.cpp
+++ b/GUI/View/Canvas/MaskToolbox.cpp
@@ -193,7 +193,7 @@ void MaskToolbox::add_separator()
MaskFlags::Activity MaskToolbox::currentActivity() const
{
- return MaskFlags::EActivityType(m_activityButtonGroup->checkedId());
+ return MaskFlags::EMaskMode(m_activityButtonGroup->checkedId());
}
void MaskToolbox::setCurrentActivity(MaskFlags::Activity value)
diff --git a/GUI/View/Scene/MaskFlags.h b/GUI/View/Scene/MaskFlags.h
index 815fd6d322b..306daffa292 100644
--- a/GUI/View/Scene/MaskFlags.h
+++ b/GUI/View/Scene/MaskFlags.h
@@ -20,7 +20,7 @@
//! Various flags for MaskEditor operation
namespace MaskFlags {
-enum EActivityType {
+enum EMaskMode {
SELECTION_MODE,
PAN_ZOOM_MODE,
RECTANGLE_MODE,
@@ -32,7 +32,7 @@ enum EActivityType {
MASKALL_MODE,
PREVIOUS_MODE
};
-Q_DECLARE_FLAGS(Activity, EActivityType)
+Q_DECLARE_FLAGS(Activity, EMaskMode)
enum EMaskValue { MASK_OFF, MASK_ON };
Q_DECLARE_FLAGS(MaskValue, EMaskValue)
diff --git a/GUI/View/Setup/ProjectionsToolpanel.cpp b/GUI/View/Setup/ProjectionsToolpanel.cpp
index 53ab03ab3fc..90b4e0060f5 100644
--- a/GUI/View/Setup/ProjectionsToolpanel.cpp
+++ b/GUI/View/Setup/ProjectionsToolpanel.cpp
@@ -145,7 +145,7 @@ void ProjectionsToolpanel::add_separator()
MaskFlags::Activity ProjectionsToolpanel::currentActivity() const
{
- return MaskFlags::EActivityType(m_activityButtonGroup->checkedId());
+ return MaskFlags::EMaskMode(m_activityButtonGroup->checkedId());
}
void ProjectionsToolpanel::setCurrentActivity(MaskFlags::Activity value)
--
GitLab