[Marble-commits] branches/KDE/4.3/kdeedu/marble/src

[Torsten Rahn]

SVN commit 998773 by rahn:

- Adjust version number to 0.8

Backporting mjansen's memleak fixes:
- r998749
- r998751



 M  +5 -0      lib/geodata/data/GeoDataLineString_p.h  
 M  +1 -1      lib/global.h  
 M  +3 -1      plugins/network/qnam/QNamDownloadJob.cpp  


--- branches/KDE/4.3/kdeedu/marble/src/lib/geodata/data/GeoDataLineString_p.h #998772:998773
@@ -32,6 +32,11 @@
     {
     }
 
+    ~GeoDataLineStringPrivate()
+    {
+        qDeleteAll(m_rangeCorrected);
+    }
+    
     virtual GeoDataGeometryPrivate* copy()
     { 
         GeoDataLineStringPrivate* copy = new GeoDataLineStringPrivate;
--- branches/KDE/4.3/kdeedu/marble/src/lib/global.h #998772:998773
@@ -175,7 +175,7 @@
 // Version definitions to use with an external application (as digiKam)
 
 // String for about dialog.
-const QString MARBLE_VERSION_STRING = QString::fromLatin1( "0.8 RC1" );
+const QString MARBLE_VERSION_STRING = QString::fromLatin1( "0.8" );
 
 // API Version id:
 // form : 0xMMmmpp
--- branches/KDE/4.3/kdeedu/marble/src/plugins/network/qnam/QNamDownloadJob.cpp #998772:998773
@@ -78,7 +78,9 @@
     }
 
     m_networkReply->disconnect( this );
-    delete m_networkReply;
+
+    // No delete. This method is called by a signal QNetworkReply::finished.
+    m_networkReply->deleteLater();
     m_networkReply = 0;
 }