┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Faure <[email protected]>2007-01-10 17:31:00 +0000
committerDavid Faure <[email protected]>2007-01-10 17:31:00 +0000
commitb8572433e25a9118b38ac1271a8c435cf0930bc0 (patch)
tree274be5de6c59b5647f5732eb39d05c3e6960b2bf /src
parentd8ab89171dacd45051060a622aade64e51743cad (diff)
Doesn't need a config.h
Reduce kapplication.h usage to the minimum svn path=/trunk/playground/utils/dolphin/; revision=622088
Diffstat (limited to 'src')
-rw-r--r--src/dolphinmainwindow.h12
-rw-r--r--src/dolphinsettings.cpp2
-rw-r--r--src/main.cpp1
-rw-r--r--src/progressindicator.cpp3
4 files changed, 4 insertions, 14 deletions
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index fcfab60f0..c2beb202f 100644
--- 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 c3dc5fbee..ed8259d74 100644
--- 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 d48ef548e..f5a51ee30 100644
--- 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 1126b823d..6805788eb 100644
--- 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();
}
}