diff --git a/GUI/View/Canvas/MaskEditorActions.cpp b/GUI/View/Canvas/MaskEditorActions.cpp index 7de53f185d771aa827c8a5af0dc50a39188c7d56..4e90ae99a641675c51d3759a416f2df558777c56 100644 --- a/GUI/View/Canvas/MaskEditorActions.cpp +++ b/GUI/View/Canvas/MaskEditorActions.cpp @@ -19,14 +19,13 @@ #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/View/Tool/ActionFactory.h" -MaskEditorActions::MaskEditorActions(QWidget* parent) - : QObject(parent) - , m_toggleMaskValueAction(new QAction("Toggle mask value", parent)) - , m_bringToFrontAction(new QAction("Rise mask up", parent)) - , m_sendToBackAction(new QAction("Lower mask down", parent)) - , m_deleteMaskAction(new QAction("Remove mask", parent)) - , m_resetViewAction(new QAction(this)) - , m_savePlotAction(new QAction(this)) +MaskEditorActions::MaskEditorActions() + : m_toggleMaskValueAction(new QAction("Toggle mask value")) + , m_bringToFrontAction(new QAction("Rise mask up")) + , m_sendToBackAction(new QAction("Lower mask down")) + , m_deleteMaskAction(new QAction("Remove mask")) + , m_resetViewAction(new QAction) + , m_savePlotAction(new QAction) , m_togglePanelAction(ActionFactory::createTogglePropertiesPanelAction(this)) , m_mask_list_model(nullptr) , m_selectionModel(nullptr) @@ -46,7 +45,6 @@ MaskEditorActions::MaskEditorActions(QWidget* parent) m_deleteMaskAction->setToolTip("Remove selected mask (Del)"); m_deleteMaskAction->setShortcuts(QKeySequence::Delete); - parent->addAction(m_deleteMaskAction); connect(m_deleteMaskAction, &QAction::triggered, this, &MaskEditorActions::onDeleteMaskAction); // Actions for top toolbar diff --git a/GUI/View/Canvas/MaskEditorActions.h b/GUI/View/Canvas/MaskEditorActions.h index 4f146afff6584ce8379c35a860ce50d498a27956..36260e32a579cdf9f28b90853924a2bab48f3844 100644 --- a/GUI/View/Canvas/MaskEditorActions.h +++ b/GUI/View/Canvas/MaskEditorActions.h @@ -30,7 +30,7 @@ class MaskeditorListmodel; class MaskEditorActions : public QObject { Q_OBJECT public: - MaskEditorActions(QWidget* parent); + MaskEditorActions(); void setModels(MaskeditorListmodel* mask_list_model, QItemSelectionModel* selectionModel); diff --git a/GUI/View/Frame/MaskEditingFrame.cpp b/GUI/View/Frame/MaskEditingFrame.cpp index 31ad10bb1508f5ab75a08d111eb5d33927d299a3..b85b497fa5dca53758a6fd5e06c416e9e061cc06 100644 --- a/GUI/View/Frame/MaskEditingFrame.cpp +++ b/GUI/View/Frame/MaskEditingFrame.cpp @@ -26,7 +26,7 @@ MaskEditingFrame::MaskEditingFrame(QWidget* parent) : DataAccessWidget(parent) - , m_actions(new MaskEditorActions(this)) + , m_actions(new MaskEditorActions) , m_panel(new MaskPanel) , m_canvas2D(new MaskEditorCanvas) { diff --git a/GUI/View/Frame/Plot2DWithProjectionFrame.cpp b/GUI/View/Frame/Plot2DWithProjectionFrame.cpp index 9a48e79748ccdc03d61d5c4ad032455bf6daf5b8..9183f8e408e429d99af8ae3497eaeefda0976631 100644 --- a/GUI/View/Frame/Plot2DWithProjectionFrame.cpp +++ b/GUI/View/Frame/Plot2DWithProjectionFrame.cpp @@ -25,7 +25,7 @@ Plot2DWithProjectionFrame::Plot2DWithProjectionFrame(QWidget* parent) : DataAccessWidget(parent) - , m_actions(new ProjectionActions(this)) + , m_actions(new ProjectionActions) , m_canvas2D(new ProjectionsEditorCanvas) , m_canvas1D(new ProjectedGraphsCanvas) , m_scaleEditor(new Scale2DEditor(this)) diff --git a/GUI/View/Setup/ProjectionActions.cpp b/GUI/View/Setup/ProjectionActions.cpp index 37cd6a6e5d9ad201c5519c73255fc62636afd823..5d2889eb119ba0a601b7f9d431c0770b5e08af83 100644 --- a/GUI/View/Setup/ProjectionActions.cpp +++ b/GUI/View/Setup/ProjectionActions.cpp @@ -24,12 +24,10 @@ class MaskItem; -ProjectionActions::ProjectionActions(QWidget* parent) - : QObject(parent) - , m_resetViewAction(new QAction(this)) - , m_togglePanelAction(new QAction(this)) +ProjectionActions::ProjectionActions() + : m_resetViewAction(new QAction) + , m_togglePanelAction(new QAction) , m_deleteAction(new QAction("Remove selected", this)) - , m_parent(parent) { // Actions for top toolbar m_resetViewAction->setText("Center view"); @@ -84,5 +82,5 @@ void ProjectionActions::onSaveAction() return; ProjectionsSaver assistant; - assistant.saveProjections(m_parent, m_data2DItem); + assistant.saveProjections(m_data2DItem); } diff --git a/GUI/View/Setup/ProjectionActions.h b/GUI/View/Setup/ProjectionActions.h index 274dea4f12818cb097b54d8c67dab26001935f9b..5dc0f166ff3fbdc2a8c6b0331280c4b7e8842985 100644 --- a/GUI/View/Setup/ProjectionActions.h +++ b/GUI/View/Setup/ProjectionActions.h @@ -26,7 +26,7 @@ class ProjectionList; class ProjectionActions : public QObject { Q_OBJECT public: - ProjectionActions(QWidget* parent = nullptr); + ProjectionActions(); void updateProjsActions(Data2DItem* data2DItem); @@ -46,7 +46,6 @@ private: QAction* m_deleteAction; MaskeditorListmodel* m_mask_list_model; Data2DItem* m_data2DItem; - QWidget* m_parent; }; #endif // BORNAGAIN_GUI_VIEW_SETUP_PROJECTIONACTIONS_H diff --git a/GUI/View/Setup/ProjectionsSaver.cpp b/GUI/View/Setup/ProjectionsSaver.cpp index b79071351b961c90353b90f12a040a13f24dded6..8d37692dafdf02c8097ce12ae7f39de610d9cd22 100644 --- a/GUI/View/Setup/ProjectionsSaver.cpp +++ b/GUI/View/Setup/ProjectionsSaver.cpp @@ -62,14 +62,14 @@ ProjectionsSaver::~ProjectionsSaver() = default; //! Calls file open dialog and writes projection data as ASCII -void ProjectionsSaver::saveProjections(QWidget* parent, Data2DItem* data2DItem) +void ProjectionsSaver::saveProjections( Data2DItem* data2DItem) { ASSERT(data2DItem); ASSERT(gDoc); QString defaultName = gDoc->userExportDir() + "/untitled.txt"; QString fname = QFileDialog::getSaveFileName( - parent, "Save projections data", defaultName, "", nullptr, + nullptr, "Save projections data", defaultName, "", nullptr, appSettings->useNativeFileDialog() ? QFileDialog::Options() : QFileDialog::DontUseNativeDialog); diff --git a/GUI/View/Setup/ProjectionsSaver.h b/GUI/View/Setup/ProjectionsSaver.h index db8a3bdd954aaae5b9760e208b710b42b8854455..3a538424df9422d142ecd4072300a05432c59c8f 100644 --- a/GUI/View/Setup/ProjectionsSaver.h +++ b/GUI/View/Setup/ProjectionsSaver.h @@ -31,7 +31,7 @@ public: ProjectionsSaver(); ~ProjectionsSaver(); - void saveProjections(QWidget* parent, Data2DItem* data2DItem); + void saveProjections(Data2DItem* data2DItem); private: struct Projection {