code cleanup

[fapman] / aaptinterface.cpp

diff --git a/aaptinterface.cpp b/aaptinterface.cpp
index 8011035..c53088f 100644 (file)
--- a/aaptinterface.cpp
+++ b/aaptinterface.cpp
@@ -106,7 +106,32 @@ AAptInterface::~AAptInterface()
        if( iProcAptGetClean->state() != QProcess::NotRunning )
                iProcAptGetClean->kill();
 
-       delete iDataReadBuffer;
+       // qprocesses are automatically deleted by their parent
+
+       QHashIterator<QString, Package*> a( iPackagesAvailable );
+       while (a.hasNext())
+       {
+               a.next();
+               delete a.value();
+       }
+       iPackagesAvailable.clear();
+
+       QHashIterator<QString, Package*> i( iPackagesInstalled );
+       while (i.hasNext())
+       {
+               i.next();
+               delete i.value();
+       }
+       iPackagesInstalled.clear();
+
+       for(int x=0; x<iRepositories.count(); x++) {
+               if( iRepositories.at(x) )
+                       delete iRepositories.at(x);
+       }
+       iRepositories.clear();
+
+       delete[] iDataReadBuffer;
+       iDataReadBuffer=0;
 }
 
 void AAptInterface::addQueuedOperation(interfaceMode mode_)
@@ -218,7 +243,7 @@ void AAptInterface::cleanAfterError()
        iProcessPackageVersions.clear();
 }
 
-bool AAptInterface::running()
+bool AAptInterface::running() const
 {
        if( iMode == ModeNone )
                return false;
@@ -976,6 +1001,7 @@ void AAptInterface::readRepositoryInfo()
                                        //qDebug() << r->toListFileNames();
                                } else {
                                        delete r;
+                                       r=0;
                                }
                        }
                }
@@ -1013,6 +1039,7 @@ void AAptInterface::readRepositoryInfo()
                                iRepositories.append(r);
                        } else {
                                delete r;
+                               r=0;
                        }
                }
                ham.close();
@@ -1647,7 +1674,7 @@ void AAptInterface::startFetchDates()
                i.next();
                if( !i.value()->date().isValid() && i.value()->section().startsWith("user/") && !i.value()->isBlacklisted() )
                {
-                       Repository* repo = 0;
+                       const Repository* repo = 0;
                        for( int x=0; x<i.value()->repositories().count(); x++ ) {
                                if( i.value()->repositories().at(x) && i.value()->repositories().at(x)->url().startsWith("http://repository.maemo.org") )
                                {
@@ -1684,13 +1711,13 @@ void AAptInterface::startFetchDates()
                if( !fe.value()->date().isValid() && fe.value()->section().startsWith("user/") && !fe.value()->isBlacklisted() )
                {
                        QString url;
-                       Repository* repo = 0;
+                       const Repository* repo = 0;
                        QString fullFilename = "unknown_filename";
                        for( int x=0; x<fe.value()->repositories().count(); x++ ) {
                                if( fe.value()->repositories().at(x) && fe.value()->repositories().at(x)->url().startsWith("http://repository.maemo.org") )
                                {
                                        repo = fe.value()->repositories().at(x);
-                                       if( fe.value()->fullFileNames().count()>x )
+                                       if( repo && fe.value()->fullFileNames().count()>x )
                                                fullFilename = fe.value()->fullFileNames().at(x);
                                        break;
                                }
@@ -1742,6 +1769,7 @@ void AAptInterface::startFetchDates()
                updProgress++;
        }
        delete nam;
+       nam=0;
 
        if( iDateRequestsReceived>0 && iNetworkError != QNetworkReply::NoError &&
                iNetworkError != QNetworkReply::QNetworkReply::ContentAccessDenied && iNetworkError != QNetworkReply::QNetworkReply::ContentNotFoundError )