From 8ee0bb77dd35d9e05ed32139b17edabd3515cbec Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Tue, 27 Jun 2017 13:36:12 +0200
Subject: [PATCH] Memory leakages in GUI fixed.
---
GUI/coregui/Models/SessionModel.cpp | 2 --
GUI/coregui/Views/ImportDataView.cpp | 2 +-
GUI/coregui/Views/InstrumentView.cpp | 2 +-
GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/GUI/coregui/Models/SessionModel.cpp b/GUI/coregui/Models/SessionModel.cpp
index 8c3d42f65fe..a60ec65ceeb 100644
--- a/GUI/coregui/Models/SessionModel.cpp
+++ b/GUI/coregui/Models/SessionModel.cpp
@@ -345,8 +345,6 @@ void SessionModel::readFrom(QXmlStreamReader *reader, WarningMessageService *mes
m_name = reader->attributes().value(SessionXML::ModelNameAttribute).toString();
- createRootItem();
-
SessionReader::readItems(reader, m_root_item, QString(), messageService);
if (reader->hasError())
throw GUIHelpers::Error(reader->errorString());
diff --git a/GUI/coregui/Views/ImportDataView.cpp b/GUI/coregui/Views/ImportDataView.cpp
index 2866c8c69c9..230ea9637f3 100644
--- a/GUI/coregui/Views/ImportDataView.cpp
+++ b/GUI/coregui/Views/ImportDataView.cpp
@@ -26,7 +26,7 @@
ImportDataView::ImportDataView(MainWindow *mainWindow)
: QWidget(mainWindow)
- , m_toolBar(new ImportDataToolBar)
+ , m_toolBar(new ImportDataToolBar(this))
, m_splitter(new Manhattan::MiniSplitter)
, m_selectorWidget(new RealDataSelectorWidget)
// , m_stackedWidget(new ItemStackPresenter<RealDataEditorWidget>)
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/coregui/Views/InstrumentView.cpp
index fe52ed4cd4d..fcea3b8030b 100644
--- a/GUI/coregui/Views/InstrumentView.cpp
+++ b/GUI/coregui/Views/InstrumentView.cpp
@@ -25,7 +25,7 @@
#include <QBoxLayout>
InstrumentView::InstrumentView(MainWindow* mainWindow)
- : QWidget(mainWindow), m_actions(new InstrumentViewActions),
+ : QWidget(mainWindow), m_actions(new InstrumentViewActions(this)),
m_toolBar(new InstrumentViewToolBar(m_actions, this)),
m_instrumentSelector(new InstrumentSelectorWidget),
m_instrumentEditor(new ItemStackPresenter<InstrumentEditorWidget>(true)),
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
index 4a565cf3f60..15cf8f1bc35 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
@@ -46,7 +46,7 @@ ParameterTuningWidget::ParameterTuningWidget(QWidget *parent)
, m_parameterTuningModel(0)
, m_sliderSettingsWidget(new SliderSettingsWidget(this))
, m_treeView(new QTreeView)
- , m_delegate(new ParameterTuningDelegate)
+ , m_delegate(new ParameterTuningDelegate(this))
, m_warningSign(new WarningSign(m_treeView))
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
--
GitLab