From 8eb9b508ca87fb1d634d8b8ba62c054ed04466d2 Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Fri, 4 Feb 2011 15:43:21 +0100
Subject: [PATCH] Use capitalized KDE includes

---
 src/dolphinapplication.cpp                    |  4 +-
 src/dolphincontextmenu.cpp                    | 36 ++++++------
 src/dolphincontextmenu.h                      | 11 ++--
 src/dolphinmainwindow.cpp                     | 56 +++++++++----------
 src/dolphinmainwindow.h                       |  4 +-
 src/dolphinnewfilemenu.cpp                    |  4 +-
 src/dolphinpart.cpp                           | 26 ++++-----
 src/dolphinviewcontainer.cpp                  | 30 +++++-----
 src/dolphinviewcontainer.h                    | 10 ++--
 src/filterbar/filterbar.cpp                   |  8 +--
 src/main.cpp                                  |  6 +-
 src/panels/filter/filterpanel.cpp             | 13 ++---
 src/panels/filter/filterpanel.h               |  2 +-
 src/panels/folders/folderspanel.cpp           |  6 +-
 src/panels/folders/folderspanel.h             |  2 +-
 src/panels/folders/paneltreeview.cpp          |  2 +-
 src/panels/folders/paneltreeview.h            |  2 +-
 src/panels/folders/treeviewcontextmenu.cpp    | 14 ++---
 src/panels/folders/treeviewcontextmenu.h      |  2 +-
 .../filemetadataconfigurationdialog.cpp       |  2 +-
 .../filemetadataconfigurationdialog.h         |  4 +-
 src/panels/information/informationpanel.cpp   |  2 +-
 .../information/informationpanelcontent.cpp   | 20 +++----
 .../information/informationpanelcontent.h     |  8 +--
 src/panels/information/phononwidget.cpp       | 18 +++---
 src/panels/information/phononwidget.h         |  6 +-
 src/panels/information/pixmapviewer.cpp       |  2 +-
 src/panels/panel.cpp                          |  2 +-
 src/panels/panel.h                            |  6 +-
 src/panels/places/placespanel.cpp             |  2 +-
 src/panels/terminal/terminalpanel.cpp         |  8 +--
 src/search/dolphinsearchbox.cpp               | 24 ++++----
 src/search/dolphinsearchbox.h                 |  2 +-
 src/search/filenamesearchprotocol.cpp         | 12 ++--
 src/settings/additionalinfodialog.cpp         |  2 +-
 src/settings/additionalinfodialog.h           |  4 +-
 src/settings/applyviewpropsjob.h              |  6 +-
 src/settings/dolphinsettings.cpp              |  8 +--
 src/settings/dolphinsettingsdialog.cpp        |  6 +-
 src/settings/general/behaviorsettingspage.cpp |  4 +-
 src/settings/general/behaviorsettingspage.h   |  2 +-
 .../general/contextmenusettingspage.cpp       |  6 +-
 src/settings/general/generalsettingspage.cpp  |  8 +--
 src/settings/general/previewssettingspage.cpp | 10 ++--
 .../general/statusbarsettingspage.cpp         |  6 +-
 src/settings/kcm/kcmdolphingeneral.cpp        |  6 +-
 src/settings/kcm/kcmdolphinnavigation.cpp     | 10 ++--
 src/settings/kcm/kcmdolphinservices.cpp       | 10 ++--
 src/settings/kcm/kcmdolphinviewmodes.cpp      | 10 ++--
 .../navigation/navigationsettingspage.cpp     |  8 +--
 .../services/servicessettingspage.cpp         | 16 +++---
 src/settings/settingspagebase.h               |  2 +-
 src/settings/startup/startupsettingspage.cpp  | 10 ++--
 src/settings/startup/startupsettingspage.h    |  2 +-
 src/settings/trash/trashsettingspage.cpp      |  4 +-
 .../viewmodes/columnviewsettingspage.cpp      |  6 +-
 .../viewmodes/detailsviewsettingspage.cpp     |  4 +-
 .../viewmodes/dolphinfontrequester.cpp        |  6 +-
 src/settings/viewmodes/iconsizegroupbox.cpp   |  2 +-
 .../viewmodes/iconsviewsettingspage.cpp       |  8 +--
 src/settings/viewmodes/viewsettingspage.cpp   |  6 +-
 src/settings/viewmodes/viewsettingspagebase.h |  2 +-
 src/settings/viewpropertiesdialog.cpp         | 14 ++---
 src/settings/viewpropertiesdialog.h           |  2 +-
 src/settings/viewpropsprogressinfo.cpp        | 10 ++--
 src/settings/viewpropsprogressinfo.h          |  4 +-
 src/statusbar/dolphinstatusbar.cpp            | 10 ++--
 src/statusbar/statusbarspaceinfo.cpp          |  4 +-
 src/statusbar/statusbarspaceinfo.h            |  2 +-
 src/tests/dolphintreeviewtest.cpp             |  6 +-
 src/tests/dolphinviewtest_allviewmodes.cpp    |  2 +-
 src/tests/testbase.cpp                        |  6 +-
 src/tests/testbase.h                          |  2 +-
 src/views/additionalinfoaccessor.cpp          |  4 +-
 src/views/additionalinfoaccessor.h            |  2 +-
 src/views/dolphincategorydrawer.cpp           | 12 ++--
 src/views/dolphincolumnview.cpp               | 16 +++---
 src/views/dolphincolumnview.h                 |  2 +-
 src/views/dolphincolumnviewcontainer.h        |  2 +-
 src/views/dolphindetailsview.cpp              |  8 +--
 src/views/dolphindetailsviewexpander.cpp      |  4 +-
 src/views/dolphindirlister.cpp                |  2 +-
 src/views/dolphindirlister.h                  |  2 +-
 src/views/dolphinfileitemdelegate.cpp         | 10 ++--
 src/views/dolphinfileitemdelegate.h           |  2 +-
 src/views/dolphiniconsview.cpp                |  6 +-
 src/views/dolphiniconsview.h                  |  6 +-
 src/views/dolphinmodel.cpp                    | 21 ++++---
 src/views/dolphinmodel.h                      |  2 +-
 src/views/dolphinnewfilemenuobserver.cpp      |  2 +-
 src/views/dolphinremoteencoding.cpp           | 30 +++++-----
 src/views/dolphinremoteencoding.h             |  4 +-
 src/views/dolphinview.cpp                     | 30 +++++-----
 src/views/dolphinview.h                       |  6 +-
 src/views/dolphinviewactionhandler.cpp        | 19 +++----
 src/views/dolphinviewactionhandler.h          |  6 +-
 src/views/dolphinviewcontroller.cpp           |  4 +-
 src/views/dolphinviewcontroller.h             |  4 +-
 src/views/draganddrophelper.cpp               |  8 +--
 src/views/folderexpander.cpp                  | 16 +++---
 src/views/renamedialog.cpp                    |  6 +-
 src/views/renamedialog.h                      |  4 +-
 src/views/selectionmanager.cpp                |  6 +-
 src/views/selectionmanager.h                  |  2 +-
 src/views/selectiontoggle.cpp                 | 12 ++--
 src/views/selectiontoggle.h                   |  2 +-
 .../pendingthreadsmaintainer.cpp              |  2 +-
 .../versioncontrol/versioncontrolobserver.cpp |  8 +--
 .../versioncontrol/versioncontrolobserver.h   |  2 +-
 src/views/viewextensionsfactory.cpp           |  6 +-
 src/views/viewmodecontroller.h                |  2 +-
 src/views/viewproperties.cpp                  |  8 +--
 src/views/viewproperties.h                    |  2 +-
 src/views/zoomlevelinfo.cpp                   |  2 +-
 114 files changed, 441 insertions(+), 445 deletions(-)

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 8b6139d92..13a2b60d8 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -23,8 +23,8 @@
 #include "dolphinviewcontainer.h"
 
 #include <applicationadaptor.h>
-#include <kcmdlineargs.h>
-#include <kurl.h>
+#include <KCmdLineArgs>
+#include <KUrl>
 #include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 7b8f1db30..dacdc9c83 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -26,28 +26,28 @@
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
-#include <kactioncollection.h>
-#include <kdesktopfile.h>
+#include <KActionCollection>
+#include <KDesktopFile>
 #include <kfileitemactionplugin.h>
-#include <kfileitemactions.h>
-#include <kfileitemlistproperties.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kmimetypetrader.h>
-#include <kmodifierkeyinfo.h>
+#include <KFileItemActions>
+#include <KFileItemListProperties>
+#include <KFilePlacesModel>
+#include <KGlobal>
+#include <KIconLoader>
+#include <KIO/NetAccess>
+#include <KMenu>
+#include <KMenuBar>
+#include <KMessageBox>
+#include <KMimeTypeTrader>
+#include <KModifierKeyInfo>
 #include <knewfilemenu.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
-#include <kservice.h>
-#include <klocale.h>
-#include <kpropertiesdialog.h>
-#include <kstandardaction.h>
-#include <kstandarddirs.h>
+#include <KService>
+#include <KLocale>
+#include <KPropertiesDialog>
+#include <KStandardAction>
+#include <KStandardDirs>
 
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>
diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index f0eee235f..3b1a2d9a1 100644
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -20,15 +20,14 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
-#include <kdesktopfileactions.h>
-#include <kfileitem.h>
-#include <kservice.h>
-#include <kurl.h>
+#include <KFileItem>
+#include <KService>
+#include <KUrl>
 #include <konq_copytomenu.h>
 
-#include <QtCore/QObject>
+#include <QObject>
 
-#include <QtCore/QVector>
+#include <QVector>
 
 #include <QScopedPointer>
 
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 1c4a45bda..f961008e1 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -31,7 +31,7 @@
 #include "mainwindowadaptor.h"
 #ifdef HAVE_NEPOMUK
     #include "panels/filter/filterpanel.h"
-    #include <nepomuk/resourcemanager.h>
+    #include <Nepomuk/ResourceManager>
 #endif
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
@@ -52,40 +52,40 @@
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kactionmenu.h>
-#include <kconfig.h>
-#include <kdesktopfile.h>
+#include <KAction>
+#include <KActionCollection>
+#include <KActionMenu>
+#include <KConfig>
+#include <KDesktopFile>
 #include <kdeversion.h>
 #include <kdualaction.h>
-#include <kfiledialog.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
-#include <klineedit.h>
+#include <KFileDialog>
+#include <KFilePlacesModel>
+#include <KGlobal>
+#include <KLineEdit>
 #include <ktoolbar.h>
-#include <kicon.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <KIcon>
+#include <KIconLoader>
+#include <KIO/NetAccess>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kprotocolmanager.h>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kfileitemlistproperties.h>
+#include <KLocale>
+#include <KProtocolManager>
+#include <KMenu>
+#include <KMenuBar>
+#include <KMessageBox>
+#include <KFileItemListProperties>
 #include <konqmimedata.h>
-#include <kprotocolinfo.h>
-#include <krun.h>
-#include <kshell.h>
-#include <kstandarddirs.h>
+#include <KProtocolInfo>
+#include <KRun>
+#include <KShell>
+#include <KStandardDirs>
 #include <kstatusbar.h>
-#include <kstandardaction.h>
+#include <KStandardAction>
 #include <ktabbar.h>
-#include <ktoggleaction.h>
-#include <kurlnavigator.h>
-#include <kurl.h>
-#include <kurlcombobox.h>
+#include <KToggleAction>
+#include <KUrlNavigator>
+#include <KUrl>
+#include <KUrlComboBox>
 #include <ktoolinvocation.h>
 
 #include <QDBusMessage>
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 53d223176..840997598 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -26,11 +26,11 @@
 
 #include <config-nepomuk.h>
 
-#include <kfileitemdelegate.h>
+#include <KFileItemDelegate>
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
-#include <kactionmenu.h>
+#include <KActionMenu>
 
 #include "views/dolphinview.h"
 
diff --git a/src/dolphinnewfilemenu.cpp b/src/dolphinnewfilemenu.cpp
index c7ffb788e..7dfd36889 100644
--- a/src/dolphinnewfilemenu.cpp
+++ b/src/dolphinnewfilemenu.cpp
@@ -26,8 +26,8 @@
 #include "views/dolphinnewfilemenuobserver.h"
 #include "views/dolphinview.h"
 
-#include <kactioncollection.h>
-#include <kio/job.h>
+#include <KActionCollection>
+#include <KIO/Job>
 
 DolphinNewFileMenu::DolphinNewFileMenu(QWidget* parent, DolphinMainWindow* mainWin) :
     KNewFileMenu(mainWin->actionCollection(), "create_new", parent),
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index a039beb1f..99784de1a 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -19,26 +19,26 @@
 
 #include "dolphinpart.h"
 
-#include <kfileitemlistproperties.h>
+#include <KFileItemListProperties>
 #include <konq_operations.h>
 
 #include <kaboutdata.h>
-#include <kactioncollection.h>
-#include <kconfiggroup.h>
-#include <kdebug.h>
-#include <kglobalsettings.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpluginfactory.h>
-#include <ktoggleaction.h>
-#include <kio/netaccess.h>
+#include <KActionCollection>
+#include <KConfigGroup>
+#include <KDebug>
+#include <KGlobalSettings>
+#include <KIconLoader>
+#include <KLocale>
+#include <KMessageBox>
+#include <KPluginFactory>
+#include <KToggleAction>
+#include <KIO/NetAccess>
 #include <ktoolinvocation.h>
 #include <kauthorized.h>
 #include <knewfilemenu.h>
-#include <kmenu.h>
+#include <KMenu>
 #include <kinputdialog.h>
-#include <kprotocolinfo.h>
+#include <KProtocolInfo>
 
 #include "settings/dolphinsettings.h"
 #include "views/dolphinview.h"
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 282230ab9..86aefe959 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
-#include <kprotocolmanager.h>
+#include <KProtocolManager>
 
 #include <QtGui/QApplication>
 #include <QtGui/QKeyEvent>
@@ -27,23 +27,23 @@
 #include <QtCore/QTimer>
 #include <QtGui/QScrollBar>
 
-#include <kdesktopfile.h>
-#include <kfileitemdelegate.h>
-#include <kfileplacesmodel.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kiconeffect.h>
-#include <kio/netaccess.h>
-#include <kio/previewjob.h>
-#include <kmenu.h>
+#include <KDesktopFile>
+#include <KFileItemDelegate>
+#include <KFilePlacesModel>
+#include <KGlobalSettings>
+#include <KLocale>
+#include <KIconEffect>
+#include <KIO/NetAccess>
+#include <KIO/PreviewJob>
+#include <KMenu>
 #include <knewmenu.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
-#include <kshell.h>
-#include <kurl.h>
-#include <kurlcombobox.h>
-#include <kurlnavigator.h>
-#include <krun.h>
+#include <KShell>
+#include <KUrl>
+#include <KUrlComboBox>
+#include <KUrlNavigator>
+#include <KRun>
 
 #include "dolphin_generalsettings.h"
 #include "dolphinmainwindow.h"
diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index db05316a5..5f9102c83 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,12 +20,12 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include <kfileitem.h>
-#include <kfileitemdelegate.h>
-#include <kglobalsettings.h>
-#include <kio/job.h>
+#include <KFileItem>
+#include <KFileItemDelegate>
+#include <KGlobalSettings>
+#include <KIO/Job>
 
-#include <kurlnavigator.h>
+#include <KUrlNavigator>
 
 #include <QElapsedTimer>
 #include <QWidget>
diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 648469df7..3f4b7c219 100644
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -24,10 +24,10 @@
 #include <QLabel>
 #include <QToolButton>
 
-#include <kicon.h>
-#include <klocale.h>
-#include <klineedit.h>
-#include <kiconloader.h>
+#include <KIcon>
+#include <KLocale>
+#include <KLineEdit>
+#include <KIconLoader>
 
 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)
diff --git a/src/main.cpp b/src/main.cpp
index 71c59cdac..2cc9ff5d9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,10 +23,10 @@
 #include "dolphinmainwindow.h"
 
 #include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <KCmdLineArgs>
+#include <KLocale>
 #include <kmainwindow.h>
-#include <kdebug.h>
+#include <KDebug>
 
 extern "C"
 KDE_EXPORT int kdemain(int argc, char **argv)
diff --git a/src/panels/filter/filterpanel.cpp b/src/panels/filter/filterpanel.cpp
index 1ee9ccba4..5f27e73eb 100644
--- a/src/panels/filter/filterpanel.cpp
+++ b/src/panels/filter/filterpanel.cpp
@@ -21,10 +21,9 @@
 
 #include "dolphin_searchsettings.h"
 
-#include <nepomuk/filequery.h>
-#include <nepomuk/facetwidget.h>
-#include <nepomuk/facet.h>
-#include <nepomuk/resourcemanager.h>
+#include <Nepomuk/ResourceManager>
+#include <Nepomuk/Utils/FacetWidget>
+#include <Nepomuk/Utils/Facet>
 #include <Nepomuk/Utils/SimpleFacet>
 #include <Nepomuk/Utils/ProxyFacet>
 #include <Nepomuk/Utils/DynamicResourceFacet>
@@ -38,10 +37,10 @@
 
 #include <search/dolphinsearchinformation.h>
 
-#include <kfileitem.h>
+#include <KFileItem>
 #include <kio/jobclasses.h>
-#include <kio/job.h>
-#include <kmenu.h>
+#include <KIO/Job>
+#include <KMenu>
 
 #include <QPushButton>
 #include <QShowEvent>
diff --git a/src/panels/filter/filterpanel.h b/src/panels/filter/filterpanel.h
index 8ccc62d63..33c18c0b3 100644
--- a/src/panels/filter/filterpanel.h
+++ b/src/panels/filter/filterpanel.h
@@ -20,7 +20,7 @@
 #ifndef FILTERPANEL_H
 #define FILTERPANEL_H
 
-#include <nepomuk/query.h>
+#include <Nepomuk/Query/Query>
 #include <panels/panel.h>
 
 class KJob;
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 43d7b6412..4e4efed44 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -25,9 +25,9 @@
 #include "paneltreeview.h"
 #include "treeviewcontextmenu.h"
 
-#include <kfileplacesmodel.h>
-#include <kdirlister.h>
-#include <kfileitem.h>
+#include <KFilePlacesModel>
+#include <KDirLister>
+#include <KFileItem>
 #include <konq_operations.h>
 
 #include <QApplication>
diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h
index 43ae7bdd9..6a90d3cd6 100644
--- a/src/panels/folders/folderspanel.h
+++ b/src/panels/folders/folderspanel.h
@@ -20,7 +20,7 @@
 #ifndef FOLDERSPANEL_H
 #define FOLDERSPANEL_H
 
-#include <kurl.h>
+#include <KUrl>
 #include <panels/panel.h>
 
 class KDirLister;
diff --git a/src/panels/folders/paneltreeview.cpp b/src/panels/folders/paneltreeview.cpp
index 70cfdeb1d..514cee423 100644
--- a/src/panels/folders/paneltreeview.cpp
+++ b/src/panels/folders/paneltreeview.cpp
@@ -19,7 +19,7 @@
 
 #include "paneltreeview.h"
 
-#include <kfileitemdelegate.h>
+#include <KFileItemDelegate>
 #include <QListView>
 #include <QKeyEvent>
 #include <QPainter>
diff --git a/src/panels/folders/paneltreeview.h b/src/panels/folders/paneltreeview.h
index 0f0996875..fff6ed0d4 100644
--- a/src/panels/folders/paneltreeview.h
+++ b/src/panels/folders/paneltreeview.h
@@ -20,7 +20,7 @@
 #ifndef PANELTREEVIEW_H
 #define PANELTREEVIEW_H
 
-#include <kurl.h>
+#include <KUrl>
 #include <panels/folders/ktreeview.h>
 
 /**
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 80a14b21d..30484551c 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -20,15 +20,15 @@
 
 #include "treeviewcontextmenu.h"
 
-#include <kfileitem.h>
-#include <kiconloader.h>
-#include <kio/deletejob.h>
-#include <kmenu.h>
+#include <KFileItem>
+#include <KIconLoader>
+#include <KIO/DeleteJob>
+#include <KMenu>
 #include <konqmimedata.h>
-#include <kfileitemlistproperties.h>
+#include <KFileItemListProperties>
 #include <konq_operations.h>
-#include <klocale.h>
-#include <kpropertiesdialog.h>
+#include <KLocale>
+#include <KPropertiesDialog>
 
 #include "folderspanel.h"
 
diff --git a/src/panels/folders/treeviewcontextmenu.h b/src/panels/folders/treeviewcontextmenu.h
index d7ebf0999..6160339f3 100644
--- a/src/panels/folders/treeviewcontextmenu.h
+++ b/src/panels/folders/treeviewcontextmenu.h
@@ -20,7 +20,7 @@
 #ifndef TREEVIEWCONTEXTMENU_H
 #define TREEVIEWCONTEXTMENU_H
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <KFileItem>
 
 class FoldersPanel;
diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp
index 04ff9a91b..efbe784a4 100644
--- a/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/src/panels/information/filemetadataconfigurationdialog.cpp
@@ -20,7 +20,7 @@
 #include "filemetadataconfigurationdialog.h"
 
 #include <kfilemetadataconfigurationwidget.h>
-#include <klocale.h>
+#include <KLocale>
 #include <QLabel>
 #include <QVBoxLayout>
 
diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h
index dd9265c25..e9b71bb3b 100644
--- a/src/panels/information/filemetadataconfigurationdialog.h
+++ b/src/panels/information/filemetadataconfigurationdialog.h
@@ -20,8 +20,8 @@
 #ifndef FILEMETADATACONFIGURATIONDIALOG_H
 #define FILEMETADATACONFIGURATIONDIALOG_H
 
-#include <kdialog.h>
-#include <kfileitem.h>
+#include <KDialog>
+#include <KFileItem>
 
 class QLabel;
 class KFileMetaDataConfigurationWidget;
diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index 7759d591a..81afc1487 100644
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -20,7 +20,7 @@
 #include "informationpanel.h"
 
 #include "informationpanelcontent.h"
-#include <kio/job.h>
+#include <KIO/Job>
 #include <kdirnotify.h>
 #include <QApplication>
 #include <QShowEvent>
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index e09ccdf5c..04e13060d 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -19,18 +19,18 @@
 
 #include "informationpanelcontent.h"
 
-#include <kdialog.h>
-#include <kfileitem.h>
+#include <KDialog>
+#include <KFileItem>
 #include <kfilemetadatawidget.h>
-#include <kfileplacesmodel.h>
-#include <kglobalsettings.h>
-#include <kio/previewjob.h>
-#include <kiconeffect.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kmenu.h>
+#include <KFilePlacesModel>
+#include <KGlobalSettings>
+#include <KIO/PreviewJob>
+#include <KIconEffect>
+#include <KIconLoader>
+#include <KLocale>
+#include <KMenu>
 #include <kseparator.h>
-#include <kstringhandler.h>
+#include <KStringHandler>
 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>
diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index f6182d2df..dfbc2233b 100644
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -20,10 +20,10 @@
 #ifndef INFORMATIONPANELCONTENT_H
 #define INFORMATIONPANELCONTENT_H
 
-#include <kconfig.h>
-#include <kfileitem.h>
-#include <kurl.h>
-#include <kvbox.h>
+#include <KConfig>
+#include <KFileItem>
+#include <KUrl>
+#include <KVBox>
 
 class KFileItemList;
 class KFileMetaDataWidget;
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index a0bbcf210..b6da339ea 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -25,15 +25,15 @@
 #include <Phonon/SeekSlider>
 #include <Phonon/VideoPlayer>
 
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QShowEvent>
-#include <QtGui/QToolButton>
-
-#include <kdialog.h>
-#include <kicon.h>
-#include <kurl.h>
-#include <klocale.h>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QShowEvent>
+#include <QToolButton>
+
+#include <KDialog>
+#include <KIcon>
+#include <KUrl>
+#include <KLocale>
 
 class EmbeddedVideoPlayer : public Phonon::VideoPlayer
 {
diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h
index 196b87f87..1e1ea37e9 100644
--- a/src/panels/information/phononwidget.h
+++ b/src/panels/information/phononwidget.h
@@ -21,10 +21,10 @@
 #ifndef PHONONWIDGET_H
 #define PHONONWIDGET_H
 
-#include <kurl.h>
+#include <KUrl>
 
-#include <QtCore/QSize>
-#include <QtGui/QWidget>
+#include <QSize>
+#include <QWidget>
 
 #include <Phonon/Global>
 
diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp
index 416e53f1f..afa4c2f28 100644
--- a/src/panels/information/pixmapviewer.cpp
+++ b/src/panels/information/pixmapviewer.cpp
@@ -19,7 +19,7 @@
 
 #include "pixmapviewer.h"
 
-#include <kiconloader.h>
+#include <KIconLoader>
 
 #include <QLayout>
 #include <QPainter>
diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp
index f26086159..712e3ef5f 100644
--- a/src/panels/panel.cpp
+++ b/src/panels/panel.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "panel.h"
-#include <kurl.h>
+#include <KUrl>
 
 Panel::Panel(QWidget* parent) :
     QWidget(parent),
diff --git a/src/panels/panel.h b/src/panels/panel.h
index 2e8d46e40..6048cbcc3 100644
--- a/src/panels/panel.h
+++ b/src/panels/panel.h
@@ -21,9 +21,9 @@
 #ifndef PANEL_H
 #define PANEL_H
 
-#include <QtGui/QWidget>
-#include <kurl.h>
-#include <kfileitem.h>
+#include <QWidget>
+#include <KUrl>
+#include <KFileItem>
 
 /**
  * @brief Base widget for all panels that can be docked on the window borders.
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index d2e3ef570..25e54b544 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -20,7 +20,7 @@
 
 #include "placespanel.h"
 
-#include <kfileitem.h>
+#include <KFileItem>
 #include <konq_operations.h>
 #include "views/draganddrophelper.h"
 
diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index 3c9c5bd75..5dab059f2 100644
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -19,12 +19,12 @@
 
 #include "terminalpanel.h"
 
-#include <kpluginloader.h>
-#include <kpluginfactory.h>
+#include <KPluginLoader>
+#include <KPluginFactory>
 #include <kde_terminal_interface_v2.h>
 #include <kparts/part.h>
-#include <kshell.h>
-#include <kio/job.h>
+#include <KShell>
+#include <KIO/Job>
 #include <KIO/JobUiDelegate>
 
 #include <QBoxLayout>
diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index f9a7a0cf2..68dc9da3c 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -22,9 +22,9 @@
 #include "dolphin_searchsettings.h"
 #include "dolphinsearchinformation.h"
 
-#include <kicon.h>
-#include <klineedit.h>
-#include <klocale.h>
+#include <KIcon>
+#include <KLineEdit>
+#include <KLocale>
 #include <kseparator.h>
 
 #include <QButtonGroup>
@@ -42,15 +42,15 @@
 
 #include <config-nepomuk.h>
 #ifdef HAVE_NEPOMUK
-    #include <nepomuk/andterm.h>
-    #include <nepomuk/filequery.h>
-    #include <nepomuk/literalterm.h>
-    #include <nepomuk/query.h>
-    #include <nepomuk/queryparser.h>
-    #include <nepomuk/resourcemanager.h>
-    #include <nepomuk/resourcetypeterm.h>
-    #include <nepomuk/comparisonterm.h>
-    #include <nepomuk/nfo.h>
+    #include <Nepomuk/Query/AndTerm>
+    #include <Nepomuk/Query/FileQuery>
+    #include <Nepomuk/Query/LiteralTerm>
+    #include <Nepomuk/Query/Query>
+    #include <Nepomuk/Query/QueryParser>
+    #include <Nepomuk/Query/ResourceTypeTerm>
+    #include <Nepomuk/Query/ComparisonTerm>
+    #include <Nepomuk/ResourceManager>
+    #include <Nepomuk/Vocabulary/NFO>
 #endif
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index 053726123..09d223355 100644
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINSEARCHBOX_H
 #define DOLPHINSEARCHBOX_H
 
-#include <kurl.h>
+#include <KUrl>
 #include <QList>
 #include <QWidget>
 
diff --git a/src/search/filenamesearchprotocol.cpp b/src/search/filenamesearchprotocol.cpp
index 4670888aa..ddc23789c 100644
--- a/src/search/filenamesearchprotocol.cpp
+++ b/src/search/filenamesearchprotocol.cpp
@@ -19,12 +19,12 @@
 
 #include "filenamesearchprotocol.h"
 
-#include <kcomponentdata.h>
-#include <kdirlister.h>
-#include <kfileitem.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
-#include <kurl.h>
+#include <KComponentData>
+#include <KDirLister>
+#include <KFileItem>
+#include <KIO/NetAccess>
+#include <KIO/Job>
+#include <KUrl>
 #include <ktemporaryfile.h>
 
 #include <QCoreApplication>
diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index ef08795e5..2e7d33cb3 100644
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -19,7 +19,7 @@
 
 #include "additionalinfodialog.h"
 
-#include <klocale.h>
+#include <KLocale>
 
 #include <QCheckBox>
 #include <QLabel>
diff --git a/src/settings/additionalinfodialog.h b/src/settings/additionalinfodialog.h
index 54d23f2e3..eca2c86c6 100644
--- a/src/settings/additionalinfodialog.h
+++ b/src/settings/additionalinfodialog.h
@@ -20,8 +20,8 @@
 #ifndef ADDITIONALINFODIALOG_H
 #define ADDITIONALINFODIALOG_H
 
-#include <kdialog.h>
-#include <kfileitemdelegate.h>
+#include <KDialog>
+#include <KFileItemDelegate>
 #include <QList>
 
 class QCheckBox;
diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index da18af966..423181761 100644
--- a/src/settings/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
@@ -23,9 +23,9 @@
 #ifndef APPLYVIEWPROPSJOB_H
 #define APPLYVIEWPROPSJOB_H
 
-#include <kio/job.h>
-#include <kfileitem.h>
-#include <kurl.h>
+#include <KIO/Job>
+#include <KFileItem>
+#include <KUrl>
 
 class ViewProperties;
 
diff --git a/src/settings/dolphinsettings.cpp b/src/settings/dolphinsettings.cpp
index 5b91001ef..7f160b141 100644
--- a/src/settings/dolphinsettings.cpp
+++ b/src/settings/dolphinsettings.cpp
@@ -20,10 +20,10 @@
 
 #include "dolphinsettings.h"
 
-#include <kfileplacesmodel.h>
-#include <kcomponentdata.h>
-#include <klocale.h>
-#include <kstandarddirs.h>
+#include <KFilePlacesModel>
+#include <KComponentData>
+#include <KLocale>
+#include <KStandardDirs>
 
 #include "dolphin_columnmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 2a62fc1cf..611648561 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -31,9 +31,9 @@
 #include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kicon.h>
+#include <KLocale>
+#include <KMessageBox>
+#include <KIcon>
 
 DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
     KPageDialog(parent),
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 6d9fa9c0e..814304801 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -23,8 +23,8 @@
 #include "dolphin_generalsettings.h"
 #include <settings/dolphinsettings.h>
 
-#include <kdialog.h>
-#include <klocale.h>
+#include <KDialog>
+#include <KLocale>
 
 #include <QCheckBox>
 #include <QGroupBox>
diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index d92feb939..c9b825128 100644
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -21,7 +21,7 @@
 #define BEHAVIORSETTINGSPAGE_H
 
 #include <settings/settingspagebase.h>
-#include <kurl.h>
+#include <KUrl>
 
 class QCheckBox;
 class QLabel;
diff --git a/src/settings/general/contextmenusettingspage.cpp b/src/settings/general/contextmenusettingspage.cpp
index 592e25ba7..1b9f3a482 100644
--- a/src/settings/general/contextmenusettingspage.cpp
+++ b/src/settings/general/contextmenusettingspage.cpp
@@ -22,9 +22,9 @@
 #include <settings/dolphinsettings.h>
 #include <dolphin_generalsettings.h>
 
-#include <kdialog.h>
-#include <klocale.h>
-#include <kvbox.h>
+#include <KDialog>
+#include <KLocale>
+#include <KVBox>
 
 #include <QCheckBox>
 #include <QVBoxLayout>
diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp
index e156dadfc..dddefdd5c 100644
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@@ -26,10 +26,10 @@
 #include <settings/settingspagebase.h>
 #include "statusbarsettingspage.h"
 
-#include <kdialog.h>
-#include <klocale.h>
-#include <kiconloader.h>
-#include <ktabwidget.h>
+#include <KDialog>
+#include <KLocale>
+#include <KIconLoader>
+#include <KTabWidget>
 
 #include <QVBoxLayout>
 
diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index ff5a878f6..1333df5e9 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -21,13 +21,13 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <kconfiggroup.h>
-#include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <KConfigGroup>
+#include <KDialog>
+#include <KGlobal>
+#include <KLocale>
 #include <KNumInput>
 #include <kservicetypetrader.h>
-#include <kservice.h>
+#include <KService>
 
 #include <settings/dolphinsettings.h>
 
diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp
index 4d9b9a3f2..8c3833ec4 100644
--- a/src/settings/general/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@@ -21,9 +21,9 @@
 
 #include <dolphin_generalsettings.h>
 
-#include <kdialog.h>
-#include <klocale.h>
-#include <kvbox.h>
+#include <KDialog>
+#include <KLocale>
+#include <KVBox>
 
 #include <settings/dolphinsettings.h>
 
diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index fb4a643ea..587c4df29 100644
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -19,9 +19,9 @@
 
 #include "kcmdolphingeneral.h"
 
-#include <ktabwidget.h>
-#include <kdialog.h>
-#include <klocale.h>
+#include <KTabWidget>
+#include <KDialog>
+#include <KLocale>
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
 
diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index fdf9de550..f4861b065 100644
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -19,11 +19,11 @@
 
 #include "kcmdolphinnavigation.h"
 
-#include <ktabwidget.h>
-#include <kdialog.h>
-#include <klocale.h>
-#include <kpluginfactory.h>
-#include <kpluginloader.h>
+#include <KTabWidget>
+#include <KDialog>
+#include <KLocale>
+#include <KPluginFactory>
+#include <KPluginLoader>
 
 #include <settings/navigation/navigationsettingspage.h>
 
diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 22e4e32cc..82c4275a3 100644
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -19,11 +19,11 @@
 
 #include "kcmdolphinservices.h"
 
-#include <ktabwidget.h>
-#include <kdialog.h>
-#include <klocale.h>
-#include <kpluginfactory.h>
-#include <kpluginloader.h>
+#include <KTabWidget>
+#include <KDialog>
+#include <KLocale>
+#include <KPluginFactory>
+#include <KPluginLoader>
 
 #include <settings/services/servicessettingspage.h>
 
diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index e24d549e0..2a3666d80 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -19,11 +19,11 @@
 
 #include "kcmdolphinviewmodes.h"
 
-#include <ktabwidget.h>
-#include <kdialog.h>
-#include <klocale.h>
-#include <kpluginfactory.h>
-#include <kpluginloader.h>
+#include <KTabWidget>
+#include <KDialog>
+#include <KLocale>
+#include <KPluginFactory>
+#include <KPluginLoader>
 
 #include <settings/viewmodes/columnviewsettingspage.h>
 #include <settings/viewmodes/detailsviewsettingspage.h>
diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp
index 00ea3aad3..062edc24a 100644
--- a/src/settings/navigation/navigationsettingspage.cpp
+++ b/src/settings/navigation/navigationsettingspage.cpp
@@ -23,10 +23,10 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <kdialog.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kvbox.h>
+#include <KDialog>
+#include <KGlobalSettings>
+#include <KLocale>
+#include <KVBox>
 
 #include <QCheckBox>
 #include <QGroupBox>
diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index 17560714c..bc4de0939 100644
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -21,17 +21,17 @@
 
 #include "dolphin_versioncontrolsettings.h"
 
-#include <kconfig.h>
-#include <kconfiggroup.h>
-#include <kdesktopfile.h>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KDesktopFile>
 #include <kdesktopfileactions.h>
-#include <kicon.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <KIcon>
+#include <KLocale>
+#include <KMessageBox>
 #include <knewstuff3/knewstuffbutton.h>
-#include <kservice.h>
+#include <KService>
 #include <kservicetypetrader.h>
-#include <kstandarddirs.h>
+#include <KStandardDirs>
 
 #include <QCheckBox>
 #include <QGridLayout>
diff --git a/src/settings/settingspagebase.h b/src/settings/settingspagebase.h
index 05f907aac..65b8782f9 100644
--- a/src/settings/settingspagebase.h
+++ b/src/settings/settingspagebase.h
@@ -21,7 +21,7 @@
 #ifndef SETTINGSPAGEBASE_H
 #define SETTINGSPAGEBASE_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 /**
  * @brief Base class for the settings pages of the Dolphin settings dialog.
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index c3fdbc656..47da64d0a 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -25,12 +25,12 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <kdialog.h>
+#include <KDialog>
 #include <kfiledialog.h>
-#include <klocale.h>
-#include <klineedit.h>
-#include <kmessagebox.h>
-#include <kvbox.h>
+#include <KLocale>
+#include <KLineEdit>
+#include <KMessageBox>
+#include <KVBox>
 
 #include <QCheckBox>
 #include <QGroupBox>
diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h
index d749e5e0e..1c53cccdf 100644
--- a/src/settings/startup/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
@@ -20,7 +20,7 @@
 #define STARTUPSETTINGSPAGE_H
 
 #include <settings/settingspagebase.h>
-#include <kurl.h>
+#include <KUrl>
 
 class KLineEdit;
 class QCheckBox;
diff --git a/src/settings/trash/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp
index f507cbab5..b8294bffd 100644
--- a/src/settings/trash/trashsettingspage.cpp
+++ b/src/settings/trash/trashsettingspage.cpp
@@ -20,8 +20,8 @@
 #include "trashsettingspage.h"
 
 #include <KCModuleProxy>
-#include <kdialog.h>
-#include <kvbox.h>
+#include <KDialog>
+#include <KVBox>
 
 #include <settings/dolphinsettings.h>
 
diff --git a/src/settings/viewmodes/columnviewsettingspage.cpp b/src/settings/viewmodes/columnviewsettingspage.cpp
index 0919e1618..3bacca4ba 100644
--- a/src/settings/viewmodes/columnviewsettingspage.cpp
+++ b/src/settings/viewmodes/columnviewsettingspage.cpp
@@ -23,9 +23,9 @@
 #include <dolphin_columnmodesettings.h>
 #include "iconsizegroupbox.h"
 
-#include <kdialog.h>
-#include <klocale.h>
-#include <kcombobox.h>
+#include <KDialog>
+#include <KLocale>
+#include <KComboBox>
 
 #include <settings/dolphinsettings.h>
 
diff --git a/src/settings/viewmodes/detailsviewsettingspage.cpp b/src/settings/viewmodes/detailsviewsettingspage.cpp
index 79fedd510..321f7eb0e 100644
--- a/src/settings/viewmodes/detailsviewsettingspage.cpp
+++ b/src/settings/viewmodes/detailsviewsettingspage.cpp
@@ -23,8 +23,8 @@
 #include "dolphinfontrequester.h"
 #include "dolphin_detailsmodesettings.h"
 
-#include <kdialog.h>
-#include <klocale.h>
+#include <KDialog>
+#include <KLocale>
 
 #include <settings/dolphinsettings.h>
 
diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 04c5ed586..4e23b2d47 100644
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -20,9 +20,9 @@
 #include "dolphinfontrequester.h"
 
 #include <kfontdialog.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kcombobox.h>
+#include <KGlobalSettings>
+#include <KLocale>
+#include <KComboBox>
 
 #include <QEvent>
 #include <QPushButton>
diff --git a/src/settings/viewmodes/iconsizegroupbox.cpp b/src/settings/viewmodes/iconsizegroupbox.cpp
index 900c75b2c..76fb1fb57 100644
--- a/src/settings/viewmodes/iconsizegroupbox.cpp
+++ b/src/settings/viewmodes/iconsizegroupbox.cpp
@@ -19,7 +19,7 @@
 
 #include "iconsizegroupbox.h"
 
-#include <klocale.h>
+#include <KLocale>
 
 #include <QApplication>
 #include <QGridLayout>
diff --git a/src/settings/viewmodes/iconsviewsettingspage.cpp b/src/settings/viewmodes/iconsviewsettingspage.cpp
index a711254c3..8c146f014 100644
--- a/src/settings/viewmodes/iconsviewsettingspage.cpp
+++ b/src/settings/viewmodes/iconsviewsettingspage.cpp
@@ -25,10 +25,10 @@
 
 #include "dolphin_iconsmodesettings.h"
 
-#include <kdialog.h>
-#include <kiconloader.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <KDialog>
+#include <KIconLoader>
+#include <KGlobalSettings>
+#include <KLocale>
 #include <kcombobox.h>
 #include <KNumInput>
 
diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index deb7a31bb..6d9a70466 100644
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -26,9 +26,9 @@
 
 #include <QVBoxLayout>
 
-#include <kdialog.h>
-#include <klocale.h>
-#include <kiconloader.h>
+#include <KDialog>
+#include <KLocale>
+#include <KIconLoader>
 #include <ktabwidget.h>
 
 ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
diff --git a/src/settings/viewmodes/viewsettingspagebase.h b/src/settings/viewmodes/viewsettingspagebase.h
index 3e85e25cb..541253355 100644
--- a/src/settings/viewmodes/viewsettingspagebase.h
+++ b/src/settings/viewmodes/viewsettingspagebase.h
@@ -20,7 +20,7 @@
 #ifndef VIEWSETTINGSPAGEBASE_H
 #define VIEWSETTINGSPAGEBASE_H
 
-#include <kvbox.h>
+#include <KVBox>
 
 /**
  * @brief Base class for view settings configuration pages.
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 7830616d0..f52bd12d2 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -32,13 +32,13 @@
 #include <nepomuk/resourcemanager.h>
 #endif
 
-#include <kcomponentdata.h>
-#include <klocale.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kmessagebox.h>
-#include <kstandarddirs.h>
-#include <kurl.h>
+#include <KComponentData>
+#include <KLocale>
+#include <KIconLoader>
+#include <KIO/NetAccess>
+#include <KMessageBox>
+#include <KStandardDirs>
+#include <KUrl>
 #include <kcombobox.h>
 
 #include <QAction>
diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index ce0c3e5b8..d2170f331 100644
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -23,7 +23,7 @@
 
 #include "libdolphin_export.h"
 
-#include <kdialog.h>
+#include <KDialog>
 
 class QCheckBox;
 class KComboBox;
diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index 436dcdef6..c98b23866 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -21,12 +21,12 @@
 #include "viewpropsprogressinfo.h"
 #include "applyviewpropsjob.h"
 
-#include <QtGui/QLabel>
-#include <QtGui/QProgressBar>
-#include <QtCore/QTimer>
-#include <QtGui/QBoxLayout>
+#include <QLabel>
+#include <QProgressBar>
+#include <QTimer>
+#include <QBoxLayout>
 
-#include <klocale.h>
+#include <KLocale>
 #include <kio/jobclasses.h>
 
 #include <views/viewproperties.h>
diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index d07d16d67..6f8c763c3 100644
--- a/src/settings/viewpropsprogressinfo.h
+++ b/src/settings/viewpropsprogressinfo.h
@@ -20,9 +20,9 @@
 #ifndef VIEWPROPSPROGRESSINFO_H
 #define VIEWPROPSPROGRESSINFO_H
 
-#include <kdialog.h>
+#include <KDialog>
 #include <kio/directorysizejob.h>
-#include <kurl.h>
+#include <KUrl>
 
 class ApplyViewPropsJob;
 class QLabel;
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index dfa5be21c..987b1dca6 100644
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -22,11 +22,11 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <kiconloader.h>
-#include <kicon.h>
-#include <klocale.h>
-#include <kmenu.h>
-#include <kvbox.h>
+#include <KIconLoader>
+#include <KIcon>
+#include <KLocale>
+#include <KMenu>
+#include <KVBox>
 
 #include "settings/dolphinsettings.h"
 #include "statusbarspaceinfo.h"
diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index a601d4367..a25fa3a3e 100644
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -22,8 +22,8 @@
 
 #include <KDiskFreeSpaceInfo>
 #include <kmountpoint.h>
-#include <klocale.h>
-#include <kio/job.h>
+#include <KLocale>
+#include <KIO/Job>
 
 #include <QTimer>
 #include <QKeyEvent>
diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 7650c357f..0a563ad13 100644
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -20,7 +20,7 @@
 #ifndef STATUSBARSPACEINFO_H
 #define STATUSBARSPACEINFO_H
 
-#include <kurl.h>
+#include <KUrl>
 
 #include <QColor>
 #include <QKeyEvent>
diff --git a/src/tests/dolphintreeviewtest.cpp b/src/tests/dolphintreeviewtest.cpp
index 61922acd7..afcd34d2b 100644
--- a/src/tests/dolphintreeviewtest.cpp
+++ b/src/tests/dolphintreeviewtest.cpp
@@ -18,14 +18,14 @@
  *****************************************************************************/
 
 #include <qtest_kde.h>
-#include <kdebug.h>
-#include <kaction.h>
+#include <KDebug>
+#include <KAction>
 
 #include "views/dolphintreeview.h"
 
 #include <qtestkeyboard.h>
 #include <qtestmouse.h>
-#include <QtGui/QStringListModel>
+#include <QStringListModel>
 
 class DolphinTreeViewTest : public QObject
 {
diff --git a/src/tests/dolphinviewtest_allviewmodes.cpp b/src/tests/dolphinviewtest_allviewmodes.cpp
index fada6c3b5..9d4876fd8 100644
--- a/src/tests/dolphinviewtest_allviewmodes.cpp
+++ b/src/tests/dolphinviewtest_allviewmodes.cpp
@@ -29,7 +29,7 @@
 #include "views/dolphinsortfilterproxymodel.h"
 #include "views/zoomlevelinfo.h"
 
-#include <QtGui/QScrollBar>
+#include <QScrollBar>
 
 #include <qtestmouse.h>
 #include <qtestkeyboard.h>
diff --git a/src/tests/testbase.cpp b/src/tests/testbase.cpp
index 1cb326766..a0031d0f5 100644
--- a/src/tests/testbase.cpp
+++ b/src/tests/testbase.cpp
@@ -28,10 +28,10 @@
 
 #include <KTempDir>
 
-#include <QtCore/QDir>
-#include <QtGui/QAbstractItemView>
+#include <QDir>
+#include <QAbstractItemView>
 
-#include <kdebug.h>
+#include <KDebug>
 
 #ifdef Q_OS_UNIX
 #include <utime.h>
diff --git a/src/tests/testbase.h b/src/tests/testbase.h
index d197a3f92..7e6ff4bb5 100644
--- a/src/tests/testbase.h
+++ b/src/tests/testbase.h
@@ -22,7 +22,7 @@
 
 #include <KUrl>
 
-#include <QtCore/QDateTime>
+#include <QDateTime>
 
 class KTempDir;
 class QAbstractItemView;
diff --git a/src/views/additionalinfoaccessor.cpp b/src/views/additionalinfoaccessor.cpp
index cafc4fa23..426d7a2c4 100644
--- a/src/views/additionalinfoaccessor.cpp
+++ b/src/views/additionalinfoaccessor.cpp
@@ -20,8 +20,8 @@
 #include "additionalinfoaccessor.h"
 
 #include "dolphinmodel.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <KGlobal>
+#include <KLocale>
 
 class AdditionalInfoAccessorSingleton
 {
diff --git a/src/views/additionalinfoaccessor.h b/src/views/additionalinfoaccessor.h
index b3d564088..dbec097fd 100644
--- a/src/views/additionalinfoaccessor.h
+++ b/src/views/additionalinfoaccessor.h
@@ -21,7 +21,7 @@
 #define ADDITIONALINFOACCESSOR_H
 
 #include <libdolphin_export.h>
-#include <kfileitemdelegate.h>
+#include <KFileItemDelegate>
 #include <views/dolphinview.h>
 
 #include <QList>
diff --git a/src/views/dolphincategorydrawer.cpp b/src/views/dolphincategorydrawer.cpp
index d71184637..1f39133ab 100644
--- a/src/views/dolphincategorydrawer.cpp
+++ b/src/views/dolphincategorydrawer.cpp
@@ -29,14 +29,14 @@
 #include <QStyleOption>
 
 #ifdef HAVE_NEPOMUK
-#include <nepomuk/kratingpainter.h>
+#include <Nepomuk/KRatingPainter>
 #endif
 
-#include <kiconloader.h>
-#include <kiconeffect.h>
-#include <kcategorizedsortfilterproxymodel.h>
-#include <kuser.h>
-#include <kcategorizedview.h>
+#include <KIconLoader>
+#include <KIconEffect>
+#include <KCategorizedSortFilterProxyModel>
+#include <KUser>
+#include <KCategorizedView>
 
 #include "dolphinview.h"
 #include "dolphinmodel.h"
diff --git a/src/views/dolphincolumnview.cpp b/src/views/dolphincolumnview.cpp
index 52d86f121..464e0a068 100644
--- a/src/views/dolphincolumnview.cpp
+++ b/src/views/dolphincolumnview.cpp
@@ -36,14 +36,14 @@
 #include "viewmodecontroller.h"
 #include "zoomlevelinfo.h"
 
-#include <kcolorscheme.h>
-#include <kdirlister.h>
-#include <kfileitem.h>
-#include <kio/previewjob.h>
-#include <kicon.h>
-#include <kiconeffect.h>
-#include <kjob.h>
-#include <klocale.h>
+#include <KColorScheme>
+#include <KDirLister>
+#include <KFileItem>
+#include <KIO/PreviewJob>
+#include <KIcon>
+#include <KIconEffect>
+#include <KJob>
+#include <KLocale>
 #include <konqmimedata.h>
 
 #include <QApplication>
diff --git a/src/views/dolphincolumnview.h b/src/views/dolphincolumnview.h
index 72130c8f4..231ba59ab 100644
--- a/src/views/dolphincolumnview.h
+++ b/src/views/dolphincolumnview.h
@@ -27,7 +27,7 @@
 #include <QSize>
 #include <QStyleOption>
 
-#include <kurl.h>
+#include <KUrl>
 
 class DolphinColumnViewContainer;
 class DolphinModel;
diff --git a/src/views/dolphincolumnviewcontainer.h b/src/views/dolphincolumnviewcontainer.h
index 20ae81b38..c27caff62 100644
--- a/src/views/dolphincolumnviewcontainer.h
+++ b/src/views/dolphincolumnviewcontainer.h
@@ -22,7 +22,7 @@
 
 #include "dolphinview.h"
 
-#include <kurl.h>
+#include <KUrl>
 
 #include <QList>
 #include <QScrollArea>
diff --git a/src/views/dolphindetailsview.cpp b/src/views/dolphindetailsview.cpp
index d434a4b3d..482925aaa 100644
--- a/src/views/dolphindetailsview.cpp
+++ b/src/views/dolphindetailsview.cpp
@@ -36,10 +36,10 @@
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 
-#include <kdirmodel.h>
-#include <kdirlister.h>
-#include <klocale.h>
-#include <kmenu.h>
+#include <KDirModel>
+#include <KDirLister>
+#include <KLocale>
+#include <KMenu>
 
 #include <QApplication>
 #include <QHeaderView>
diff --git a/src/views/dolphindetailsviewexpander.cpp b/src/views/dolphindetailsviewexpander.cpp
index 0f3d3fde1..c2734ed3a 100644
--- a/src/views/dolphindetailsviewexpander.cpp
+++ b/src/views/dolphindetailsviewexpander.cpp
@@ -23,8 +23,8 @@
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
 
-#include <kdirlister.h>
-#include <kdirmodel.h>
+#include <KDirLister>
+#include <KDirModel>
 
 DolphinDetailsViewExpander::DolphinDetailsViewExpander(DolphinDetailsView* parent,
                                                        const QSet<KUrl>& urlsToExpand) :
diff --git a/src/views/dolphindirlister.cpp b/src/views/dolphindirlister.cpp
index 2eac5522d..81ad20b26 100644
--- a/src/views/dolphindirlister.cpp
+++ b/src/views/dolphindirlister.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include "dolphindirlister.h"
-#include "klocale.h"
+#include <KLocale>
 #include <kio/jobclasses.h>
 
 DolphinDirLister::DolphinDirLister() :
diff --git a/src/views/dolphindirlister.h b/src/views/dolphindirlister.h
index 0549c3c8f..a9e043992 100644
--- a/src/views/dolphindirlister.h
+++ b/src/views/dolphindirlister.h
@@ -21,7 +21,7 @@
 #define DOLPHINDIRLISTER_H
 
 #include <libdolphin_export.h>
-#include <kdirlister.h>
+#include <KDirLister>
 
 /**
  * @brief Extends the class KDirLister by emitting a signal when an
diff --git a/src/views/dolphinfileitemdelegate.cpp b/src/views/dolphinfileitemdelegate.cpp
index 0372ce674..a3046ebba 100644
--- a/src/views/dolphinfileitemdelegate.cpp
+++ b/src/views/dolphinfileitemdelegate.cpp
@@ -20,11 +20,11 @@
 #include "dolphinfileitemdelegate.h"
 
 #include "dolphinmodel.h"
-#include <kcolorscheme.h>
-#include <kfileitem.h>
-#include <kicon.h>
-#include <kiconloader.h>
-#include <kstringhandler.h>
+#include <KColorScheme>
+#include <KFileItem>
+#include <KIcon>
+#include <KIconLoader>
+#include <KStringHandler>
 
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
diff --git a/src/views/dolphinfileitemdelegate.h b/src/views/dolphinfileitemdelegate.h
index afe88997e..252b261e0 100644
--- a/src/views/dolphinfileitemdelegate.h
+++ b/src/views/dolphinfileitemdelegate.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINFILEITEMDELEGATE_H
 #define DOLPHINFILEITEMDELEGATE_H
 
-#include <kfileitemdelegate.h>
+#include <KFileItemDelegate>
 #include <views/dolphinmodel.h>
 
 class QAbstractProxyModel;
diff --git a/src/views/dolphiniconsview.cpp b/src/views/dolphiniconsview.cpp
index f04769762..301748e15 100644
--- a/src/views/dolphiniconsview.cpp
+++ b/src/views/dolphiniconsview.cpp
@@ -31,9 +31,9 @@
 #include "viewmodecontroller.h"
 #include "zoomlevelinfo.h"
 
-#include <kcategorizedsortfilterproxymodel.h>
-#include <kdialog.h>
-#include <kfileitemdelegate.h>
+#include <KCategorizedSortFilterProxyModel>
+#include <KDialog>
+#include <KFileItemDelegate>
 
 #include <QAbstractProxyModel>
 #include <QApplication>
diff --git a/src/views/dolphiniconsview.h b/src/views/dolphiniconsview.h
index 0f6f716c3..8f77fc9b2 100644
--- a/src/views/dolphiniconsview.h
+++ b/src/views/dolphiniconsview.h
@@ -20,10 +20,10 @@
 #ifndef DOLPHINICONSVIEW_H
 #define DOLPHINICONSVIEW_H
 
-#include <kcategorizedview.h>
+#include <KCategorizedView>
 
-#include <kfileitem.h>
-#include <kfileitemdelegate.h>
+#include <KFileItem>
+#include <KFileItemDelegate>
 
 #include <QFont>
 #include <QSize>
diff --git a/src/views/dolphinmodel.cpp b/src/views/dolphinmodel.cpp
index 6474a4f3c..c999dfacd 100644
--- a/src/views/dolphinmodel.cpp
+++ b/src/views/dolphinmodel.cpp
@@ -22,17 +22,16 @@
 
 #include "dolphinsortfilterproxymodel.h"
 
-#include "kcategorizedview.h"
-
-#include <kdatetime.h>
-#include <kdirmodel.h>
-#include <kfileitem.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kurl.h>
-#include <kuser.h>
-#include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <KCategorizedView>
+#include <KDateTime>
+#include <KDirModel>
+#include <KFileItem>
+#include <KIconLoader>
+#include <KLocale>
+#include <KUrl>
+#include <KUser>
+#include <KMimeType>
+#include <KStandardDirs>
 
 #include <QList>
 #include <QSortFilterProxyModel>
diff --git a/src/views/dolphinmodel.h b/src/views/dolphinmodel.h
index 930b4e85e..2f6d1f02d 100644
--- a/src/views/dolphinmodel.h
+++ b/src/views/dolphinmodel.h
@@ -21,7 +21,7 @@
 #ifndef DOLPHINMODEL_H
 #define DOLPHINMODEL_H
 
-#include <kdirmodel.h>
+#include <KDirModel>
 #include <kversioncontrolplugin.h>
 #include <libdolphin_export.h>
 
diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index 50a755b9a..baddc16e3 100644
--- a/src/views/dolphinnewfilemenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -19,7 +19,7 @@
 
 #include "dolphinnewfilemenuobserver.h"
 
-#include <kglobal.h>
+#include <KGlobal>
 #include <knewmenu.h>
 
 class DolphinNewFileMenuObserverSingleton
diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 397eaccc0..f3bd15772 100644
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -26,21 +26,21 @@
 #include "dolphinremoteencoding.h"
 #include "dolphinviewactionhandler.h"
 
-#include <kdebug.h>
-#include <kactionmenu.h>
-#include <kactioncollection.h>
-#include <kicon.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmimetype.h>
-#include <kconfig.h>
-#include <kcharsets.h>
-#include <kmenu.h>
-#include <kprotocolinfo.h>
-#include <kprotocolmanager.h>
-#include <kio/slaveconfig.h>
-#include <kio/scheduler.h>
-#include <kconfiggroup.h>
+#include <KDebug>
+#include <KActionMenu>
+#include <KActionCollection>
+#include <KIcon>
+#include <KLocale>
+#include <KGlobal>
+#include <KMimeType>
+#include <KConfig>
+#include <KCharsets>
+#include <KMenu>
+#include <KProtocolInfo>
+#include <KProtocolManager>
+#include <KIO/SlaveConfig>
+#include <KIO/Scheduler>
+#include <KConfigGroup>
 
 #define DATA_KEY        QLatin1String("Charset")
 
diff --git a/src/views/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h
index 54499f78b..559bc66ad 100644
--- a/src/views/dolphinremoteencoding.h
+++ b/src/views/dolphinremoteencoding.h
@@ -21,8 +21,8 @@
 #define DOLPHINREMOTEENCODING_H
 
 #include <QStringList>
-#include <QtGui/QAction>
-#include <kurl.h>
+#include <QAction>
+#include <KUrl>
 #include "libdolphin_export.h"
 
 
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index ae124c735..a4e97bf6e 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -29,24 +29,24 @@
 #include <QTimer>
 #include <QScrollBar>
 
-#include <kactioncollection.h>
-#include <kcolorscheme.h>
-#include <kdirlister.h>
-#include <kiconeffect.h>
-#include <kfileitem.h>
-#include <kfileitemlistproperties.h>
-#include <klocale.h>
-#include <kio/deletejob.h>
-#include <kio/netaccess.h>
-#include <kio/previewjob.h>
-#include <kjob.h>
-#include <kmenu.h>
-#include <kmessagebox.h>
+#include <KActionCollection>
+#include <KColorScheme>
+#include <KDirLister>
+#include <KIconEffect>
+#include <KFileItem>
+#include <KFileItemListProperties>
+#include <KLocale>
+#include <KIO/DeleteJob>
+#include <KIO/NetAccess>
+#include <KIO/PreviewJob>
+#include <KJob>
+#include <KMenu>
+#include <KMessageBox>
 #include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 #include <konqmimedata.h>
-#include <ktoggleaction.h>
-#include <kurl.h>
+#include <KToggleAction>
+#include <KUrl>
 
 #include "additionalinfoaccessor.h"
 #include "dolphindirlister.h"
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 04b821e71..bd242833b 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -27,10 +27,10 @@
 #include "libdolphin_export.h"
 
 #include <kparts/part.h>
-#include <kfileitem.h>
-#include <kfileitemdelegate.h>
+#include <KFileItem>
+#include <KFileItemDelegate>
 #include <kio/fileundomanager.h>
-#include <kio/job.h>
+#include <KIO/Job>
 
 #include <QBoxLayout>
 #include <QKeyEvent>
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 9c0d33f9e..a8b044a41 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -25,17 +25,16 @@
 #include "views/zoomlevelinfo.h"
 #include <konq_operations.h>
 
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kactionmenu.h>
-#include <kfileitemdelegate.h>
-#include <klocale.h>
+#include <KAction>
+#include <KActionCollection>
+#include <KActionMenu>
+#include <KFileItemDelegate>
+#include <KLocale>
 #include <knewmenu.h>
-#include <kselectaction.h>
-#include <ktoggleaction.h>
-#include <krun.h>
-#include <kpropertiesdialog.h>
-
+#include <KSelectAction>
+#include <KToggleAction>
+#include <KRun>
+#include <KPropertiesDialog>
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)
     : QObject(parent),
diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index 05339ce37..72e768375 100644
--- a/src/views/dolphinviewactionhandler.h
+++ b/src/views/dolphinviewactionhandler.h
@@ -22,10 +22,10 @@
 #define DOLPHINVIEWACTIONHANDLER_H
 
 #include "libdolphin_export.h"
-#include <kactionmenu.h>
-#include <kselectaction.h>
+#include <KActionMenu>
+#include <KSelectAction>
 #include "views/dolphinview.h"
-#include <QtCore/QObject>
+#include <QObject>
 
 class KToggleAction;
 class QAction;
diff --git a/src/views/dolphinviewcontroller.cpp b/src/views/dolphinviewcontroller.cpp
index 6749eaa41..98d548da5 100644
--- a/src/views/dolphinviewcontroller.cpp
+++ b/src/views/dolphinviewcontroller.cpp
@@ -20,8 +20,8 @@
 #include "dolphinviewcontroller.h"
 #include "zoomlevelinfo.h"
 
-#include <kdirmodel.h>
-#include <kfileitemactions.h>
+#include <KDirModel>
+#include <KFileItemActions>
 #include <QAbstractProxyModel>
 #include <QApplication>
 #include <QClipboard>
diff --git a/src/views/dolphinviewcontroller.h b/src/views/dolphinviewcontroller.h
index 07bc56936..1ad8fab33 100644
--- a/src/views/dolphinviewcontroller.h
+++ b/src/views/dolphinviewcontroller.h
@@ -21,8 +21,8 @@
 #define DOLPHINVIEWCONTROLLER_H
 
 #include <views/dolphinview.h>
-#include <kurl.h>
-#include <QtCore/QObject>
+#include <KUrl>
+#include <QObject>
 #include <libdolphin_export.h>
 
 class QAbstractItemView;
diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index 9708415f0..749c82888 100644
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -20,10 +20,10 @@
 
 #include "draganddrophelper.h"
 
-#include <kdirmodel.h>
-#include <kfileitem.h>
-#include <kicon.h>
-#include <klocale.h>
+#include <KDirModel>
+#include <KFileItem>
+#include <KIcon>
+#include <KLocale>
 #include <konq_operations.h>
 
 #include "views/dolphiniconsview.h"
diff --git a/src/views/folderexpander.cpp b/src/views/folderexpander.cpp
index a2dfb137b..4e22fdb0a 100644
--- a/src/views/folderexpander.cpp
+++ b/src/views/folderexpander.cpp
@@ -19,17 +19,17 @@
 
 #include "folderexpander.h"
 
-#include <QtCore/QTimer>
-#include <QtGui/QAbstractItemView>
-#include <QtGui/QTreeView>
-#include <QtGui/QScrollBar>
+#include <QTimer>
+#include <QAbstractItemView>
+#include <QTreeView>
+#include <QScrollBar>
 
-#include <QtCore/QEvent>
-#include <QtGui/QDragMoveEvent>
+#include <QEvent>
+#include <QDragMoveEvent>
 
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
 
-#include <kdirmodel.h>
+#include <KDirModel>
 
 FolderExpander::FolderExpander(QAbstractItemView *view, QSortFilterProxyModel *proxyModel) :
     QObject(view),
diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 2b56d928b..864cfe270 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -19,10 +19,10 @@
 
 #include "renamedialog.h"
 
-#include <klineedit.h>
-#include <klocale.h>
+#include <KLineEdit>
+#include <KLocale>
 #include <konq_operations.h>
-#include <kstringhandler.h>
+#include <KStringHandler>
 
 #include <QLabel>
 #include <QVBoxLayout>
diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h
index 73414093c..8d8b73da5 100644
--- a/src/views/renamedialog.h
+++ b/src/views/renamedialog.h
@@ -22,8 +22,8 @@
 
 #include "libdolphin_export.h"
 
-#include <kdialog.h>
-#include <kfileitem.h>
+#include <KDialog>
+#include <KFileItem>
 
 class KLineEdit;
 
diff --git a/src/views/selectionmanager.cpp b/src/views/selectionmanager.cpp
index 34203216e..731bcfc85 100644
--- a/src/views/selectionmanager.cpp
+++ b/src/views/selectionmanager.cpp
@@ -23,9 +23,9 @@
 #include "dolphin_generalsettings.h"
 #include "selectiontoggle.h"
 #include "settings/dolphinsettings.h"
-#include <kdirmodel.h>
-#include <kglobalsettings.h>
-#include <kiconeffect.h>
+#include <KDirModel>
+#include <KGlobalSettings>
+#include <KIconEffect>
 
 #include <QAbstractButton>
 #include <QAbstractItemView>
diff --git a/src/views/selectionmanager.h b/src/views/selectionmanager.h
index 9cab4f3a9..060b6dc04 100644
--- a/src/views/selectionmanager.h
+++ b/src/views/selectionmanager.h
@@ -20,7 +20,7 @@
 #ifndef SELECTIONMANAGER_H
 #define SELECTIONMANAGER_H
 
-#include <kfileitem.h>
+#include <KFileItem>
 
 #include <QObject>
 
diff --git a/src/views/selectiontoggle.cpp b/src/views/selectiontoggle.cpp
index c1272fa0f..40e0cfc10 100644
--- a/src/views/selectiontoggle.cpp
+++ b/src/views/selectiontoggle.cpp
@@ -19,11 +19,11 @@
 
 #include "selectiontoggle.h"
 
-#include <kglobalsettings.h>
-#include <kicon.h>
-#include <kiconloader.h>
-#include <kiconeffect.h>
-#include <klocale.h>
+#include <KGlobalSettings>
+#include <KIcon>
+#include <KIconLoader>
+#include <KIconEffect>
+#include <KLocale>
 
 #include <QApplication>
 #include <QPainter>
@@ -32,7 +32,7 @@
 #include <QTimer>
 #include <QTimeLine>
 
-#include <kdebug.h>
+#include <KDebug>
 
 SelectionToggle::SelectionToggle(QWidget* parent) :
     QAbstractButton(parent),
diff --git a/src/views/selectiontoggle.h b/src/views/selectiontoggle.h
index 210f1a3aa..43a0ff3d0 100644
--- a/src/views/selectiontoggle.h
+++ b/src/views/selectiontoggle.h
@@ -20,7 +20,7 @@
 #ifndef SELECTIONTOGGLE_H
 #define SELECTIONTOGGLE_H
 
-#include <kurl.h>
+#include <KUrl>
 
 #include <QAbstractButton>
 #include <QPixmap>
diff --git a/src/views/versioncontrol/pendingthreadsmaintainer.cpp b/src/views/versioncontrol/pendingthreadsmaintainer.cpp
index f61c79975..1e0953108 100644
--- a/src/views/versioncontrol/pendingthreadsmaintainer.cpp
+++ b/src/views/versioncontrol/pendingthreadsmaintainer.cpp
@@ -19,7 +19,7 @@
 
 #include "pendingthreadsmaintainer.h"
 
-#include <kglobal.h>
+#include <KGlobal>
 #include <QThread>
 #include <QTimer>
 
diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 9c3939632..76f175451 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -21,10 +21,10 @@
 
 #include "dolphin_versioncontrolsettings.h"
 
-#include <kdirlister.h>
-#include <klocale.h>
-#include <kservice.h>
-#include <kservicetypetrader.h>
+#include <KDirLister>
+#include <KLocale>
+#include <KService>
+#include <KServiceTypeTrader>
 #include <kversioncontrolplugin.h>
 
 #include "pendingthreadsmaintainer.h"
diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index eb1e74580..ecf78d05f 100644
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -22,7 +22,7 @@
 
 #include <libdolphin_export.h>
 
-#include <kfileitem.h>
+#include <KFileItem>
 #include <kversioncontrolplugin.h>
 #include <QList>
 #include <QMutex>
diff --git a/src/views/viewextensionsfactory.cpp b/src/views/viewextensionsfactory.cpp
index 7b51af248..f89a0cb85 100644
--- a/src/views/viewextensionsfactory.cpp
+++ b/src/views/viewextensionsfactory.cpp
@@ -33,9 +33,9 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <kdirlister.h>
-#include <kdirmodel.h>
-#include <kfilepreviewgenerator.h>
+#include <KDirLister>
+#include <KDirModel>
+#include <KFilePreviewGenerator>
 #include <QAbstractItemView>
 #include <QApplication>
 
diff --git a/src/views/viewmodecontroller.h b/src/views/viewmodecontroller.h
index 9435a21e6..59ea3e6b1 100644
--- a/src/views/viewmodecontroller.h
+++ b/src/views/viewmodecontroller.h
@@ -20,7 +20,7 @@
 #ifndef VIEWMODECONTROLLER_H
 #define VIEWMODECONTROLLER_H
 
-#include <kurl.h>
+#include <KUrl>
 #include <QObject>
 #include <libdolphin_export.h>
 #include <views/dolphinview.h>
diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 0e50dcec7..f6465e17d 100644
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -24,10 +24,10 @@
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
 
-#include <kcomponentdata.h>
-#include <klocale.h>
-#include <kstandarddirs.h>
-#include <kurl.h>
+#include <KComponentData>
+#include <KLocale>
+#include <KStandardDirs>
+#include <KUrl>
 
 #include <QDate>
 #include <QFile>
diff --git a/src/views/viewproperties.h b/src/views/viewproperties.h
index 787122d35..03e423e93 100644
--- a/src/views/viewproperties.h
+++ b/src/views/viewproperties.h
@@ -22,7 +22,7 @@
 #define VIEWPROPERTIES_H
 
 #include <views/dolphinview.h>
-#include <kurl.h>
+#include <KUrl>
 #include <libdolphin_export.h>
 
 class ViewPropertySettings;
diff --git a/src/views/zoomlevelinfo.cpp b/src/views/zoomlevelinfo.cpp
index 08e95e3ca..5c55ce7c6 100644
--- a/src/views/zoomlevelinfo.cpp
+++ b/src/views/zoomlevelinfo.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include "zoomlevelinfo.h"
-#include <kiconloader.h>
+#include <KIconLoader>
 #include <QSize>
 
 int ZoomLevelInfo::minimumLevel()
-- 
2.47.3