revert ed4f9d3e11e66dd5ef136c3fac874ac5f53ec91a

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index d84e3f7f82b142dd5af43a8a41ea19418a03676f..a9ea7f9946b9e181a687d328fd9eda3930687f85 100644 (file)
--- 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 bc6f6be4fd8d0e82fad7af5b588e0fc3902fecd2..0d336080baac061724739a625fd346d45b6fd228 100644 (file)
--- 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 ff055f9269cec4eaf0b123b7711365c9c0939826..c861e1d2bbec8af4c74058ab83ebadde13a3de51 100644 (file)
--- 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 77149f3d54f83ce93d9c277b56a3b314715d5810..0ecdaf6855769bf8913120e3f6b6ab57905396ed 100644 (file)
--- 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 617dbf8aa6c6b9365889d8376f996077ea244633..e4d352ba64a86514f2553b6b6473a359907c6b31 100644 (file)
--- 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 f037828f0c6adef084b853fd676d61733ecbc2f4..9b7797d02d61c2b7f61b1662dfaf01253938ad0e 100644 (file)
--- 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 07c538552d05c2dc465ed1381982ed810fa40de9..568681fb77b61e82480f9fb70368b71fc49b0746 100644 (file)
--- 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 8d7e00738e57fb055c3d466d94225624a6995677..bc3f7658fd47598a4e38d94c28394e0feffea8fc 100644 (file)
--- 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 bc4edd674aa4d373e882d24570ea754c1bf3bbd7..6046abc8c0a43c7bbd76bbc86bcc91a4ab34557c 100644 (file)
--- 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>