From 7ad98e228ec8381ec152b0cad7b03477cde17cc0 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Fri, 3 Nov 2017 10:27:58 +0100
Subject: [PATCH] Rearranged parentship in ProjectionEditorActions
---
.../Views/JobWidgets/ProjectionsEditorActions.cpp | 13 ++++++-------
.../Views/JobWidgets/ProjectionsEditorActions.h | 4 ++--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp
index 96e99cd52dc..a5ee84388ac 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp
@@ -24,27 +24,26 @@ ProjectionsEditorActions::ProjectionsEditorActions(QWidget* parent)
: QObject(parent)
, m_resetViewAction(new QAction(this))
, m_togglePanelAction(new QAction(this))
+ , m_deleteAction(new QAction("Remove selected", this))
, m_model(nullptr)
, m_selectionModel(nullptr)
{
// Actions for top toolbar
- m_resetViewAction = new QAction(this);
m_resetViewAction->setText("Reset");
m_resetViewAction->setIcon(QIcon(":/images/toolbar16light_refresh.svg"));
m_resetViewAction->setToolTip("Reset View");
- connect(m_resetViewAction, SIGNAL(triggered()), this, SIGNAL(resetViewRequest()));
+ connect(m_resetViewAction, &QAction::triggered,
+ this, &ProjectionsEditorActions::resetViewRequest);
- m_togglePanelAction = new QAction(this);
m_togglePanelAction->setText("Properties");
m_togglePanelAction->setIcon(QIcon(":/images/toolbar16light_propertypanel.svg"));
m_togglePanelAction->setToolTip("Toggle Property Panel");
- connect(m_togglePanelAction, SIGNAL(triggered()), this, SIGNAL(propertyPanelRequest()));
+ connect(m_togglePanelAction, &QAction::triggered,
+ this, &ProjectionsEditorActions::propertyPanelRequest);
- m_deleteAction = new QAction(QStringLiteral("Remove selected"), parent);
m_deleteAction->setToolTip("Remove selected (Del)");
m_deleteAction->setShortcuts(QKeySequence::Delete);
- parent->addAction(m_deleteAction);
- connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(onDeleteAction()));
+ connect(m_deleteAction, &QAction::triggered, this, &ProjectionsEditorActions::onDeleteAction);
}
void ProjectionsEditorActions::setModel(SessionModel* maskModel, const QModelIndex& rootIndex)
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h
index 594354e2e2c..1420bf0069a 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h
@@ -51,9 +51,9 @@ private:
QAction* m_resetViewAction;
QAction* m_togglePanelAction;
QAction* m_deleteAction;
- SessionModel *m_model;
+ SessionModel* m_model;
QModelIndex m_rootIndex; //! Index in the model corresponding to IntensityDataItem
- QItemSelectionModel *m_selectionModel;
+ QItemSelectionModel* m_selectionModel;
};
#endif // PROJECTIONSEDITORACTIONS_H
--
GitLab