From e4d1daea02b9bb94124c42d97c83487fe26cce00 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 29 Sep 2020 15:22:59 +0200
Subject: [PATCH] gui: removing unique ptr in qt stuff

---
 slsDetectorGui/include/qDetectorMain.h |  2 +-
 slsDetectorGui/src/qDetectorMain.cpp   | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/slsDetectorGui/include/qDetectorMain.h b/slsDetectorGui/include/qDetectorMain.h
index 44849c664..9f6b77756 100644
--- a/slsDetectorGui/include/qDetectorMain.h
+++ b/slsDetectorGui/include/qDetectorMain.h
@@ -71,7 +71,7 @@ class qDetectorMain : public QMainWindow, private Ui::DetectorMainObject {
     std::unique_ptr<sls::Detector> det;
     qDrawPlot *plot;
     MyTabWidget *tabs;
-    std::unique_ptr<QScrollArea> scroll[NumberOfTabs];
+    QScrollArea *scroll[NumberOfTabs];
     qTabMeasurement *tabMeasurement;
     qTabDataOutput *tabDataOutput;
     qTabPlot *tabPlot;
diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp
index e84bf2af7..b1017ca7a 100644
--- a/slsDetectorGui/src/qDetectorMain.cpp
+++ b/slsDetectorGui/src/qDetectorMain.cpp
@@ -116,6 +116,9 @@ qDetectorMain::qDetectorMain(int multiId, const std::string &fname,
 
 qDetectorMain::~qDetectorMain() {
     disconnect(tabs, SIGNAL(currentChanged(int)), this, SLOT(Refresh(int)));
+    for (int i = 0; i < NumberOfTabs; ++i) {
+        delete scroll[i];
+    }
 }
 
 void qDetectorMain::SetUpWidgetWindow() {
@@ -141,7 +144,7 @@ void qDetectorMain::SetUpWidgetWindow() {
 
     //	creating the scroll area widgets for the tabs
     for (int i = 0; i < NumberOfTabs; ++i) {
-        scroll[i] = sls::make_unique<QScrollArea>();
+        scroll[i] = new QScrollArea();
         scroll[i]->setFrameShape(QFrame::NoFrame);
     }
     // setting the tab widgets to the scrollareas
@@ -153,13 +156,13 @@ void qDetectorMain::SetUpWidgetWindow() {
     scroll[DEBUGGING]->setWidget(tabDebugging);
     scroll[DEVELOPER]->setWidget(tabDeveloper);
     // inserting all the tabs
-    tabs->insertTab(MEASUREMENT, scroll[MEASUREMENT].get(), "Measurement");
-    tabs->insertTab(DATAOUTPUT, scroll[DATAOUTPUT].get(), "Data Output");
-    tabs->insertTab(PLOT, scroll[PLOT].get(), "Plot");
-    tabs->insertTab(SETTINGS, scroll[SETTINGS].get(), "Settings");
-    tabs->insertTab(ADVANCED, scroll[ADVANCED].get(), "Advanced");
-    tabs->insertTab(DEBUGGING, scroll[DEBUGGING].get(), "Debugging");
-    tabs->insertTab(DEVELOPER, scroll[DEVELOPER].get(), "Developer");
+    tabs->insertTab(MEASUREMENT, scroll[MEASUREMENT], "Measurement");
+    tabs->insertTab(DATAOUTPUT, scroll[DATAOUTPUT], "Data Output");
+    tabs->insertTab(PLOT, scroll[PLOT], "Plot");
+    tabs->insertTab(SETTINGS, scroll[SETTINGS], "Settings");
+    tabs->insertTab(ADVANCED, scroll[ADVANCED], "Advanced");
+    tabs->insertTab(DEBUGGING, scroll[DEBUGGING], "Debugging");
+    tabs->insertTab(DEVELOPER, scroll[DEVELOPER], "Developer");
     // no scroll buttons this way
     tabs->insertTab(MESSAGES, tabMessages, "Terminal");