Fixes for memory leaks and QObject* ownership bugs

rpm/harbour-fahrplan2.yaml

@@ -15,8 +15,10 @@ PkgConfigBR:
 - Qt5Quick
 - Qt5Qml
 - Qt5Core
+- sailfishapp
 Requires:
 - sailfishsilica-qt5 >= 0.10.9
+- qt5-qtdeclarative-import-positioning
 Files:
 - '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
 - '%{_datadir}/applications/%{name}.desktop'

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;

src/fahrplan_backend_manager.cpp

@@ -26,6 +26,14 @@ FahrplanBackendManager::FahrplanBackendManager(int defaultParser, QObject *paren
     currentParserIndex = defaultParser;
 }
 
+FahrplanBackendManager::~FahrplanBackendManager()
+{
+    if (m_parser) {
+        // Parser object will be autodeleted after the thread quits.
+        m_parser->quit();
+    }
+}
+
 QStringList FahrplanBackendManager::getParserList()
 {
     QStringList result;
@@ -68,7 +76,7 @@ void FahrplanBackendManager::setParser(int index)
         m_parser->quit();
     }
 
-    m_parser = new FahrplanParserThread();
+    m_parser = new FahrplanParserThread(this);
     m_parser->init(index);
 
     emit parserChanged(m_parser->name(), currentParserIndex);

src/fahrplan_backend_manager.h

@@ -28,6 +28,7 @@ class FahrplanBackendManager : public QObject
 
     public:
         explicit FahrplanBackendManager(int defaultParser, QObject *parent = 0);
+        virtual ~FahrplanBackendManager();
         QStringList getParserList();
         void setParser(int index);
         FahrplanParserThread *getParser();

src/fahrplan_parser_thread.cpp

@@ -76,6 +76,11 @@ void FahrplanParserThread::cancelRequest()
     emit requestCancelRequest();
 }
 
+void FahrplanParserThread::clearJourney()
+{
+    emit requestClearJourney();
+}
+
 QString FahrplanParserThread::name() {
     return m_name;
 }
@@ -182,6 +187,7 @@ void FahrplanParserThread::run()
     connect(this, SIGNAL(requestSearchJourney(Station,Station,Station,QDateTime,ParserAbstract::Mode,int)), m_parser, SLOT(searchJourney(Station,Station,Station,QDateTime,ParserAbstract::Mode,int)), Qt::QueuedConnection);
     connect(this, SIGNAL(requestSearchJourneyEarlier()), m_parser, SLOT(searchJourneyEarlier()), Qt::QueuedConnection);
     connect(this, SIGNAL(requestSearchJourneyLater()), m_parser, SLOT(searchJourneyLater()), Qt::QueuedConnection);
+    connect(this, SIGNAL(requestClearJourney()), m_parser, SLOT(clearJourney()), Qt::QueuedConnection);
 
     //Connect parser responses with threads corresponding results
     connect(m_parser, SIGNAL(errorOccured(QString)), this, SIGNAL(errorOccured(QString)), Qt::QueuedConnection);

src/fahrplan_parser_thread.h

@@ -56,6 +56,7 @@ class FahrplanParserThread : public QThread
     void requestSearchJourneyEarlier();
     void requestGetJourneyDetails(const QString &id);
     void requestCancelRequest();
+    void requestClearJourney();
 
     //Real ones
     void stationsResult(const StationsList &result);
@@ -75,6 +76,7 @@ public slots:
     void searchJourneyEarlier();
     void getJourneyDetails(const QString &id);
     void cancelRequest();
+    void clearJourney();
 
     bool supportsGps();
     bool supportsVia();
@@ -89,7 +91,7 @@ public slots:
   void run();
 
 private:
-  bool m_ready;
+  volatile bool m_ready;
   int  i_parser;
 
   QStringList m_trainrestrictions;

src/parser/parser_abstract.cpp

@@ -36,14 +36,14 @@
 #endif
 
 ParserAbstract::ParserAbstract(QObject *parent) :
-    QObject(parent)
+    QObject(parent), lastRequest(NULL)
 {
     NetworkManager = new QNetworkAccessManager(this);
     connect(NetworkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkReplyFinished(QNetworkReply*)));
 
     currentRequestState = FahrplanNS::noneRequest;
 
-    requestTimeout = new QTimer();
+    requestTimeout = new QTimer(this);
 
     connect(requestTimeout, SIGNAL(timeout()), this, SLOT(networkReplyTimedOut()));
 
@@ -52,10 +52,16 @@ ParserAbstract::ParserAbstract(QObject *parent) :
 
 ParserAbstract::~ParserAbstract()
 {
+    clearJourney();
     delete requestTimeout;
     delete NetworkManager;
 }
 
+void ParserAbstract::clearJourney()
+{
+
+}
+
 void ParserAbstract::networkReplyFinished(QNetworkReply *networkReply)
 {
     FahrplanNS::curReqStates internalRequestState = currentRequestState;

src/parser/parser_abstract.h

@@ -37,7 +37,7 @@ class ParserAbstract : public QObject
     enum Mode { Departure = 0, Arrival = 1 };
 
     explicit ParserAbstract(QObject *parent = 0);
-    ~ParserAbstract();
+    virtual ~ParserAbstract();
 
     static QString getName() { return "Abstract"; }
     virtual QString name() { return getName(); }
@@ -58,6 +58,7 @@ public slots:
     virtual bool supportsTimeTableDirection();
     virtual QStringList getTrainRestrictions();
     void cancelRequest();
+    virtual void clearJourney();
 
 signals:
     void stationsResult(const StationsList &result);

src/parser/parser_definitions.cpp

@@ -71,6 +71,16 @@ TimetableEntry::TimetableEntry()
 
 //------------- JourneyResultList
 
+JourneyResultList::JourneyResultList(QObject * parent) : QObject(parent)
+{
+
+}
+
+JourneyResultList::~JourneyResultList()
+{
+    qDeleteAll(m_items);
+}
+
 qreal JourneyResultList::itemcount()
 {
     return m_items.count();
@@ -127,6 +137,10 @@ void JourneyResultList::setTimeInfo(const QString &timeInfo)
 }
 
 //------------- JourneyResultItem
+JourneyResultItem::JourneyResultItem(QObject *parent) : QObject(parent)
+{
+
+}
 
 QString JourneyResultItem::id() const
 {
@@ -230,6 +244,16 @@ void JourneyResultItem::setInternalData2(const QString &internalData2)
 
 //------------- JourneyDetailResultList
 
+JourneyDetailResultList::JourneyDetailResultList(QObject * parent) : QObject(parent)
+{
+
+}
+
+JourneyDetailResultList::~JourneyDetailResultList()
+{
+    qDeleteAll(m_items);
+}
+
 QString JourneyDetailResultList::id() const
 {
     return m_id;
@@ -327,6 +351,11 @@ void JourneyDetailResultList::setDuration(const QString &duration)
 
 //------------- JourneyDetailResultItem
 
+JourneyDetailResultItem::JourneyDetailResultItem(QObject *parent) : QObject(parent)
+{
+
+}
+
 QString JourneyDetailResultItem::departureStation() const
 {
     return m_departureStation;

src/parser/parser_definitions.h

@@ -95,6 +95,7 @@ class JourneyResultItem : public QObject
     Q_PROPERTY(QString internalData2 READ internalData2 WRITE setInternalData2)
 
     public:
+        explicit JourneyResultItem(QObject * parent = 0);
         QString id() const;
         void setId(const QString &);
         QDate date() const;
@@ -140,6 +141,8 @@ class JourneyResultList : public QObject
     public slots:
         JourneyResultItem *getItem(int);
     public:
+        explicit JourneyResultList(QObject * parent = 0);
+        virtual ~JourneyResultList();
         void appendItem(JourneyResultItem *item);
         qreal itemcount();
         QString departureStation() const;
@@ -176,6 +179,7 @@ class JourneyDetailResultItem : public QObject
     Q_PROPERTY(QString internalData1 READ internalData1 WRITE setInternalData1)
     Q_PROPERTY(QString internalData2 READ internalData2 WRITE setInternalData2)
     public:
+        explicit JourneyDetailResultItem(QObject * parent = 0);
         QString departureStation() const;
         void setDepartureStation(const QString &);
         QString departureInfo() const;
@@ -228,6 +232,8 @@ class JourneyDetailResultList : public QObject
     public slots:
         JourneyDetailResultItem *getItem(int);
     public:
+        explicit JourneyDetailResultList(QObject * parent = 0);
+        virtual ~JourneyDetailResultList();
         void appendItem(JourneyDetailResultItem *item);
         qreal itemcount();
         QString id() const;