additional control on destruction

src/fahrplan.cpp

@@ -43,12 +43,12 @@ Fahrplan::Fahrplan(QObject *parent)
     , m_mode(DepartureMode)
     , m_dateTime(QDateTime::currentDateTime())
 {
-    settings = new QSettings(FAHRPLAN_SETTINGS_NAMESPACE, "fahrplan2");
+    settings = new QSettings(FAHRPLAN_SETTINGS_NAMESPACE, "fahrplan2", this);
     setMode(static_cast<Mode>(settings->value("mode", DepartureMode).toInt()));
 
     if (!m_parser_manager) {
         int currentBackend = settings->value("currentBackend", 0).toInt();
-        m_parser_manager = new FahrplanBackendManager(currentBackend);
+        m_parser_manager = new FahrplanBackendManager(currentBackend, this);
     }
     connect(m_parser_manager, SIGNAL(parserChanged(const QString &, int)), this, SLOT(onParserChanged(const QString &, int)));
 
@@ -73,6 +73,41 @@ Fahrplan::Fahrplan(QObject *parent)
     }
 }
 
+Fahrplan::~Fahrplan()
+{
+    qDebug() << this;
+
+    if (m_trainrestrictions) {
+        delete m_trainrestrictions;
+    }
+
+    if (m_timetable) {
+        delete m_timetable;
+    }
+
+    if (m_stationSearchResults) {
+        disconnect(m_stationSearchResults, SIGNAL(stationSelected(Fahrplan::StationType,Station)),
+                   this, SLOT(setStation(Fahrplan::StationType,Station)));
+        delete m_stationSearchResults;
+    }
+
+    if (m_favorites) {
+        disconnect(m_favorites, SIGNAL(stationSelected(Fahrplan::StationType,Station)),
+                   this, SLOT(setStation(Fahrplan::StationType,Station)));
+        delete m_favorites;
+    }
+
+    if (m_parser_manager) {
+        unbindParserSignals();
+        disconnect(m_parser_manager, SIGNAL(parserChanged(const QString &, int)), this, SLOT(onParserChanged(const QString &, int)));
+        delete m_parser_manager;
+    }
+
+    if (settings) {
+        delete settings;
+    }
+}
+
 void Fahrplan::bindParserSignals()
 {
     if (m_parser_manager->getParser()) {
@@ -84,6 +119,17 @@ void Fahrplan::bindParserSignals()
     }
 }
 
+void Fahrplan::unbindParserSignals()
+{
+    if (m_parser_manager->getParser()) {
+        disconnect(m_parser_manager->getParser(), SIGNAL(stationsResult(StationsList)), this, SLOT(onStationSearchResults(StationsList)));
+        disconnect(m_parser_manager->getParser(), SIGNAL(journeyResult(JourneyResultList*)), this, SIGNAL(parserJourneyResult(JourneyResultList*)));
+        disconnect(m_parser_manager->getParser(), SIGNAL(errorOccured(QString)), this, SIGNAL(parserErrorOccured(QString)));
+        disconnect(m_parser_manager->getParser(), SIGNAL(journeyDetailsResult(JourneyDetailResultList*)), this, SIGNAL(parserJourneyDetailsResult(JourneyDetailResultList*)));
+        disconnect(m_parser_manager->getParser(), SIGNAL(timeTableResult(TimetableEntriesList)), this, SLOT(onTimetableResult(TimetableEntriesList)));
+    }
+}
+
 void Fahrplan::storeSettingsValue(const QString &key, const QString &value)
 {
     settings->setValue(key, value);

src/fahrplan.h

@@ -77,6 +77,7 @@ class Fahrplan : public QObject
         };
 
         explicit Fahrplan(QObject *parent = 0);
+        virtual ~Fahrplan();
         FahrplanParserThread *parser();
         Favorites *favorites() const;
         QString parserName() const;
@@ -141,6 +142,7 @@ class Fahrplan : public QObject
         void onStationSearchResults(const StationsList &result);
         void onTimetableResult(const TimetableEntriesList &timetableEntries);
         void bindParserSignals();
+        void unbindParserSignals();
 
     private:
         static FahrplanBackendManager *m_parser_manager;