From b308ca28f66bf2632392b58d8f9cbacd2aa72b00 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 10 Oct 2023 17:17:43 +0200
Subject: [PATCH] localize member
---
GUI/View/Import/RealDataMaskWidget.cpp | 16 ++++++++--------
GUI/View/Import/RealDataMaskWidget.h | 2 --
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index d0a81a261f1..d33b59cfe1a 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -25,7 +25,6 @@
RealDataMaskWidget::RealDataMaskWidget(QWidget* parent)
: DataAccessWidget(parent)
, m_editorActions(new MaskEditorActions(this))
- , m_toolbar(new MaskEditorToolbar(m_editorActions))
, m_editorPropertyPanel(new MaskEditorPropertyPanel)
, m_editorCanvas(new MaskEditorCanvas)
{
@@ -42,9 +41,10 @@ RealDataMaskWidget::RealDataMaskWidget(QWidget* parent)
mainLayout->setSpacing(0);
mainLayout->setContentsMargins(0, 0, 0, 0);
- m_toolbar->setOrientation(Qt::Vertical);
- m_toolbar->setStyleSheet("QToolBar{border-left:1px solid rgb(180,180,180);}");
- mainLayout->addWidget(m_toolbar);
+ auto* toolbar = new MaskEditorToolbar(m_editorActions);
+ toolbar->setOrientation(Qt::Vertical);
+ toolbar->setStyleSheet("QToolBar{border-left:1px solid rgb(180,180,180);}");
+ mainLayout->addWidget(toolbar);
m_editorPropertyPanel->setPanelHidden(true);
@@ -63,19 +63,19 @@ RealDataMaskWidget::RealDataMaskWidget(QWidget* parent)
&MaskEditorCanvas::onSavePlotRequest);
// selection/drawing activity is propagated from Toolbar to graphics scene
- connect(m_toolbar, &MaskEditorToolbar::activityModeChanged, m_editorCanvas->getScene(),
+ connect(toolbar, &MaskEditorToolbar::activityModeChanged, m_editorCanvas->getScene(),
&MaskGraphicsScene::onActivityModeChanged);
// mask value is propagated from Toolbar to graphics scene
- connect(m_toolbar, &MaskEditorToolbar::maskValueChanged, m_editorCanvas->getScene(),
+ connect(toolbar, &MaskEditorToolbar::maskValueChanged, m_editorCanvas->getScene(),
&MaskGraphicsScene::onMaskValueChanged);
// show results request is propagated from Toolbar to Canvas
- connect(m_toolbar, &MaskEditorToolbar::presentationTypeRequest, m_editorCanvas,
+ connect(toolbar, &MaskEditorToolbar::presentationTypeRequest, m_editorCanvas,
&MaskEditorCanvas::onPresentationTypeRequest);
// space bar push (request for zoom mode) is propagated from graphics view to Toolbar
- connect(m_editorCanvas, &MaskEditorCanvas::changeActivityRequest, m_toolbar,
+ connect(m_editorCanvas, &MaskEditorCanvas::changeActivityRequest, toolbar,
&MaskEditorToolbar::onChangeActivityRequest);
// Delete request is propagated from canvas to actions
diff --git a/GUI/View/Import/RealDataMaskWidget.h b/GUI/View/Import/RealDataMaskWidget.h
index 18a94f7e038..eb276d4e9db 100644
--- a/GUI/View/Import/RealDataMaskWidget.h
+++ b/GUI/View/Import/RealDataMaskWidget.h
@@ -20,7 +20,6 @@
class MaskEditorActions;
class MaskEditorCanvas;
class MaskEditorPropertyPanel;
-class MaskEditorToolbar;
//! Mask editing for RealItem on ImportDataView.
@@ -42,7 +41,6 @@ private:
void onPropertyPanelRequest();
MaskEditorActions* m_editorActions;
- MaskEditorToolbar* m_toolbar;
MaskEditorPropertyPanel* m_editorPropertyPanel;
MaskEditorCanvas* m_editorCanvas;
};
--
GitLab