From 1a1f9ac1cc3e4342def19e7634cea74553f08b26 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Sat, 11 Nov 2023 08:35:44 +0100 Subject: [PATCH] QObject has no QWidget parent --- GUI/Model/Data/MaskResultsPresenter.cpp | 6 +----- GUI/Model/Data/MaskResultsPresenter.h | 5 ++--- GUI/View/Mask/MaskEditorCanvas.cpp | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/GUI/Model/Data/MaskResultsPresenter.cpp b/GUI/Model/Data/MaskResultsPresenter.cpp index 452b9412848..2818e7611bc 100644 --- a/GUI/Model/Data/MaskResultsPresenter.cpp +++ b/GUI/Model/Data/MaskResultsPresenter.cpp @@ -60,11 +60,7 @@ Datafield* createMaskPresentation(Data2DItem* data2DItem) } // namespace -MaskResultsPresenter::MaskResultsPresenter(QWidget* parent) - : QObject(parent) - , m_interpolation_flag_backup(false) -{ -} +MaskResultsPresenter::MaskResultsPresenter() = default; MaskResultsPresenter::~MaskResultsPresenter() = default; diff --git a/GUI/Model/Data/MaskResultsPresenter.h b/GUI/Model/Data/MaskResultsPresenter.h index 723caabf543..8e9e9d20061 100644 --- a/GUI/Model/Data/MaskResultsPresenter.h +++ b/GUI/Model/Data/MaskResultsPresenter.h @@ -15,7 +15,6 @@ #ifndef BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H #define BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H -#include "GUI/Model/Data/MaskEditorFlags.h" #include <QObject> #include <memory> @@ -27,7 +26,7 @@ class Datafield; class MaskResultsPresenter : public QObject { Q_OBJECT public: - MaskResultsPresenter(QWidget* parent = nullptr); + MaskResultsPresenter(); ~MaskResultsPresenter(); void setContextMRP(Data2DItem* data2DItem); @@ -37,7 +36,7 @@ public: private: Data2DItem* m_data2DItem; std::unique_ptr<Datafield> m_dataBackup; - bool m_interpolation_flag_backup; + bool m_interpolation_flag_backup = false; }; #endif // BORNAGAIN_GUI_MODEL_DATA_MASKRESULTSPRESENTER_H diff --git a/GUI/View/Mask/MaskEditorCanvas.cpp b/GUI/View/Mask/MaskEditorCanvas.cpp index 3b1729fd079..02a225400ae 100644 --- a/GUI/View/Mask/MaskEditorCanvas.cpp +++ b/GUI/View/Mask/MaskEditorCanvas.cpp @@ -31,7 +31,7 @@ MaskEditorCanvas::MaskEditorCanvas(QWidget* parent) , m_view(new MaskGraphicsView(m_scene)) , m_data2DItem(nullptr) , m_statusLabel(new PlotStatusLabel(nullptr, this)) - , m_resultsPresenter(new MaskResultsPresenter(this)) + , m_resultsPresenter(new MaskResultsPresenter) { setObjectName("MaskEditorCanvas"); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); -- GitLab