From a36e4fb14ba6c25200009782b0aa1b50153f081f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 30 Nov 2023 11:00:52 +0100
Subject: [PATCH] revert change that requires <ranges>, not yet available on
mac_x64
---
.clang-tidy | 2 +-
GUI/Model/Data/MaskResultsPresenter.cpp | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/.clang-tidy b/.clang-tidy
index 8592bdaa268..e9ed472a49f 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -24,7 +24,6 @@ Checks: '*,
-clang-analyzer-optin.cplusplus.VirtualCall,
-cppcoreguidelines-pro-type-const-cast,
-*-use-auto,
-*-use-emplace,
-*-use-equals-default,
-*-use-nullptr,
@@ -41,6 +40,7 @@ Checks: '*,
-modernize-loop-convert,
-modernize-make-unique,
-modernize-pass-by-value,
+-modernize-use-auto,
-modernize-use-default-member-init,
-modernize-use-using,
-performance-for-range-copy,
diff --git a/GUI/Model/Data/MaskResultsPresenter.cpp b/GUI/Model/Data/MaskResultsPresenter.cpp
index b9341533fa0..6c60e88b6ea 100644
--- a/GUI/Model/Data/MaskResultsPresenter.cpp
+++ b/GUI/Model/Data/MaskResultsPresenter.cpp
@@ -20,7 +20,6 @@
#include "GUI/Model/Data/Data2DItem.h"
#include "GUI/Model/Mask/MaskContainerItem.h"
#include "GUI/Model/Mask/MaskItems.h"
-#include <ranges>
namespace {
@@ -34,13 +33,13 @@ Datafield* createMaskPresentation(Data2DItem* data2DItem)
Datafield* result = data2DItem->c_field()->clone();
MaskStack detectorMask;
const QVector<MaskItem*> maskItems = data2DItem->maskContainerItem()->maskItems();
- for (auto maskItem : std::ranges::reverse_view(maskItems))
- if (maskItem->isVisible()) {
- if (auto* roiItem = dynamic_cast<RegionOfInterestItem*>(maskItem))
+ for (auto maskIter = maskItems.rbegin(); maskIter != maskItems.rend(); maskIter++)
+ if ((*maskIter)->isVisible()) {
+ if (auto* roiItem = dynamic_cast<RegionOfInterestItem*>((*maskIter)))
roi = roiItem->createShape();
else {
- std::unique_ptr<IShape2D> shape(maskItem->createShape());
- detectorMask.maskToStack(*shape, maskItem->maskValue(), false);
+ std::unique_ptr<IShape2D> shape((*maskIter)->createShape());
+ detectorMask.maskToStack(*shape, (*maskIter)->maskValue(), false);
}
}
--
GitLab