From 1c590783e0e67f7be124c8fe573fad51aa273d4a Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 13 Apr 2020 19:26:29 +0200 Subject: [PATCH] cleanup: free tab-widgets when exiting the application This is completely irrelevant, however out of principle, let's free the tab-widgets at the end of the application. To do so, use Qt's object hierarchy. I'm not a fan of this kind of memory management, but it is how it is. Moreover, remove the explicit constructor of MainTab, since it doesn't differ from the default constructor anyway. Signed-off-by: Berthold Stoeger Signed-off-by: Dirk Hohndel --- desktop-widgets/tab-widgets/maintab.cpp | 16 ++++++---------- desktop-widgets/tab-widgets/maintab.h | 1 - 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 73ed6127b..501afaa0c 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -58,17 +58,17 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), { ui.setupUi(this); - extraWidgets << new TabDiveEquipment(); + extraWidgets << new TabDiveEquipment(this); ui.tabWidget->addTab(extraWidgets.last(), tr("Equipment")); - extraWidgets << new TabDiveInformation(); + extraWidgets << new TabDiveInformation(this); ui.tabWidget->addTab(extraWidgets.last(), tr("Information")); - extraWidgets << new TabDiveStatistics(); + extraWidgets << new TabDiveStatistics(this); ui.tabWidget->addTab(extraWidgets.last(), tr("Statistics")); - extraWidgets << new TabDivePhotos(); + extraWidgets << new TabDivePhotos(this); ui.tabWidget->addTab(extraWidgets.last(), tr("Media")); - extraWidgets << new TabDiveExtraInfo(); + extraWidgets << new TabDiveExtraInfo(this); ui.tabWidget->addTab(extraWidgets.last(), tr("Extra Info")); - extraWidgets << new TabDiveSite(); + extraWidgets << new TabDiveSite(this); ui.tabWidget->addTab(extraWidgets.last(), tr("Dive sites")); ui.dateEdit->setDisplayFormat(prefs.date_format); @@ -178,10 +178,6 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), ui.diveTripLocation->hide(); } -MainTab::~MainTab() -{ -} - void MainTab::hideMessage() { ui.diveNotesMessage->animatedHide(); diff --git a/desktop-widgets/tab-widgets/maintab.h b/desktop-widgets/tab-widgets/maintab.h index 9e4290371..c083554b1 100644 --- a/desktop-widgets/tab-widgets/maintab.h +++ b/desktop-widgets/tab-widgets/maintab.h @@ -27,7 +27,6 @@ class MainTab : public QTabWidget { Q_OBJECT public: MainTab(QWidget *parent = 0); - ~MainTab(); void clearTabs(); void reload(); void initialUiSetup();