Use capitalized KDE includes

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 8b6139d925257bbe3ab9118acb4d4119baec7d7b..13a2b60d8462ed9f9d072cf0c768f3f79406a184 100644 (file)
--- 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 7b8f1db30bb7e88b1d565e98ffffc2bd757f70ee..dacdc9c83b5011fe7cd8a5520c6754f3a4ff9f52 100644 (file)
--- 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 f0eee235f04bee48682ae8aa3ef33358d2d196b6..3b1a2d9a1df013ebfe88e3a0f4d2c02314efa8b3 100644 (file)
--- 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 1c4a45bda5d868c9d6a0a660f94174f8e7bf92e4..f961008e1436d6fad0fd2d0d2b7413bc4517c606 100644 (file)
--- 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 53d223176bb09c25e86a512e7a25e2935599e7b3..8409975989baf1bff19e32eb43a68302ad518715 100644 (file)
--- 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 c7ffb788e395ae68deefefd3763a047b116aaf8f..7dfd368893875cc359bba0db3b2a54ba1e00174f 100644 (file)
--- 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 a039beb1fcdf4a9d4161493a54d6ef6af4e9a482..99784de1a8fdacabab457b3482dd185bb2d5e305 100644 (file)
--- 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 282230ab98be7f3160e948ac699b0bf00995b343..86aefe959d776ee7d4b5762bc24b8ba1df8b9857 100644 (file)
--- 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 db05316a5e58a974573c446ce8fd5640dd287473..5f9102c8377051fc8709d777fe5bae73260a0eb8 100644 (file)
--- 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 648469df7fb55401fe6e9812cada5bfcf1546966..3f4b7c219d0060c352570fc10e350e203afca4ab 100644 (file)
--- 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 71c59cdac2ca33597c49057e6a576a5fe0f66bfb..2cc9ff5d927d0d2989a1c321cc1f1995e444216f 100644 (file)
--- 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 1ee9ccba4370c36a97f37d7582f08b51d590473f..5f27e73eb147673ea196123aa60b999e62cf86c7 100644 (file)
--- 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 8ccc62d6312dfb83f98e8600ec4f0fbae0731764..33c18c0b30caf900c8c87c120784028f9c9933e0 100644 (file)
--- 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 43d7b64124bdc1777b3764185a2957495156b036..4e4efed445a849415492d1eaa2f41fe3fa1d333e 100644 (file)
--- 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 43ae7bdd97a38bcd4c5e5d4181f56ed2de643f51..6a90d3cd66eed557430cd35e4b6310506304c264 100644 (file)
--- 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 70cfdeb1d3b772ee27e10de1827f872a3d4d0363..514cee42311616eca856e02787a97deb94c4d986 100644 (file)
--- 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 0f099687535850ba61791c147859b4ae4de24ad0..fff6ed0d4d8842f2074bb6e0eb17da235571c260 100644 (file)
--- 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 80a14b21d7f17a47b83d208c50ddbd64af979de7..30484551c1eb5517227bb9a86d633d977657dc2c 100644 (file)
--- 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 d7ebf09996f684284c536ea993e0d785ac589b78..6160339f36bd42ee0146bea82ae478103232449f 100644 (file)
--- 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 04ff9a91b074dbc9c15eaeb870688d77fa5b8c6a..efbe784a4cc7ca4da45e34880423713214c059f6 100644 (file)
--- 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 dd9265c258dd0d6ad048c12aa23a751095135762..e9b71bb3b5f6e3ded05a87d0a5f2dfbf3e7f1b4f 100644 (file)
--- 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 7759d591a3e4ab6437475914a4cd21c7cff749d1..81afc1487532b9f4160ce0655dda31effbbb821c 100644 (file)
--- 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 e09ccdf5ce53145242e9ff7233aa46b00b7a5724..04e13060d23501afd2675a49a3743469256ca093 100644 (file)
--- 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 f6182d2df7b89e38edf7504d6161607d514fb6b0..dfbc2233b9431ab235a4030d80f5ba4ae4436760 100644 (file)
--- 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 a0bbcf2106289f9f102c819705118e5d73f0b359..b6da339eaf6da36065e3c1b100f02f11ef290a89 100644 (file)
--- 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 196b87f879c6274c1d2f8f2002462f8998839343..1e1ea37e9b4c892879756e41b40a1a1ea6e7be37 100644 (file)
--- 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 416e53f1faa9d291ece142bd6cabc011f9a1f4b6..afa4c2f282d655a41a37bfcde7e1ac8f138b8d44 100644 (file)
--- 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 f26086159b4441573695ea80e5f636d456a3902e..712e3ef5f329b4361e1ecd8753e6a74a8a1d5e98 100644 (file)
--- 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 2e8d46e409fd9fee98e6d58d9b0912efb5643256..6048cbcc34e61b7f511a55b5612637cbf3d4b634 100644 (file)
--- 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 d2e3ef5702c83f6186f770b3af091af7e5d8c55b..25e54b54422b90c85f08319145a0f9173a77357b 100644 (file)
--- 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 3c9c5bd75820aecd0da9d2681b7975bb676aba28..5dab059f2082add1d2de7b2c28fb61eee58eb3ea 100644 (file)
--- 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 f9a7a0cf20f80ba0af59a5a11f68aa5072b070f2..68dc9da3cd0b12425140a008468737f116e4ff6a 100644 (file)
--- 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 05372612345e9ca980582383ee7aa2de8fe1e332..09d2233558f4c13c19aa5e340bfc4651f86fa864 100644 (file)
--- 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 4670888aa46da6958261fefb17cd764d2a292da5..ddc23789c865544ba77e12d201826a686f44631c 100644 (file)
--- 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 ef08795e5808698a04f34b6060ff2b780eebbe23..2e7d33cb30d21c8f8ece6422787d196d79f2246f 100644 (file)
--- 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 54d23f2e34f9729b460c809f9cba8b81b4a87e82..eca2c86c6f6606fb3d7295ac6d372f5f2eeb6368 100644 (file)
--- 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 da18af966d28968d9fc9dc334ac4ed1c53abb518..42318176104bd53c9938b98ec15acb535ffbd6aa 100644 (file)
--- 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 5b91001eff8af499b675cc901076298800b12b17..7f160b1410c6c41c77dc7ccf75a6775ecac941c0 100644 (file)
--- 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 2a62fc1cf5f14b4a7bb96658686c34f18cfa58e3..61164856124e8a2d47fa129eb7e5ccc4ebe46df4 100644 (file)
--- 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 6d9fa9c0e11d32f84fe0ab4c6c29ae4b8f454692..814304801c3c6c1aa611824b7ff4cae40fadf78f 100644 (file)
--- 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 d92feb939933cc78f5edb34555f9349030ccfe04..c9b8251280606656d9ccd9ed8f34c2fdadf5d64c 100644 (file)
--- 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 592e25ba7667d326e4946eacd94a023e9e9118cf..1b9f3a482d92dfc58c26d75a0c03d4d21c7f1a5e 100644 (file)
--- 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 e156dadfc4bcbf45c8d7bf7544dfa031621446a2..dddefdd5c2d8301ee23ab05d4fcf4feb2077c9e8 100644 (file)
--- 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 ff5a878f65e39d74bc94b716529b446dd21eefda..1333df5e92a74fb7f4481c552b67029641658f37 100644 (file)
--- 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 4d9b9a3f2c7257fb58708a0e015717979bc54fb4..8c3833ec4a152e508ac0a4a638f04558349c075d 100644 (file)
--- 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 fb4a643ea1389df7384fddf8227955a1cadd358d..587c4df2941ab8dc1a81dbc9afd8765d928ad781 100644 (file)
--- 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 fdf9de55043f30ccf08d56599c73e27730ded2f4..f4861b065048dd329db639168044cc16cdfe9ffa 100644 (file)
--- 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 22e4e32ccfbfa0a06db0b898602fdcb8ba35d563..82c4275a377b6603590ed2b78ce3ecaa0383f9fd 100644 (file)
--- 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 e24d549e02da2340700f5208fa2340f8706c0f34..2a3666d8026d8e255ac4306cd66b98d4e9ee02f6 100644 (file)
--- 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 00ea3aad3ea59b3f91eeeeda31df4c8a94d4d82a..062edc24a6aabd03bf6c4eb903cac3cf0251453a 100644 (file)
--- 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 17560714c4795b5738d475bae9ff3c83bfb02b5a..bc4de0939dd78aa56ff134b8a28767d272c3ac14 100644 (file)
--- 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 05f907aac1576a95f8b4db551baa9c8bae096a9a..65b8782f9037544884de886f83484014438cf6f1 100644 (file)
--- 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 c3fdbc656e824a3082a74c081e0635a528bf75cd..47da64d0a67674d37f0191a94b638dfcf3d59e9f 100644 (file)
--- 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 d749e5e0ee9fb2fd33bdf062a843bc409a563f81..1c53cccdf753266612bd225ec8dd118b40479a10 100644 (file)
--- 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 f507cbab5baf4182717b87f2bc08c5cb43af57a9..b8294bffd126440b278d3e7d0354a6a196b9e9b9 100644 (file)
--- 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 0919e1618ff03f36df7dbe737ea7f6109fa0d441..3bacca4badfd8300cd0e7e8a4817de8cef9e4497 100644 (file)
--- 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 79fedd5102187dbc86e31ca088381337c5b5bba2..321f7eb0ecef919dc5b1d2ba49ff49aea9a3b636 100644 (file)
--- 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 04c5ed586f12cc286eafe0ec8342d73d03a597e3..4e23b2d471f2d6ecc5d246e1f47fd61c5dd5b7d0 100644 (file)
--- 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 900c75b2c811a704928c90e58b218acd65fc64fa..76fb1fb5799a055401cb853ac7124ac5e1c676e9 100644 (file)
--- 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 a711254c339f3f6d5cb51b38b3ef7ed04165853b..8c146f0143b905d48457ce92866f0e7262078a49 100644 (file)
--- 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 deb7a31bb6beb3667ccdaa72b2ef6e28181debb0..6d9a704667b6872a56063a8b507a0c5d47bd4bbd 100644 (file)
--- 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 3e85e25cb6dc335bd2a01c52761d3bd5f3d1a8e5..54125335598ffe20ac01e1dc23940fb91d378a89 100644 (file)
--- 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 7830616d0cf55d212566f2a97acb269d7820ab00..f52bd12d2c4788421b189c38b2d6f5a1a73de9e0 100644 (file)
--- 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 ce0c3e5b8ee7ae26c1285ddca17ace0b214718a6..d2170f33181978ee4a32debc888dff2ad9598386 100644 (file)
--- 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 436dcdef6bd024264a5ccb4f254c8175b4e4c3a6..c98b238661f04453515e8a490e5ef9d6c843eacc 100644 (file)
--- 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 d07d16d67481c2a2e858b9262aa172ec4757b9c5..6f8c763c3df911dc45c0641eb1822cdc738ee5d5 100644 (file)
--- 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 dfa5be21c36cfab8b05cd18f4c0dce02b30157cd..987b1dca6fb25616e3b403eb01b0c072bd40f274 100644 (file)
--- 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 a601d4367e39e4ae2bc0a04e97249a0220605fd6..a25fa3a3e2222cc8ee09a034339ace8de1f3b383 100644 (file)
--- 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 7650c357fea395badc7e62646d96e11adb968a1b..0a563ad13fb78d732f3b13b34689f9a533c61b73 100644 (file)
--- 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 61922acd77ee3bda5fdc426b277b5d29fb32c75b..afcd34d2b4cd6555dac22d2d5e455a9541d3292d 100644 (file)
--- 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 fada6c3b5a28049c2569d29efc06bbbaaa115622..9d4876fd8f15a8689700fe6d4684b8346e274f3f 100644 (file)
--- 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 1cb326766c71984a50ff19b92fef17f2fb76b2f2..a0031d0f5e22e458c95b2d8e93205625392df235 100644 (file)
--- 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 d197a3f9280936088894ac3918c77b8b19f4d1ce..7e6ff4bb50ccd438eb078b596ca09e9ad9ee7bd9 100644 (file)
--- 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 cafc4fa23d4e604149ac5acd8c16ce481b985854..426d7a2c4b6d37e9e975dd7c1f33e3eec3b95d92 100644 (file)
--- 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 b3d564088618200679d49733548d457b6cbb2405..dbec097fdf999029f5ff520bd3ef2afcb7597d8e 100644 (file)
--- 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 d71184637eb5d59d73a43fc1621124de0d6b6922..1f39133ab3b6fa9ffe6b8f0b1ca7130eb683285a 100644 (file)
--- 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 52d86f121b52c167532104ef8bb03213fb2f761a..464e0a068bc08a0556716bdf1a928f865a4e5195 100644 (file)
--- 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 72130c8f431729b98598db28be8d6a950a6a814f..231ba59abb70fdeec57ebfceb5d111c170926e7e 100644 (file)
--- 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 20ae81b38921d80321ff02194988bf3f698b68e5..c27caff62ee587f94bfe9e1a848c6a4f66f3cf91 100644 (file)
--- 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 d434a4b3d2ec1f0d35b6a629fe11cfdff017c3a9..482925aaa3ee7cb1175885b6e162910227fd468b 100644 (file)
--- 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 0f3d3fde19046e61b50022aa2e5ff47f97606828..c2734ed3a6cc333d60dda1dc331ecaf80c9da916 100644 (file)
--- 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 2eac5522da27da05f6cb930e7b36eb3da823a599..81ad20b2652a76465e1a33002a86436bd7184749 100644 (file)
--- 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 0549c3c8f6677dc66ff560b99cb277ecc8cdf1df..a9e0439923dc662f404ffe017b3eabda8a001dff 100644 (file)
--- 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 0372ce674b8354a7b3a3d1148121fa69fd330bd9..a3046ebbac5e5e79582e91fe1f839e92cb64a49c 100644 (file)
--- 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 afe88997e8eff27e5108844968f89c976de50088..252b261e0fd1018fe943d4372baf15de6d753182 100644 (file)
--- 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 f04769762872d2d36f6c6cc7ac93199cc2add95f..301748e15570e26aa5d9a7ef21eb3613d2e2b0e9 100644 (file)
--- 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 0f6f716c3fba4a8d9f5d2950571a439130801fdd..8f77fc9b2a8851e9e08bc4817b62db7d8ad3964d 100644 (file)
--- 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 6474a4f3c639940227b49e667ea443bbfbb8d650..c999dfacdd0987ed7c9595513d113a93a9b80c81 100644 (file)
--- 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 930b4e85eafc1c43d90aa25d376c90da25dfbfe8..2f6d1f02d8da8bcb7718d5c2ba0cfdd9d9c5aeae 100644 (file)
--- 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 50a755b9a6a42e67cb803a7c5dd2ed71c732442b..baddc16e3a9d19aff5876f2f9ed39ad80665ec70 100644 (file)
--- 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 397eaccc098babbe5819ca3b81c78ce345b93af0..f3bd157729ca5f1ad4d46de7ae5c31185f7345c9 100644 (file)
--- 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 54499f78b175db15ce1620d985e7b2d7225e013f..559bc66ad24055ef497fac40896092413f8adc70 100644 (file)
--- 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 ae124c735432afa869ebec755fe54163e0a6f976..a4e97bf6e6593a24ddee56c49c7964a352e259d0 100644 (file)
--- 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 04b821e716fcc1cb702cb4ba750ea7ce51fac3a0..bd242833b5ff7071e688a26d1f7ccef3de366104 100644 (file)
--- 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 9c0d33f9e2fe26fdf94bfa9beb92e5be1066de07..a8b044a41166b93974425f927877f95192d63f17 100644 (file)
--- 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 05339ce3740cc928c822a9579d8e67178c1ab035..72e768375df1fa112d9f74530b1d65dfea5b93de 100644 (file)
--- 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 6749eaa41bd706c38ed9a5e005bb08d683119901..98d548da5afb08acb96f74606871c8877261421e 100644 (file)
--- 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 07bc5693668c7470dfe75456692c43d1e360ba61..1ad8fab33b40b5b1dd4756050e90e79dc68c7cc2 100644 (file)
--- 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 9708415f0a057953b32aeaa7d5b24e3b662de5bc..749c82888945cc2675054ea6d1746c7864655a8a 100644 (file)
--- 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 a2dfb137b29a2bfdc4c4ab45f7c2f5b807408e94..4e22fdb0a46e7c7b3178545f6761886097597183 100644 (file)
--- 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 2b56d928be403a9fdbcaed2358d1ee24402b371c..864cfe270e2ff0f4d153ffa6ac04674b35535328 100644 (file)
--- 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 73414093ca4dba682b93103782202d60e4685690..8d8b73da56c6675b4e81d94f7467e5a52e440c11 100644 (file)
--- 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 34203216e0f56a10e2961465a61620d6368ff50c..731bcfc856bc83a49a7968a9fb54e2617e33ac45 100644 (file)
--- 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 9cab4f3a97f60f925ab35ac97340765a88c703da..060b6dc0448e09e4763bf0d8c0bc3f88f204c1c8 100644 (file)
--- 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 c1272fa0f764385131dc65e1df264e4e8497adc0..40e0cfc10e61889656287a67e2f90c19d23579fc 100644 (file)
--- 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 210f1a3aa5b4e6b2c0bf61a56e2a89b28a1938cb..43a0ff3d0a71cef2b7417ee1c3b059ddc6d96d39 100644 (file)
--- 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 f61c799751fea4a0f03aeb66a965b2027f6f3768..1e09531080169aacbb988b6aa680725c0337dff0 100644 (file)
--- 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 9c3939632d6d10a77262807868161cd8ea781c48..76f1754512f0e03f5a203c6df33e43ade70eebff 100644 (file)
--- 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 eb1e745801f85bb192867000e05ade273148c25b..ecf78d05f2f255e1c493887146e77acf50072352 100644 (file)
--- 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 7b51af248a70820b5e63da026fb279545fad7716..f89a0cb858954b11bf4936781d4fced5e8a5719c 100644 (file)
--- 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 9435a21e645860b2c9d07551c6b4ee44b81828f6..59ea3e6b14919d5238d4ffd709868ada73e516f0 100644 (file)
--- 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 0e50dcec7278987e40e6fc86db3cd39f2915d749..f6465e17d4db9cda46f1705380503e72cf358c64 100644 (file)
--- 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 787122d354444c5cbac67048118c4066a4e4f214..03e423e934195f3c386a8fe5c6851d46f0e625fb 100644 (file)
--- 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 08e95e3cafdac0c0a56a4b9fa4075452095e177d..5c55ce7c69d6f6f07b112bd1a3776fde4292d68c 100644 (file)
--- 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()