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

Torsten Rahn tackat at kde.org
Sat Jul 25 23:28:05 CEST 2009


SVN commit 1002401 by rahn:

- Fixes some few delete vs. delete[] leaks
- Adds some forgotten virtual destructors for abstract classes.

See: r1002398



 M  +2 -2      lib/MarbleDirs.cpp  
 M  +1 -1      lib/MeasureTool.cpp  
 M  +1 -1      lib/runners/MarbleAbstractRunner.h  
 M  +1 -1      plugins/positionprovider/geoclue/GeoCute/Provider.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleDirs.cpp #1002400:1002401
@@ -220,7 +220,7 @@
     
     SHGetSpecialFolderPathW( hwnd, appdata_path, CSIDL_APPDATA, 0 );
     QString appdata = QString::fromUtf16( reinterpret_cast<ushort*>( appdata_path ) );
-    delete appdata_path;
+    delete[] appdata_path;
     return QString( QDir::fromNativeSeparators( appdata ) + "/.marble/data" ); // local path
 #endif
 }
@@ -235,7 +235,7 @@
     
     SHGetSpecialFolderPathW( hwnd, appdata_path, CSIDL_APPDATA, 0 );
     QString appdata = QString::fromUtf16( reinterpret_cast<ushort*>( appdata_path ) );
-    delete appdata_path;
+    delete[] appdata_path;
     return QString( QDir::fromNativeSeparators( appdata ) + "/.marble/plugins" ); // local path
 #endif
 }
--- trunk/KDE/kdeedu/marble/src/lib/MeasureTool.cpp #1002400:1002401
@@ -104,7 +104,7 @@
             }
         }
 
-        delete x;
+        delete[] x;
     }
 }
 
--- trunk/KDE/kdeedu/marble/src/lib/runners/MarbleAbstractRunner.h #1002400:1002401
@@ -49,7 +49,7 @@
     /**
      * Destructor.
      */
-    ~MarbleAbstractRunner();
+    virtual ~MarbleAbstractRunner();
     /**
      * This function gives the  icon for this runner
      * @return the icon of the runner
--- trunk/KDE/kdeedu/marble/src/plugins/positionprovider/geoclue/GeoCute/Provider.h #1002400:1002401
@@ -16,7 +16,7 @@
     public:
         Provider(const QString& service, const QString& path,
             QObject* parent = 0);
-        ~Provider();
+        virtual ~Provider();
         Status status() const;
 
     signals:


More information about the Marble-commits mailing list