From 956ebf71156ddca0301adc8a9ff87880cfa5dac9 Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Fri, 4 Feb 2011 15:49:45 +0100
Subject: [PATCH] Don't use the submodule-path for Qt-includes on
 application-level

Also some KDE-includes have been capitalized
---
 src/dolphincontextmenu.cpp                    | 32 +++++++++----------
 src/dolphinviewcontainer.cpp                  | 12 +++----
 src/filterbar/filterbar.h                     |  2 +-
 src/settings/general/previewssettingspage.cpp |  2 +-
 src/settings/kcm/kcmdolphingeneral.cpp        |  4 +--
 .../services/servicessettingspage.cpp         |  2 +-
 src/settings/startup/startupsettingspage.cpp  |  2 +-
 .../viewmodes/dolphinfontrequester.cpp        |  2 +-
 .../viewmodes/iconsviewsettingspage.cpp       |  2 +-
 src/settings/viewmodes/viewsettingspage.cpp   |  2 +-
 src/settings/viewpropertiesdialog.cpp         |  4 +--
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index dacdc9c83..b37194da0 100644
--- 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 86aefe959..77a2f3f36 100644
--- 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 025bf1edd..9546c6371 100644
--- 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 1333df5e9..986b480e4 100644
--- 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 587c4df29..5acacf3e0 100644
--- 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 bc4de0939..78330ecff 100644
--- 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 47da64d0a..c3bdc2b9b 100644
--- 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 4e23b2d47..db0b27259 100644
--- 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 8c146f014..fa8e54591 100644
--- 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 6d9a70466..4530d866d 100644
--- 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 f52bd12d2..0ea197363 100644
--- 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>
-- 
2.47.3