From 93558f558a329e1ed05ef2740aa6b2d4b204c4ed Mon Sep 17 00:00:00 2001 From: Mikhail Svechnikov <svechnikovmv@gmail.com> Date: Mon, 13 Feb 2023 12:13:00 +0100 Subject: [PATCH] cleanup --- GUI/Model/Data/ProjectionItems.h | 4 +--- GUI/View/Mask/MaskDrawingContext.cpp | 13 ------------- GUI/View/Mask/MaskDrawingContext.h | 1 - 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/GUI/Model/Data/ProjectionItems.h b/GUI/Model/Data/ProjectionItems.h index 27a74147cb4..f8269114d44 100644 --- a/GUI/Model/Data/ProjectionItems.h +++ b/GUI/Model/Data/ProjectionItems.h @@ -21,10 +21,8 @@ enum ProjectionType { Horizontal, Vertical, Invalid }; -class ProjectionContainerItem : public MaskContainerItem { +class ProjectionContainerItem : public MaskContainerItem { public: - static constexpr auto M_TYPE{"ProjectionContainer"}; - ProjectionContainerItem(); //! Verify the type of the given MaskItem (throws excepctions) void verifyMask(MaskItem* maskItem) const; diff --git a/GUI/View/Mask/MaskDrawingContext.cpp b/GUI/View/Mask/MaskDrawingContext.cpp index 8c838d3337d..1f2b91b9330 100644 --- a/GUI/View/Mask/MaskDrawingContext.cpp +++ b/GUI/View/Mask/MaskDrawingContext.cpp @@ -118,19 +118,6 @@ bool MaskDrawingContext::isActivityRequiresDrawingCancel( && proposed_new_activity >= MaskEditorFlags::PAN_ZOOM_MODE; } -//! Returns model type corresponding to current activity. - -QString MaskDrawingContext::activityToModelType() const -{ - if (isRectangleMode()) - return RectangleItem::M_TYPE; - if (isEllipseMode()) - return EllipseItem::M_TYPE; - if (isROIMode()) - return RegionOfInterestItem::M_TYPE; - return ""; -} - //! Returns model row corresponding to given activity. All shapes, except ROI, will be added //! on top of each other. ROI shape will be added at the bottom. diff --git a/GUI/View/Mask/MaskDrawingContext.h b/GUI/View/Mask/MaskDrawingContext.h index 00f1c5200c2..2d0e40a4b91 100644 --- a/GUI/View/Mask/MaskDrawingContext.h +++ b/GUI/View/Mask/MaskDrawingContext.h @@ -46,7 +46,6 @@ public: bool isActivityRequiresDrawingCancel(MaskEditorFlags::Activity proposed_new_activity) const; - QString activityToModelType() const; int activityToRow() const; private: -- GitLab