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/parser/parser_definitions.cpp

@@ -127,6 +127,10 @@ void JourneyResultList::setTimeInfo(const QString &timeInfo)
 }
 
 //------------- JourneyResultItem
+JourneyResultItem::JourneyResultItem(QObject *parent) : QObject(parent)
+{
+
+}
 
 QString JourneyResultItem::id() const
 {
@@ -327,6 +331,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;
@@ -176,6 +177,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;

src/parser/parser_efa.cpp

@@ -542,7 +542,7 @@ void ParserEFA::parseSearchJourney(QNetworkReply *networkReply)
                 info = tr("Guaranteed connection");
             }
             motNameList.append(motName);
-            JourneyDetailResultItem *jdrItem = new JourneyDetailResultItem();
+            JourneyDetailResultItem *jdrItem = new JourneyDetailResultItem(detailsList);
             jdrItem->setTrain(motName);
             jdrItem->setInfo(info);
             jdrItem->setDirection(motElement.attribute("destination"));
@@ -580,7 +580,7 @@ void ParserEFA::parseSearchJourney(QNetworkReply *networkReply)
         detailsList->setDepartureDateTime(departureDateTime);
         cachedJourneyDetailsEfa[id] = detailsList;
 
-        JourneyResultItem *item = new JourneyResultItem();
+        JourneyResultItem *item = new JourneyResultItem(lastJourneyResultList);
         item->setDate(departureDateTime.date());
         item->setId(id);
         item->setTransfers(changes);

src/parser/parser_hafasbinary.cpp

@@ -328,7 +328,7 @@ void ParserHafasBinary::parseSearchJourney(QNetworkReply *networkReply)
 
             for (int iPart = 0; iPart < numParts; iPart++) {
 
-                JourneyDetailResultItem *inlineItem = new JourneyDetailResultItem();
+                JourneyDetailResultItem *inlineItem = new JourneyDetailResultItem(inlineResults);
 
                 hafasData.device()->seek(0x4a + partsOffset + iPart * 20);
 
@@ -571,7 +571,7 @@ void ParserHafasBinary::parseSearchJourney(QNetworkReply *networkReply)
 
                 lineNames.removeDuplicates();
 
-                JourneyResultItem *item = new JourneyResultItem();
+                JourneyResultItem *item = new JourneyResultItem(lastJourneyResultList);
                 item->setDate(journeyDate);
                 item->setId(connectionId);
                 item->setTransfers(QString::number(numChanges));

src/parser/parser_hafasxml.cpp

@@ -656,7 +656,7 @@ void ParserHafasXml::parseSearchJourney(QNetworkReply *networkReply)
 
     const QDomNodeList connections = doc.elementsByTagName("Connection");
     for (int i = 0; i < connections.count(); ++i) {
-        JourneyResultItem *item = new JourneyResultItem();
+        JourneyResultItem *item = new JourneyResultItem(lastJourneyResultList);
         item->setId(connections.at(i).toElement().attribute("id").trimmed());
 
         QDomElement overview = connections.at(i).firstChildElement("Overview");
@@ -846,7 +846,7 @@ JourneyDetailResultList* ParserHafasXml::internalParseJourneyDetails(const QDomE
 
     const QDomNodeList sections = connection.elementsByTagName("ConSection");
     for (int i = 0; i < sections.count(); ++i) {
-        JourneyDetailResultItem *item = new JourneyDetailResultItem();
+        JourneyDetailResultItem *item = new JourneyDetailResultItem(results);
 
         const QDomNode section = sections.at(i);
         QDomElement stop;

src/parser/parser_xmlvasttrafikse.cpp

@@ -329,7 +329,7 @@ void ParserXmlVasttrafikSe::parseSearchJourney(QNetworkReply *networkReply)
     if (doc.setContent(xmlRawtext, false)) {
         QDomNodeList tripNodeList = doc.elementsByTagName("Trip");
         for (unsigned int i = 0; i < tripNodeList.length(); ++i) {
-            JourneyResultItem *jritem = new JourneyResultItem();
+            JourneyResultItem *jritem = new JourneyResultItem(journeyResultList);
             JourneyDetailResultList *detailsList = new JourneyDetailResultList();
 
             /// Set default values for journey's start and end time
@@ -367,7 +367,7 @@ void ParserXmlVasttrafikSe::parseSearchJourney(QNetworkReply *networkReply)
                     trainTypes.append(i18nConnectionType(getAttribute(legNode, "name")));
                 }
 
-                JourneyDetailResultItem *jdrItem = new JourneyDetailResultItem();
+                JourneyDetailResultItem *jdrItem = new JourneyDetailResultItem(detailsList);
                 jdrItem->setDepartureStation(getAttribute(originNode, "name"));
                 const QString depTrack = getAttribute(originNode, "track");
                 jdrItem->setDepartureInfo(depTrack.isEmpty() ? QChar(0x2014) : tr("Track %1").arg(depTrack));