diff --git a/src/ConfigDialog.cpp b/src/ConfigDialog.cpp index cdc5a55a6..0df2c0f1f 100644 --- a/src/ConfigDialog.cpp +++ b/src/ConfigDialog.cpp @@ -26,6 +26,7 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, MainWindow *mainWindow) : mainWindow(mainWindow), zones(_zones) { + setAttribute(Qt::WA_DeleteOnClose); home = _home; @@ -88,20 +89,6 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, MainWindow *mainWindow) : setWindowTitle(tr("Config Dialog")); } -ConfigDialog::~ConfigDialog() -{ - delete cyclistPage; - delete contentsWidget; - delete configPage; - delete devicePage; - delete pagesWidget; - delete closeButton; - delete horizontalLayout; - delete buttonsLayout; - delete mainLayout; -} - - void ConfigDialog::createIcons() { QListWidgetItem *configButton = new QListWidgetItem(contentsWidget); diff --git a/src/ConfigDialog.h b/src/ConfigDialog.h index 718307391..1eb3892cd 100644 --- a/src/ConfigDialog.h +++ b/src/ConfigDialog.h @@ -17,7 +17,6 @@ class ConfigDialog : public QDialog Q_OBJECT public: ConfigDialog(QDir home, Zones *zones, MainWindow *mainWindow); - ~ConfigDialog(); public slots: void changePage(QListWidgetItem *current, QListWidgetItem *previous); diff --git a/src/Pages.cpp b/src/Pages.cpp index 3337c948b..0a748bb68 100644 --- a/src/Pages.cpp +++ b/src/Pages.cpp @@ -7,22 +7,6 @@ #include "DeviceConfiguration.h" #include "ANTplusController.h" -ConfigurationPage::~ConfigurationPage() -{ - delete configGroup; - delete langLabel; - delete langCombo; - delete unitLabel; - delete unitCombo; - delete allRidesAscending; - delete warningLabel; - delete langLayout; - delete unitLayout; - delete warningLayout; - delete configLayout; - delete mainLayout; -} - ConfigurationPage::ConfigurationPage() { configGroup = new QGroupBox(tr("Golden Cheetah Configuration")); @@ -169,36 +153,6 @@ ConfigurationPage::ConfigurationPage() setLayout(mainLayout); } - -CyclistPage::~CyclistPage() -{ - delete cyclistGroup; - delete lblThreshold; - delete txtThreshold; - delete txtThresholdValidator; - delete btnBack; - delete btnForward; - delete btnDelete; - delete checkboxNew; - delete txtStartDate; - delete txtEndDate; - delete lblStartDate; - delete lblEndDate; - delete calendar; - delete lblCurRange; - delete powerLayout; - delete rangeLayout; - delete perfManLTSavgLayout; - delete perfManSTSavgLayout; - delete perfManStartValLayout; - delete perfManLayout; - delete dateRangeLayout; - delete zoneLayout; - delete calendarLayout; - delete cyclistLayout; - delete mainLayout; -} - CyclistPage::CyclistPage(const Zones *_zones): zones(_zones) { @@ -608,10 +562,6 @@ DevicePage::pairClicked(DeviceConfiguration *dc, QProgressDialog *progress) deviceProfile->setText(dc->deviceProfile); } -DevicePage::~DevicePage() -{ -} - deviceModel::deviceModel(QObject *parent) : QAbstractTableModel(parent) { this->parent = parent; diff --git a/src/Pages.h b/src/Pages.h index e1b1a0b85..1db5bc642 100644 --- a/src/Pages.h +++ b/src/Pages.h @@ -29,7 +29,6 @@ class ConfigurationPage : public QWidget { Q_OBJECT public: - ~ConfigurationPage(); ConfigurationPage(); QComboBox *langCombo; QComboBox *unitCombo; @@ -57,7 +56,6 @@ class CyclistPage : public QWidget { Q_OBJECT public: - ~CyclistPage(); CyclistPage(const Zones *_zones); int thresholdPower; QString getText(); @@ -150,7 +148,6 @@ class DevicePage : public QWidget { Q_OBJECT public: - ~DevicePage(); DevicePage(QWidget *parent = 0); void setConfigPane(); void pairClicked(DeviceConfiguration *, QProgressDialog *);