code cleanup

[fapman] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 44215ce..a2f6c5c 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -18,8 +18,11 @@
 */
 
 #ifdef MYDEF_GTK_EXISTS
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+extern "C"
+{
+       #include <gdk/gdk.h>
+       #include <gtk/gtk.h>
+}
 #endif
 
 #include <QtCore>
@@ -33,7 +36,10 @@
 #include <QtMaemo5>
 #endif
 
-#include <sys/vfs.h>
+extern "C"
+{
+       #include <sys/vfs.h>
+}
 
 #include "mainwindow.h"
 #include "version.h"
@@ -160,13 +166,14 @@ MainWindow::~MainWindow()
        // save "need repo refresh" status
        iSettings->qsettings()->setValue("need_repo_refresh", iAptInterface->needRepoRefresh());
 
-       delete iWinPackageView;
-       delete iWinRepoView;
-       delete iAptInterface;
-       delete iDpkgInterface;
-       delete iDimmer;
-       delete iSettings;
-    delete ui;
+       delete iWinPackageView; iWinPackageView=0;
+       delete iWinRepoView; iWinRepoView=0;
+       delete iAptInterface; iAptInterface=0;
+       delete iDpkgInterface; iDpkgInterface=0;
+       delete iDimmer; iDimmer=0;
+       delete iSettings; iSettings=0;
+       delete ui; ui=0;
+       //iMediaObject and aout automatically deleted by their parent
 }
 
 void MainWindow::changeEvent(QEvent *e)