From: Christoph Thielecke <christoph.thielecke@gmx.de>
Date: Thu, 10 Feb 2011 09:59:35 +0000 (+0100)
Subject: revert ed4f9d3e11e66dd5ef136c3fac874ac5f53ec91a
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/12324da3265a27863602f95cdc4422d12cbe85ac

revert ed4f9d3e11e66dd5ef136c3fac874ac5f53ec91a
---

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index d84e3f7f8..a9ea7f994 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -35,13 +35,13 @@
 #include <kfileplacesmodel.h>
 #include <kglobal.h>
 #include <KIconLoader>
-#include <kio/netaccess.h>
+#include <KIO/NetAccess>
 #include <kmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmimetypetrader.h>
 #include <kmodifierkeyinfo.h>
-#include <knewfilemenu.h>
+#include <KNewFileMenu>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <kservice.h>
diff --git a/src/dolphinnewfilemenu.h b/src/dolphinnewfilemenu.h
index bc6f6be4f..0d336080b 100644
--- a/src/dolphinnewfilemenu.h
+++ b/src/dolphinnewfilemenu.h
@@ -21,7 +21,7 @@
 #ifndef DOLPHINNEWFILEMENU_H
 #define DOLPHINNEWFILEMENU_H
 
-#include <knewfilemenu.h>
+#include <KNewFileMenu>
 
 class DolphinMainWindow;
 class KJob;
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index ff055f926..c861e1d2b 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -35,7 +35,7 @@
 #include <KIO/NetAccess>
 #include <KToolInvocation>
 #include <kauthorized.h>
-#include <knewfilemenu.h>
+#include <KNewFileMenu>
 #include <KMenu>
 #include <KInputDialog>
 #include <KProtocolInfo>
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 77149f3d5..0ecdaf685 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -36,7 +36,7 @@
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
 #include <KMenu>
-#include <knewfilemenu.h>
+#include <KNewFileMenu>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <KShell>
diff --git a/src/panels/filter/filterpanel.cpp b/src/panels/filter/filterpanel.cpp
index 617dbf8aa..e4d352ba6 100644
--- a/src/panels/filter/filterpanel.cpp
+++ b/src/panels/filter/filterpanel.cpp
@@ -38,7 +38,7 @@
 #include <search/dolphinsearchinformation.h>
 
 #include <KFileItem>
-#include <kio/jobclasses.h>
+#include <KIO/JobClasses>
 #include <KIO/Job>
 #include <KMenu>
 
diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index f037828f0..9b7797d02 100644
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -27,7 +27,7 @@
 #include <QBoxLayout>
 
 #include <KLocale>
-#include <kio/jobclasses.h>
+#include <KIO/JobClasses>
 
 #include <views/viewproperties.h>
 
diff --git a/src/views/dolphindirlister.cpp b/src/views/dolphindirlister.cpp
index 07c538552..568681fb7 100644
--- a/src/views/dolphindirlister.cpp
+++ b/src/views/dolphindirlister.cpp
@@ -19,7 +19,7 @@
 
 #include "dolphindirlister.h"
 #include <KLocale>
-#include <kio/jobclasses.h>
+#include <KIO/JobClasses>
 
 DolphinDirLister::DolphinDirLister() :
     KDirLister()
diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp
index 8d7e00738..bc3f7658f 100644
--- a/src/views/dolphinnewfilemenuobserver.cpp
+++ b/src/views/dolphinnewfilemenuobserver.cpp
@@ -20,7 +20,7 @@
 #include "dolphinnewfilemenuobserver.h"
 
 #include <KGlobal>
-#include <knewfilemenu.h>
+#include <KNewFileMenu>
 
 class DolphinNewFileMenuObserverSingleton
 {
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index bc4edd674..6046abc8c 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -30,7 +30,7 @@
 #include <KActionMenu>
 #include <KFileItemDelegate>
 #include <KLocale>
-#include <knewfilemenu.h>
+#include <KNewFileMenu>
 #include <KSelectAction>
 #include <KToggleAction>
 #include <KRun>