[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bkde-baseapps=5D_dolphin/src=3A_Use_capitalized_KDE_?=
From: Peter Penz <peter.penz19 () gmail ! com>
Date: 2011-02-04 14:43:50
Message-ID: 20110204144350.B9399A609B () git ! kde ! org
[Download RAW message or body]
Git commit c2598afdfa0276020ba650b3a561d7158d203aa5 by Peter Penz.
Committed on 04/02/11 at 15:43.
Pushed by ppenz into branch 'master'.
Use capitalized KDE includes
M +2 -2 dolphin/src/dolphinapplication.cpp
M +18 -18 dolphin/src/dolphincontextmenu.cpp
M +5 -6 dolphin/src/dolphincontextmenu.h
M +28 -28 dolphin/src/dolphinmainwindow.cpp
M +2 -2 dolphin/src/dolphinmainwindow.h
M +2 -2 dolphin/src/dolphinnewfilemenu.cpp
M +13 -13 dolphin/src/dolphinpart.cpp
M +15 -15 dolphin/src/dolphinviewcontainer.cpp
M +5 -5 dolphin/src/dolphinviewcontainer.h
M +4 -4 dolphin/src/filterbar/filterbar.cpp
M +3 -3 dolphin/src/main.cpp
M +6 -7 dolphin/src/panels/filter/filterpanel.cpp
M +1 -1 dolphin/src/panels/filter/filterpanel.h
M +3 -3 dolphin/src/panels/folders/folderspanel.cpp
M +1 -1 dolphin/src/panels/folders/folderspanel.h
M +1 -1 dolphin/src/panels/folders/paneltreeview.cpp
M +1 -1 dolphin/src/panels/folders/paneltreeview.h
M +7 -7 dolphin/src/panels/folders/treeviewcontextmenu.cpp
M +1 -1 dolphin/src/panels/folders/treeviewcontextmenu.h
M +1 -1 dolphin/src/panels/information/filemetadataconfigurationdialog.cpp \
M +2 -2 dolphin/src/panels/information/filemetadataconfigurationdialog.h
M +1 -1 dolphin/src/panels/information/informationpanel.cpp
M +10 -10 dolphin/src/panels/information/informationpanelcontent.cpp
M +4 -4 dolphin/src/panels/information/informationpanelcontent.h
M +8 -8 dolphin/src/panels/information/phononwidget.cpp
M +3 -3 dolphin/src/panels/information/phononwidget.h
M +1 -1 dolphin/src/panels/information/pixmapviewer.cpp
M +1 -1 dolphin/src/panels/panel.cpp
M +3 -3 dolphin/src/panels/panel.h
M +1 -1 dolphin/src/panels/places/placespanel.cpp
M +4 -4 dolphin/src/panels/terminal/terminalpanel.cpp
M +12 -12 dolphin/src/search/dolphinsearchbox.cpp
M +1 -1 dolphin/src/search/dolphinsearchbox.h
M +6 -6 dolphin/src/search/filenamesearchprotocol.cpp
M +1 -1 dolphin/src/settings/additionalinfodialog.cpp
M +2 -2 dolphin/src/settings/additionalinfodialog.h
M +3 -3 dolphin/src/settings/applyviewpropsjob.h
M +4 -4 dolphin/src/settings/dolphinsettings.cpp
M +3 -3 dolphin/src/settings/dolphinsettingsdialog.cpp
M +2 -2 dolphin/src/settings/general/behaviorsettingspage.cpp
M +1 -1 dolphin/src/settings/general/behaviorsettingspage.h
M +3 -3 dolphin/src/settings/general/contextmenusettingspage.cpp
M +4 -4 dolphin/src/settings/general/generalsettingspage.cpp
M +5 -5 dolphin/src/settings/general/previewssettingspage.cpp
M +3 -3 dolphin/src/settings/general/statusbarsettingspage.cpp
M +3 -3 dolphin/src/settings/kcm/kcmdolphingeneral.cpp
M +5 -5 dolphin/src/settings/kcm/kcmdolphinnavigation.cpp
M +5 -5 dolphin/src/settings/kcm/kcmdolphinservices.cpp
M +5 -5 dolphin/src/settings/kcm/kcmdolphinviewmodes.cpp
M +4 -4 dolphin/src/settings/navigation/navigationsettingspage.cpp
M +8 -8 dolphin/src/settings/services/servicessettingspage.cpp
M +1 -1 dolphin/src/settings/settingspagebase.h
M +5 -5 dolphin/src/settings/startup/startupsettingspage.cpp
M +1 -1 dolphin/src/settings/startup/startupsettingspage.h
M +2 -2 dolphin/src/settings/trash/trashsettingspage.cpp
M +3 -3 dolphin/src/settings/viewmodes/columnviewsettingspage.cpp
M +2 -2 dolphin/src/settings/viewmodes/detailsviewsettingspage.cpp
M +3 -3 dolphin/src/settings/viewmodes/dolphinfontrequester.cpp
M +1 -1 dolphin/src/settings/viewmodes/iconsizegroupbox.cpp
M +4 -4 dolphin/src/settings/viewmodes/iconsviewsettingspage.cpp
M +3 -3 dolphin/src/settings/viewmodes/viewsettingspage.cpp
M +1 -1 dolphin/src/settings/viewmodes/viewsettingspagebase.h
M +7 -7 dolphin/src/settings/viewpropertiesdialog.cpp
M +1 -1 dolphin/src/settings/viewpropertiesdialog.h
M +5 -5 dolphin/src/settings/viewpropsprogressinfo.cpp
M +2 -2 dolphin/src/settings/viewpropsprogressinfo.h
M +5 -5 dolphin/src/statusbar/dolphinstatusbar.cpp
M +2 -2 dolphin/src/statusbar/statusbarspaceinfo.cpp
M +1 -1 dolphin/src/statusbar/statusbarspaceinfo.h
M +3 -3 dolphin/src/tests/dolphintreeviewtest.cpp
M +1 -1 dolphin/src/tests/dolphinviewtest_allviewmodes.cpp
M +3 -3 dolphin/src/tests/testbase.cpp
M +1 -1 dolphin/src/tests/testbase.h
M +2 -2 dolphin/src/views/additionalinfoaccessor.cpp
M +1 -1 dolphin/src/views/additionalinfoaccessor.h
M +6 -6 dolphin/src/views/dolphincategorydrawer.cpp
M +8 -8 dolphin/src/views/dolphincolumnview.cpp
M +1 -1 dolphin/src/views/dolphincolumnview.h
M +1 -1 dolphin/src/views/dolphincolumnviewcontainer.h
M +4 -4 dolphin/src/views/dolphindetailsview.cpp
M +2 -2 dolphin/src/views/dolphindetailsviewexpander.cpp
M +1 -1 dolphin/src/views/dolphindirlister.cpp
M +1 -1 dolphin/src/views/dolphindirlister.h
M +5 -5 dolphin/src/views/dolphinfileitemdelegate.cpp
M +1 -1 dolphin/src/views/dolphinfileitemdelegate.h
M +3 -3 dolphin/src/views/dolphiniconsview.cpp
M +3 -3 dolphin/src/views/dolphiniconsview.h
M +10 -11 dolphin/src/views/dolphinmodel.cpp
M +1 -1 dolphin/src/views/dolphinmodel.h
M +1 -1 dolphin/src/views/dolphinnewfilemenuobserver.cpp
M +15 -15 dolphin/src/views/dolphinremoteencoding.cpp
M +2 -2 dolphin/src/views/dolphinremoteencoding.h
M +15 -15 dolphin/src/views/dolphinview.cpp
M +3 -3 dolphin/src/views/dolphinview.h
M +9 -10 dolphin/src/views/dolphinviewactionhandler.cpp
M +3 -3 dolphin/src/views/dolphinviewactionhandler.h
M +2 -2 dolphin/src/views/dolphinviewcontroller.cpp
M +2 -2 dolphin/src/views/dolphinviewcontroller.h
M +4 -4 dolphin/src/views/draganddrophelper.cpp
M +8 -8 dolphin/src/views/folderexpander.cpp
M +3 -3 dolphin/src/views/renamedialog.cpp
M +2 -2 dolphin/src/views/renamedialog.h
M +3 -3 dolphin/src/views/selectionmanager.cpp
M +1 -1 dolphin/src/views/selectionmanager.h
M +6 -6 dolphin/src/views/selectiontoggle.cpp
M +1 -1 dolphin/src/views/selectiontoggle.h
M +1 -1 dolphin/src/views/versioncontrol/pendingthreadsmaintainer.cpp
M +4 -4 dolphin/src/views/versioncontrol/versioncontrolobserver.cpp
M +1 -1 dolphin/src/views/versioncontrol/versioncontrolobserver.h
M +3 -3 dolphin/src/views/viewextensionsfactory.cpp
M +1 -1 dolphin/src/views/viewmodecontroller.h
M +4 -4 dolphin/src/views/viewproperties.cpp
M +1 -1 dolphin/src/views/viewproperties.h
M +1 -1 dolphin/src/views/zoomlevelinfo.cpp
http://commits.kde.org/kde-baseapps/c2598afdfa0276020ba650b3a561d7158d203aa5
diff --git a/dolphin/src/dolphinapplication.cpp b/dolphin/src/dolphinapplication.cpp
index 8b6139d..13a2b60 100644
--- a/dolphin/src/dolphinapplication.cpp
+++ b/dolphin/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/dolphin/src/dolphincontextmenu.cpp b/dolphin/src/dolphincontextmenu.cpp
index 7b8f1db..dacdc9c 100644
--- a/dolphin/src/dolphincontextmenu.cpp
+++ b/dolphin/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/dolphin/src/dolphincontextmenu.h b/dolphin/src/dolphincontextmenu.h
index f0eee23..3b1a2d9 100644
--- a/dolphin/src/dolphincontextmenu.h
+++ b/dolphin/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/dolphin/src/dolphinmainwindow.cpp b/dolphin/src/dolphinmainwindow.cpp
index 1c4a45b..f961008 100644
--- a/dolphin/src/dolphinmainwindow.cpp
+++ b/dolphin/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/dolphin/src/dolphinmainwindow.h b/dolphin/src/dolphinmainwindow.h
index 53d2231..8409975 100644
--- a/dolphin/src/dolphinmainwindow.h
+++ b/dolphin/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/dolphin/src/dolphinnewfilemenu.cpp b/dolphin/src/dolphinnewfilemenu.cpp
index c7ffb78..7dfd368 100644
--- a/dolphin/src/dolphinnewfilemenu.cpp
+++ b/dolphin/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/dolphin/src/dolphinpart.cpp b/dolphin/src/dolphinpart.cpp
index a039beb..99784de 100644
--- a/dolphin/src/dolphinpart.cpp
+++ b/dolphin/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/dolphin/src/dolphinviewcontainer.cpp \
b/dolphin/src/dolphinviewcontainer.cpp index 282230a..86aefe9 100644
--- a/dolphin/src/dolphinviewcontainer.cpp
+++ b/dolphin/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/dolphin/src/dolphinviewcontainer.h b/dolphin/src/dolphinviewcontainer.h
index db05316..5f9102c 100644
--- a/dolphin/src/dolphinviewcontainer.h
+++ b/dolphin/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/dolphin/src/filterbar/filterbar.cpp \
b/dolphin/src/filterbar/filterbar.cpp index 648469d..3f4b7c2 100644
--- a/dolphin/src/filterbar/filterbar.cpp
+++ b/dolphin/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/dolphin/src/main.cpp b/dolphin/src/main.cpp
index 71c59cd..2cc9ff5 100644
--- a/dolphin/src/main.cpp
+++ b/dolphin/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/dolphin/src/panels/filter/filterpanel.cpp \
b/dolphin/src/panels/filter/filterpanel.cpp index 1ee9ccb..5f27e73 100644
--- a/dolphin/src/panels/filter/filterpanel.cpp
+++ b/dolphin/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/dolphin/src/panels/filter/filterpanel.h \
b/dolphin/src/panels/filter/filterpanel.h index 8ccc62d..33c18c0 100644
--- a/dolphin/src/panels/filter/filterpanel.h
+++ b/dolphin/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/dolphin/src/panels/folders/folderspanel.cpp \
b/dolphin/src/panels/folders/folderspanel.cpp index 43d7b64..4e4efed 100644
--- a/dolphin/src/panels/folders/folderspanel.cpp
+++ b/dolphin/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/dolphin/src/panels/folders/folderspanel.h \
b/dolphin/src/panels/folders/folderspanel.h index 43ae7bd..6a90d3c 100644
--- a/dolphin/src/panels/folders/folderspanel.h
+++ b/dolphin/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/dolphin/src/panels/folders/paneltreeview.cpp \
b/dolphin/src/panels/folders/paneltreeview.cpp index 70cfdeb..514cee4 100644
--- a/dolphin/src/panels/folders/paneltreeview.cpp
+++ b/dolphin/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/dolphin/src/panels/folders/paneltreeview.h \
b/dolphin/src/panels/folders/paneltreeview.h index 0f09968..fff6ed0 100644
--- a/dolphin/src/panels/folders/paneltreeview.h
+++ b/dolphin/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/dolphin/src/panels/folders/treeviewcontextmenu.cpp \
b/dolphin/src/panels/folders/treeviewcontextmenu.cpp index 80a14b2..3048455 100644
--- a/dolphin/src/panels/folders/treeviewcontextmenu.cpp
+++ b/dolphin/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/dolphin/src/panels/folders/treeviewcontextmenu.h \
b/dolphin/src/panels/folders/treeviewcontextmenu.h index d7ebf09..6160339 100644
--- a/dolphin/src/panels/folders/treeviewcontextmenu.h
+++ b/dolphin/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/dolphin/src/panels/information/filemetadataconfigurationdialog.cpp \
b/dolphin/src/panels/information/filemetadataconfigurationdialog.cpp index \
04ff9a9..efbe784 100644
--- a/dolphin/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/dolphin/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/dolphin/src/panels/information/filemetadataconfigurationdialog.h \
b/dolphin/src/panels/information/filemetadataconfigurationdialog.h index \
dd9265c..e9b71bb 100644
--- a/dolphin/src/panels/information/filemetadataconfigurationdialog.h
+++ b/dolphin/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/dolphin/src/panels/information/informationpanel.cpp \
b/dolphin/src/panels/information/informationpanel.cpp index 7759d59..81afc14 100644
--- a/dolphin/src/panels/information/informationpanel.cpp
+++ b/dolphin/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/dolphin/src/panels/information/informationpanelcontent.cpp \
b/dolphin/src/panels/information/informationpanelcontent.cpp index e09ccdf..04e1306 \
100644
--- a/dolphin/src/panels/information/informationpanelcontent.cpp
+++ b/dolphin/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/dolphin/src/panels/information/informationpanelcontent.h \
b/dolphin/src/panels/information/informationpanelcontent.h index f6182d2..dfbc223 \
100644
--- a/dolphin/src/panels/information/informationpanelcontent.h
+++ b/dolphin/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/dolphin/src/panels/information/phononwidget.cpp \
b/dolphin/src/panels/information/phononwidget.cpp index a0bbcf2..b6da339 100644
--- a/dolphin/src/panels/information/phononwidget.cpp
+++ b/dolphin/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/dolphin/src/panels/information/phononwidget.h \
b/dolphin/src/panels/information/phononwidget.h index 196b87f..1e1ea37 100644
--- a/dolphin/src/panels/information/phononwidget.h
+++ b/dolphin/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/dolphin/src/panels/information/pixmapviewer.cpp \
b/dolphin/src/panels/information/pixmapviewer.cpp index 416e53f..afa4c2f 100644
--- a/dolphin/src/panels/information/pixmapviewer.cpp
+++ b/dolphin/src/panels/information/pixmapviewer.cpp
@@ -19,7 +19,7 @@
#include "pixmapviewer.h"
-#include <kiconloader.h>
+#include <KIconLoader>
#include <QLayout>
#include <QPainter>
diff --git a/dolphin/src/panels/panel.cpp b/dolphin/src/panels/panel.cpp
index f260861..712e3ef 100644
--- a/dolphin/src/panels/panel.cpp
+++ b/dolphin/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/dolphin/src/panels/panel.h b/dolphin/src/panels/panel.h
index 2e8d46e..6048cbc 100644
--- a/dolphin/src/panels/panel.h
+++ b/dolphin/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/dolphin/src/panels/places/placespanel.cpp \
b/dolphin/src/panels/places/placespanel.cpp index d2e3ef5..25e54b5 100644
--- a/dolphin/src/panels/places/placespanel.cpp
+++ b/dolphin/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/dolphin/src/panels/terminal/terminalpanel.cpp \
b/dolphin/src/panels/terminal/terminalpanel.cpp index 3c9c5bd..5dab059 100644
--- a/dolphin/src/panels/terminal/terminalpanel.cpp
+++ b/dolphin/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/dolphin/src/search/dolphinsearchbox.cpp \
b/dolphin/src/search/dolphinsearchbox.cpp index f9a7a0c..68dc9da 100644
--- a/dolphin/src/search/dolphinsearchbox.cpp
+++ b/dolphin/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/dolphin/src/search/dolphinsearchbox.h \
b/dolphin/src/search/dolphinsearchbox.h index 0537261..09d2233 100644
--- a/dolphin/src/search/dolphinsearchbox.h
+++ b/dolphin/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/dolphin/src/search/filenamesearchprotocol.cpp \
b/dolphin/src/search/filenamesearchprotocol.cpp index 4670888..ddc2378 100644
--- a/dolphin/src/search/filenamesearchprotocol.cpp
+++ b/dolphin/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/dolphin/src/settings/additionalinfodialog.cpp \
b/dolphin/src/settings/additionalinfodialog.cpp index ef08795..2e7d33c 100644
--- a/dolphin/src/settings/additionalinfodialog.cpp
+++ b/dolphin/src/settings/additionalinfodialog.cpp
@@ -19,7 +19,7 @@
#include "additionalinfodialog.h"
-#include <klocale.h>
+#include <KLocale>
#include <QCheckBox>
#include <QLabel>
diff --git a/dolphin/src/settings/additionalinfodialog.h \
b/dolphin/src/settings/additionalinfodialog.h index 54d23f2..eca2c86 100644
--- a/dolphin/src/settings/additionalinfodialog.h
+++ b/dolphin/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/dolphin/src/settings/applyviewpropsjob.h \
b/dolphin/src/settings/applyviewpropsjob.h index da18af9..4231817 100644
--- a/dolphin/src/settings/applyviewpropsjob.h
+++ b/dolphin/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/dolphin/src/settings/dolphinsettings.cpp \
b/dolphin/src/settings/dolphinsettings.cpp index 5b91001..7f160b1 100644
--- a/dolphin/src/settings/dolphinsettings.cpp
+++ b/dolphin/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/dolphin/src/settings/dolphinsettingsdialog.cpp \
b/dolphin/src/settings/dolphinsettingsdialog.cpp index 2a62fc1..6116485 100644
--- a/dolphin/src/settings/dolphinsettingsdialog.cpp
+++ b/dolphin/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/dolphin/src/settings/general/behaviorsettingspage.cpp \
b/dolphin/src/settings/general/behaviorsettingspage.cpp index 6d9fa9c..8143048 100644
--- a/dolphin/src/settings/general/behaviorsettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/general/behaviorsettingspage.h \
b/dolphin/src/settings/general/behaviorsettingspage.h index d92feb9..c9b8251 100644
--- a/dolphin/src/settings/general/behaviorsettingspage.h
+++ b/dolphin/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/dolphin/src/settings/general/contextmenusettingspage.cpp \
b/dolphin/src/settings/general/contextmenusettingspage.cpp index 592e25b..1b9f3a4 \
100644
--- a/dolphin/src/settings/general/contextmenusettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/general/generalsettingspage.cpp \
b/dolphin/src/settings/general/generalsettingspage.cpp index e156dad..dddefdd 100644
--- a/dolphin/src/settings/general/generalsettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/general/previewssettingspage.cpp \
b/dolphin/src/settings/general/previewssettingspage.cpp index ff5a878..1333df5 100644
--- a/dolphin/src/settings/general/previewssettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/general/statusbarsettingspage.cpp \
b/dolphin/src/settings/general/statusbarsettingspage.cpp index 4d9b9a3..8c3833e \
100644
--- a/dolphin/src/settings/general/statusbarsettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/kcm/kcmdolphingeneral.cpp \
b/dolphin/src/settings/kcm/kcmdolphingeneral.cpp index fb4a643..587c4df 100644
--- a/dolphin/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/dolphin/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/dolphin/src/settings/kcm/kcmdolphinnavigation.cpp \
b/dolphin/src/settings/kcm/kcmdolphinnavigation.cpp index fdf9de5..f4861b0 100644
--- a/dolphin/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/dolphin/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/dolphin/src/settings/kcm/kcmdolphinservices.cpp \
b/dolphin/src/settings/kcm/kcmdolphinservices.cpp index 22e4e32..82c4275 100644
--- a/dolphin/src/settings/kcm/kcmdolphinservices.cpp
+++ b/dolphin/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/dolphin/src/settings/kcm/kcmdolphinviewmodes.cpp \
b/dolphin/src/settings/kcm/kcmdolphinviewmodes.cpp index e24d549..2a3666d 100644
--- a/dolphin/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/dolphin/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/dolphin/src/settings/navigation/navigationsettingspage.cpp \
b/dolphin/src/settings/navigation/navigationsettingspage.cpp index 00ea3aa..062edc2 \
100644
--- a/dolphin/src/settings/navigation/navigationsettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/services/servicessettingspage.cpp \
b/dolphin/src/settings/services/servicessettingspage.cpp index 1756071..bc4de09 \
100644
--- a/dolphin/src/settings/services/servicessettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/settingspagebase.h \
b/dolphin/src/settings/settingspagebase.h index 05f907a..65b8782 100644
--- a/dolphin/src/settings/settingspagebase.h
+++ b/dolphin/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/dolphin/src/settings/startup/startupsettingspage.cpp \
b/dolphin/src/settings/startup/startupsettingspage.cpp index c3fdbc6..47da64d 100644
--- a/dolphin/src/settings/startup/startupsettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/startup/startupsettingspage.h \
b/dolphin/src/settings/startup/startupsettingspage.h index d749e5e..1c53ccc 100644
--- a/dolphin/src/settings/startup/startupsettingspage.h
+++ b/dolphin/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/dolphin/src/settings/trash/trashsettingspage.cpp \
b/dolphin/src/settings/trash/trashsettingspage.cpp index f507cba..b8294bf 100644
--- a/dolphin/src/settings/trash/trashsettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/viewmodes/columnviewsettingspage.cpp \
b/dolphin/src/settings/viewmodes/columnviewsettingspage.cpp index 0919e16..3bacca4 \
100644
--- a/dolphin/src/settings/viewmodes/columnviewsettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/viewmodes/detailsviewsettingspage.cpp \
b/dolphin/src/settings/viewmodes/detailsviewsettingspage.cpp index 79fedd5..321f7eb \
100644
--- a/dolphin/src/settings/viewmodes/detailsviewsettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/viewmodes/dolphinfontrequester.cpp \
b/dolphin/src/settings/viewmodes/dolphinfontrequester.cpp index 04c5ed5..4e23b2d \
100644
--- a/dolphin/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/dolphin/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/dolphin/src/settings/viewmodes/iconsizegroupbox.cpp \
b/dolphin/src/settings/viewmodes/iconsizegroupbox.cpp index 900c75b..76fb1fb 100644
--- a/dolphin/src/settings/viewmodes/iconsizegroupbox.cpp
+++ b/dolphin/src/settings/viewmodes/iconsizegroupbox.cpp
@@ -19,7 +19,7 @@
#include "iconsizegroupbox.h"
-#include <klocale.h>
+#include <KLocale>
#include <QApplication>
#include <QGridLayout>
diff --git a/dolphin/src/settings/viewmodes/iconsviewsettingspage.cpp \
b/dolphin/src/settings/viewmodes/iconsviewsettingspage.cpp index a711254..8c146f0 \
100644
--- a/dolphin/src/settings/viewmodes/iconsviewsettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/viewmodes/viewsettingspage.cpp \
b/dolphin/src/settings/viewmodes/viewsettingspage.cpp index deb7a31..6d9a704 100644
--- a/dolphin/src/settings/viewmodes/viewsettingspage.cpp
+++ b/dolphin/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/dolphin/src/settings/viewmodes/viewsettingspagebase.h \
b/dolphin/src/settings/viewmodes/viewsettingspagebase.h index 3e85e25..5412533 100644
--- a/dolphin/src/settings/viewmodes/viewsettingspagebase.h
+++ b/dolphin/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/dolphin/src/settings/viewpropertiesdialog.cpp \
b/dolphin/src/settings/viewpropertiesdialog.cpp index 7830616..f52bd12 100644
--- a/dolphin/src/settings/viewpropertiesdialog.cpp
+++ b/dolphin/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/dolphin/src/settings/viewpropertiesdialog.h \
b/dolphin/src/settings/viewpropertiesdialog.h index ce0c3e5..d2170f3 100644
--- a/dolphin/src/settings/viewpropertiesdialog.h
+++ b/dolphin/src/settings/viewpropertiesdialog.h
@@ -23,7 +23,7 @@
#include "libdolphin_export.h"
-#include <kdialog.h>
+#include <KDialog>
class QCheckBox;
class KComboBox;
diff --git a/dolphin/src/settings/viewpropsprogressinfo.cpp \
b/dolphin/src/settings/viewpropsprogressinfo.cpp index 436dcde..c98b238 100644
--- a/dolphin/src/settings/viewpropsprogressinfo.cpp
+++ b/dolphin/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/dolphin/src/settings/viewpropsprogressinfo.h \
b/dolphin/src/settings/viewpropsprogressinfo.h index d07d16d..6f8c763 100644
--- a/dolphin/src/settings/viewpropsprogressinfo.h
+++ b/dolphin/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/dolphin/src/statusbar/dolphinstatusbar.cpp \
b/dolphin/src/statusbar/dolphinstatusbar.cpp index dfa5be2..987b1dc 100644
--- a/dolphin/src/statusbar/dolphinstatusbar.cpp
+++ b/dolphin/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/dolphin/src/statusbar/statusbarspaceinfo.cpp \
b/dolphin/src/statusbar/statusbarspaceinfo.cpp index a601d43..a25fa3a 100644
--- a/dolphin/src/statusbar/statusbarspaceinfo.cpp
+++ b/dolphin/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/dolphin/src/statusbar/statusbarspaceinfo.h \
b/dolphin/src/statusbar/statusbarspaceinfo.h index 7650c35..0a563ad 100644
--- a/dolphin/src/statusbar/statusbarspaceinfo.h
+++ b/dolphin/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/dolphin/src/tests/dolphintreeviewtest.cpp \
b/dolphin/src/tests/dolphintreeviewtest.cpp index 61922ac..afcd34d 100644
--- a/dolphin/src/tests/dolphintreeviewtest.cpp
+++ b/dolphin/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/dolphin/src/tests/dolphinviewtest_allviewmodes.cpp \
b/dolphin/src/tests/dolphinviewtest_allviewmodes.cpp index fada6c3..9d4876f 100644
--- a/dolphin/src/tests/dolphinviewtest_allviewmodes.cpp
+++ b/dolphin/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/dolphin/src/tests/testbase.cpp b/dolphin/src/tests/testbase.cpp
index 1cb3267..a0031d0 100644
--- a/dolphin/src/tests/testbase.cpp
+++ b/dolphin/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/dolphin/src/tests/testbase.h b/dolphin/src/tests/testbase.h
index d197a3f..7e6ff4b 100644
--- a/dolphin/src/tests/testbase.h
+++ b/dolphin/src/tests/testbase.h
@@ -22,7 +22,7 @@
#include <KUrl>
-#include <QtCore/QDateTime>
+#include <QDateTime>
class KTempDir;
class QAbstractItemView;
diff --git a/dolphin/src/views/additionalinfoaccessor.cpp \
b/dolphin/src/views/additionalinfoaccessor.cpp index cafc4fa..426d7a2 100644
--- a/dolphin/src/views/additionalinfoaccessor.cpp
+++ b/dolphin/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/dolphin/src/views/additionalinfoaccessor.h \
b/dolphin/src/views/additionalinfoaccessor.h index b3d5640..dbec097 100644
--- a/dolphin/src/views/additionalinfoaccessor.h
+++ b/dolphin/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/dolphin/src/views/dolphincategorydrawer.cpp \
b/dolphin/src/views/dolphincategorydrawer.cpp index d711846..1f39133 100644
--- a/dolphin/src/views/dolphincategorydrawer.cpp
+++ b/dolphin/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/dolphin/src/views/dolphincolumnview.cpp \
b/dolphin/src/views/dolphincolumnview.cpp index 52d86f1..464e0a0 100644
--- a/dolphin/src/views/dolphincolumnview.cpp
+++ b/dolphin/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/dolphin/src/views/dolphincolumnview.h \
b/dolphin/src/views/dolphincolumnview.h index 72130c8..231ba59 100644
--- a/dolphin/src/views/dolphincolumnview.h
+++ b/dolphin/src/views/dolphincolumnview.h
@@ -27,7 +27,7 @@
#include <QSize>
#include <QStyleOption>
-#include <kurl.h>
+#include <KUrl>
class DolphinColumnViewContainer;
class DolphinModel;
diff --git a/dolphin/src/views/dolphincolumnviewcontainer.h \
b/dolphin/src/views/dolphincolumnviewcontainer.h index 20ae81b..c27caff 100644
--- a/dolphin/src/views/dolphincolumnviewcontainer.h
+++ b/dolphin/src/views/dolphincolumnviewcontainer.h
@@ -22,7 +22,7 @@
#include "dolphinview.h"
-#include <kurl.h>
+#include <KUrl>
#include <QList>
#include <QScrollArea>
diff --git a/dolphin/src/views/dolphindetailsview.cpp \
b/dolphin/src/views/dolphindetailsview.cpp index d434a4b..482925a 100644
--- a/dolphin/src/views/dolphindetailsview.cpp
+++ b/dolphin/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/dolphin/src/views/dolphindetailsviewexpander.cpp \
b/dolphin/src/views/dolphindetailsviewexpander.cpp index 0f3d3fd..c2734ed 100644
--- a/dolphin/src/views/dolphindetailsviewexpander.cpp
+++ b/dolphin/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/dolphin/src/views/dolphindirlister.cpp \
b/dolphin/src/views/dolphindirlister.cpp index 2eac552..81ad20b 100644
--- a/dolphin/src/views/dolphindirlister.cpp
+++ b/dolphin/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/dolphin/src/views/dolphindirlister.h \
b/dolphin/src/views/dolphindirlister.h index 0549c3c..a9e0439 100644
--- a/dolphin/src/views/dolphindirlister.h
+++ b/dolphin/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/dolphin/src/views/dolphinfileitemdelegate.cpp \
b/dolphin/src/views/dolphinfileitemdelegate.cpp index 0372ce6..a3046eb 100644
--- a/dolphin/src/views/dolphinfileitemdelegate.cpp
+++ b/dolphin/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/dolphin/src/views/dolphinfileitemdelegate.h \
b/dolphin/src/views/dolphinfileitemdelegate.h index afe8899..252b261 100644
--- a/dolphin/src/views/dolphinfileitemdelegate.h
+++ b/dolphin/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/dolphin/src/views/dolphiniconsview.cpp \
b/dolphin/src/views/dolphiniconsview.cpp index f047697..301748e 100644
--- a/dolphin/src/views/dolphiniconsview.cpp
+++ b/dolphin/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/dolphin/src/views/dolphiniconsview.h \
b/dolphin/src/views/dolphiniconsview.h index 0f6f716..8f77fc9 100644
--- a/dolphin/src/views/dolphiniconsview.h
+++ b/dolphin/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/dolphin/src/views/dolphinmodel.cpp b/dolphin/src/views/dolphinmodel.cpp
index 6474a4f..c999dfa 100644
--- a/dolphin/src/views/dolphinmodel.cpp
+++ b/dolphin/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/dolphin/src/views/dolphinmodel.h b/dolphin/src/views/dolphinmodel.h
index 930b4e8..2f6d1f0 100644
--- a/dolphin/src/views/dolphinmodel.h
+++ b/dolphin/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/dolphin/src/views/dolphinnewfilemenuobserver.cpp \
b/dolphin/src/views/dolphinnewfilemenuobserver.cpp index 50a755b..baddc16 100644
--- a/dolphin/src/views/dolphinnewfilemenuobserver.cpp
+++ b/dolphin/src/views/dolphinnewfilemenuobserver.cpp
@@ -19,7 +19,7 @@
#include "dolphinnewfilemenuobserver.h"
-#include <kglobal.h>
+#include <KGlobal>
#include <knewmenu.h>
class DolphinNewFileMenuObserverSingleton
diff --git a/dolphin/src/views/dolphinremoteencoding.cpp \
b/dolphin/src/views/dolphinremoteencoding.cpp index 397eacc..f3bd157 100644
--- a/dolphin/src/views/dolphinremoteencoding.cpp
+++ b/dolphin/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/dolphin/src/views/dolphinremoteencoding.h \
b/dolphin/src/views/dolphinremoteencoding.h index 54499f7..559bc66 100644
--- a/dolphin/src/views/dolphinremoteencoding.h
+++ b/dolphin/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/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
index ae124c7..a4e97bf 100644
--- a/dolphin/src/views/dolphinview.cpp
+++ b/dolphin/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/dolphin/src/views/dolphinview.h b/dolphin/src/views/dolphinview.h
index 04b821e..bd24283 100644
--- a/dolphin/src/views/dolphinview.h
+++ b/dolphin/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/dolphin/src/views/dolphinviewactionhandler.cpp \
b/dolphin/src/views/dolphinviewactionhandler.cpp index 9c0d33f..a8b044a 100644
--- a/dolphin/src/views/dolphinviewactionhandler.cpp
+++ b/dolphin/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/dolphin/src/views/dolphinviewactionhandler.h \
b/dolphin/src/views/dolphinviewactionhandler.h index 05339ce..72e7683 100644
--- a/dolphin/src/views/dolphinviewactionhandler.h
+++ b/dolphin/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/dolphin/src/views/dolphinviewcontroller.cpp \
b/dolphin/src/views/dolphinviewcontroller.cpp index 6749eaa..98d548d 100644
--- a/dolphin/src/views/dolphinviewcontroller.cpp
+++ b/dolphin/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/dolphin/src/views/dolphinviewcontroller.h \
b/dolphin/src/views/dolphinviewcontroller.h index 07bc569..1ad8fab 100644
--- a/dolphin/src/views/dolphinviewcontroller.h
+++ b/dolphin/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/dolphin/src/views/draganddrophelper.cpp \
b/dolphin/src/views/draganddrophelper.cpp index 9708415..749c828 100644
--- a/dolphin/src/views/draganddrophelper.cpp
+++ b/dolphin/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/dolphin/src/views/folderexpander.cpp \
b/dolphin/src/views/folderexpander.cpp index a2dfb13..4e22fdb 100644
--- a/dolphin/src/views/folderexpander.cpp
+++ b/dolphin/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/dolphin/src/views/renamedialog.cpp b/dolphin/src/views/renamedialog.cpp
index 2b56d92..864cfe2 100644
--- a/dolphin/src/views/renamedialog.cpp
+++ b/dolphin/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/dolphin/src/views/renamedialog.h b/dolphin/src/views/renamedialog.h
index 7341409..8d8b73d 100644
--- a/dolphin/src/views/renamedialog.h
+++ b/dolphin/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/dolphin/src/views/selectionmanager.cpp \
b/dolphin/src/views/selectionmanager.cpp index 3420321..731bcfc 100644
--- a/dolphin/src/views/selectionmanager.cpp
+++ b/dolphin/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/dolphin/src/views/selectionmanager.h \
b/dolphin/src/views/selectionmanager.h index 9cab4f3..060b6dc 100644
--- a/dolphin/src/views/selectionmanager.h
+++ b/dolphin/src/views/selectionmanager.h
@@ -20,7 +20,7 @@
#ifndef SELECTIONMANAGER_H
#define SELECTIONMANAGER_H
-#include <kfileitem.h>
+#include <KFileItem>
#include <QObject>
diff --git a/dolphin/src/views/selectiontoggle.cpp \
b/dolphin/src/views/selectiontoggle.cpp index c1272fa..40e0cfc 100644
--- a/dolphin/src/views/selectiontoggle.cpp
+++ b/dolphin/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/dolphin/src/views/selectiontoggle.h \
b/dolphin/src/views/selectiontoggle.h index 210f1a3..43a0ff3 100644
--- a/dolphin/src/views/selectiontoggle.h
+++ b/dolphin/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/dolphin/src/views/versioncontrol/pendingthreadsmaintainer.cpp \
b/dolphin/src/views/versioncontrol/pendingthreadsmaintainer.cpp index \
f61c799..1e09531 100644
--- a/dolphin/src/views/versioncontrol/pendingthreadsmaintainer.cpp
+++ b/dolphin/src/views/versioncontrol/pendingthreadsmaintainer.cpp
@@ -19,7 +19,7 @@
#include "pendingthreadsmaintainer.h"
-#include <kglobal.h>
+#include <KGlobal>
#include <QThread>
#include <QTimer>
diff --git a/dolphin/src/views/versioncontrol/versioncontrolobserver.cpp \
b/dolphin/src/views/versioncontrol/versioncontrolobserver.cpp index 9c39396..76f1754 \
100644
--- a/dolphin/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/dolphin/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/dolphin/src/views/versioncontrol/versioncontrolobserver.h \
b/dolphin/src/views/versioncontrol/versioncontrolobserver.h index eb1e745..ecf78d0 \
100644
--- a/dolphin/src/views/versioncontrol/versioncontrolobserver.h
+++ b/dolphin/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/dolphin/src/views/viewextensionsfactory.cpp \
b/dolphin/src/views/viewextensionsfactory.cpp index 7b51af2..f89a0cb 100644
--- a/dolphin/src/views/viewextensionsfactory.cpp
+++ b/dolphin/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/dolphin/src/views/viewmodecontroller.h \
b/dolphin/src/views/viewmodecontroller.h index 9435a21..59ea3e6 100644
--- a/dolphin/src/views/viewmodecontroller.h
+++ b/dolphin/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/dolphin/src/views/viewproperties.cpp \
b/dolphin/src/views/viewproperties.cpp index 0e50dce..f6465e1 100644
--- a/dolphin/src/views/viewproperties.cpp
+++ b/dolphin/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/dolphin/src/views/viewproperties.h b/dolphin/src/views/viewproperties.h
index 787122d..03e423e 100644
--- a/dolphin/src/views/viewproperties.h
+++ b/dolphin/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/dolphin/src/views/zoomlevelinfo.cpp \
b/dolphin/src/views/zoomlevelinfo.cpp index 08e95e3..5c55ce7 100644
--- a/dolphin/src/views/zoomlevelinfo.cpp
+++ b/dolphin/src/views/zoomlevelinfo.cpp
@@ -18,7 +18,7 @@
***************************************************************************/
#include "zoomlevelinfo.h"
-#include <kiconloader.h>
+#include <KIconLoader>
#include <QSize>
int ZoomLevelInfo::minimumLevel()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic