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

Also some KDE-includes have been capitalized

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>

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>

src/filterbar/filterbar.h

@@ -21,7 +21,7 @@
 #ifndef FILTERBAR_H
 #define FILTERBAR_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class KLineEdit;
 

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>

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>

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>

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>

src/settings/viewmodes/dolphinfontrequester.cpp

@@ -19,7 +19,7 @@
 
 #include "dolphinfontrequester.h"
 
-#include <kfontdialog.h>
+#include <KFontDialog>
 #include <KGlobalSettings>
 #include <KLocale>
 #include <KComboBox>

src/settings/viewmodes/iconsviewsettingspage.cpp

@@ -29,7 +29,7 @@
 #include <KIconLoader>
 #include <KGlobalSettings>
 #include <KLocale>
-#include <kcombobox.h>
+#include <KComboBox>
 #include <KNumInput>
 
 #include <QCheckBox>

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),

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>