Doesn't need a config.h

Reduce kapplication.h usage to the minimum

svn path=/trunk/playground/utils/dolphin/; revision=622088

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index fcfab60f04a1111daeab333292591192044943fd..c2beb202f56fca9553d9a0501aad92ef41cafcc9 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -22,23 +22,13 @@
 #ifndef _DOLPHIN_MAINWINDOW_H_
 #define _DOLPHIN_MAINWINDOW_H_
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <kapplication.h>
 #include <kmainwindow.h>
 #include <ksortablelist.h>
-#include <kvbox.h>
 
 #include <q3valuelist.h>
-#include <q3ptrlist.h>
-
-#include <QCloseEvent>
-#include <QString>
 
 #include "dolphinview.h"
-#include "undomanager.h"
+#include "undomanager.h" // for DolphinCommand::Type
 
 class KPrinter;
 class KUrl;

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index c3dc5fbeebd34f19979639f3d9ee0a4ac854b78f..ed8259d741c963355c7f536ac69cfb4cd14a20e5 100644 (file)
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -23,10 +23,10 @@
 #include <assert.h>
 #include <qdir.h>
 
-#include <kapplication.h>
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <kicontheme.h>
+#include <kinstance.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 

diff --git a/src/main.cpp b/src/main.cpp
index d48ef548e7eb7311e18e5139e00fe73d77dabb48..f5a51ee30bf5f924be21372cb6adec820a94e511 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,6 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
-#include <kapplication.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>

diff --git a/src/progressindicator.cpp b/src/progressindicator.cpp
index 1126b823da0bc6525430d97a371a9293cb80e568..6805788ebef907e3af3aed90638a128269778bff 100644 (file)
--- a/src/progressindicator.cpp
+++ b/src/progressindicator.cpp
@@ -21,6 +21,7 @@
 #include "progressindicator.h"
 #include "dolphinmainwindow.h"
 #include "dolphinstatusbar.h"
+#include <QApplication>
 
 ProgressIndicator::ProgressIndicator(DolphinMainWindow* mainWindow,
                                      const QString& progressText,
@@ -74,7 +75,7 @@ void ProgressIndicator::execOperation()
             DolphinStatusBar* statusBar = m_mainWindow->activeView()->statusBar();
             statusBar->setProgress((m_operationsIndex * 100) / m_operationsCount);
 #warning "EVIL, DANGER, FIRE"
-            kapp->processEvents();
+            qApp->processEvents();
             statusBar->repaint();
         }
     }