Don't use the submodule-path for Qt-includes on application-level

Also some KDE-includes have been capitalized

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index dacdc9c83b5011fe7cd8a5520c6754f3a4ff9f52..b37194da0f52d1440324c85920418c2b76fef2c6 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -26,28 +26,28 @@
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
-#include <KActionCollection>
-#include <KDesktopFile>
+#include <kactioncollection.h>
+#include <kdesktopfile.h>
 #include <kfileitemactionplugin.h>
-#include <KFileItemActions>
-#include <KFileItemListProperties>
-#include <KFilePlacesModel>
-#include <KGlobal>
+#include <kfileitemactions.h>
+#include <kfileitemlistproperties.h>
+#include <kfileplacesmodel.h>
+#include <kglobal.h>
 #include <KIconLoader>
-#include <KIO/NetAccess>
-#include <KMenu>
-#include <KMenuBar>
-#include <KMessageBox>
-#include <KMimeTypeTrader>
-#include <KModifierKeyInfo>
+#include <kio/netaccess.h>
+#include <kmenu.h>
+#include <kmenubar.h>
+#include <kmessagebox.h>
+#include <kmimetypetrader.h>
+#include <kmodifierkeyinfo.h>
 #include <knewfilemenu.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
-#include <KService>
+#include <kservice.h>
 #include <KLocale>
-#include <KPropertiesDialog>
-#include <KStandardAction>
-#include <KStandardDirs>
+#include <kpropertiesdialog.h>
+#include <kstandardaction.h>
+#include <kstandarddirs.h>
 
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 86aefe959d776ee7d4b5762bc24b8ba1df8b9857..77a2f3f36e89c9e5fbd601eb8535f5594a14bd89 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -20,12 +20,12 @@
 #include "dolphinviewcontainer.h"
 #include <KProtocolManager>
 
-#include <QtGui/QApplication>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QItemSelection>
-#include <QtGui/QBoxLayout>
-#include <QtCore/QTimer>
-#include <QtGui/QScrollBar>
+#include <QApplication>
+#include <QKeyEvent>
+#include <QItemSelection>
+#include <QBoxLayout>
+#include <QTimer>
+#include <QScrollBar>
 
 #include <KDesktopFile>
 #include <KFileItemDelegate>

diff --git a/src/filterbar/filterbar.h b/src/filterbar/filterbar.h
index 025bf1edd1240a14f4db1011e34f23061a562b90..9546c6371084cd56b1416c10941b80fcfcd4713c 100644 (file)
--- a/src/filterbar/filterbar.h
+++ b/src/filterbar/filterbar.h
@@ -21,7 +21,7 @@
 #ifndef FILTERBAR_H
 #define FILTERBAR_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class KLineEdit;
 

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 1333df5e92a74fb7f4481c552b67029641658f37..986b480e4e082c0d567f14a99577a54bee779f66 100644 (file)
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -26,7 +26,7 @@
 #include <KGlobal>
 #include <KLocale>
 #include <KNumInput>
-#include <kservicetypetrader.h>
+#include <KServiceTypeTrader>
 #include <KService>
 
 #include <settings/dolphinsettings.h>

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 587c4df2941ab8dc1a81dbc9afd8765d928ad781..5acacf3e04d811eaa0a733eb4974055fb0ecd746 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -22,8 +22,8 @@
 #include <KTabWidget>
 #include <KDialog>
 #include <KLocale>
-#include <kpluginfactory.h>
-#include <kpluginloader.h>
+#include <KPluginFactory>
+#include <KPluginLoader>
 
 #include <settings/general/behaviorsettingspage.h>
 #include <settings/general/previewssettingspage.h>

diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index bc4de0939dd78aa56ff134b8a28767d272c3ac14..78330ecff1d1f44911d190915840821eb172202f 100644 (file)
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -30,7 +30,7 @@
 #include <KMessageBox>
 #include <knewstuff3/knewstuffbutton.h>
 #include <KService>
-#include <kservicetypetrader.h>
+#include <KServiceTypeTrader>
 #include <KStandardDirs>
 
 #include <QCheckBox>

diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 47da64d0a67674d37f0191a94b638dfcf3d59e9f..c3bdc2b9bc238c671777aa80e2050234cbf6f878 100644 (file)
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -26,7 +26,7 @@
 #include "dolphin_generalsettings.h"
 
 #include <KDialog>
-#include <kfiledialog.h>
+#include <KFileDialog>
 #include <KLocale>
 #include <KLineEdit>
 #include <KMessageBox>

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 4e23b2d471f2d6ecc5d246e1f47fd61c5dd5b7d0..db0b2725918ae4c63f0654959e45f4895b8b5415 100644 (file)
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -19,7 +19,7 @@
 
 #include "dolphinfontrequester.h"
 
-#include <kfontdialog.h>
+#include <KFontDialog>
 #include <KGlobalSettings>
 #include <KLocale>
 #include <KComboBox>

diff --git a/src/settings/viewmodes/iconsviewsettingspage.cpp b/src/settings/viewmodes/iconsviewsettingspage.cpp
index 8c146f0143b905d48457ce92866f0e7262078a49..fa8e54591877f86f4afbf374eb7830213972fadf 100644 (file)
--- a/src/settings/viewmodes/iconsviewsettingspage.cpp
+++ b/src/settings/viewmodes/iconsviewsettingspage.cpp
@@ -29,7 +29,7 @@
 #include <KIconLoader>
 #include <KGlobalSettings>
 #include <KLocale>
-#include <kcombobox.h>
+#include <KComboBox>
 #include <KNumInput>
 
 #include <QCheckBox>

diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index 6d9a704667b6872a56063a8b507a0c5d47bd4bbd..4530d866df519acb407b6fc335750fd32f8c43cb 100644 (file)
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -29,7 +29,7 @@
 #include <KDialog>
 #include <KLocale>
 #include <KIconLoader>
-#include <ktabwidget.h>
+#include <KTabWidget>
 
 ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index f52bd12d2c4788421b189c38b2d6f5a1a73de9e0..0ea197363b3c577c230866306f05bd0fe74eb4f9 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -29,7 +29,7 @@
 
 #include <config-nepomuk.h>
 #ifdef HAVE_NEPOMUK
-#include <nepomuk/resourcemanager.h>
+#include <Nepomuk/ResourceManager>
 #endif
 
 #include <KComponentData>
@@ -39,7 +39,7 @@
 #include <KMessageBox>
 #include <KStandardDirs>
 #include <KUrl>
-#include <kcombobox.h>
+#include <KComboBox>
 
 #include <QAction>
 #include <QButtonGroup>