Drop KNS3 prefix for KMoreTools includes

In KF6 KMoreTools should become it's own library and thus the KNS3 prefix should get removed.
Considering that the classes are not in any namespace, having a namespaced include is not needed and only causes noise.

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 3e9d463d252d67f5cccb94784ded2efa945945f3..77bf8698153be98bccbac5a884d2c8dd01e1b70b 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -49,7 +49,7 @@
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KMessageBox>

-#include <KNS3/KMoreToolsMenuFactory>
+#include <KMoreToolsMenuFactory>

 #include <KProtocolInfo>
 #include <KProtocolManager>
 #include <KShell>
 #include <KProtocolInfo>
 #include <KProtocolManager>
 #include <KShell>

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 0f10a7769fe2513688f4da5b9ca0869d81bf9dfa..fdc55043123dd6e484e6fcb02b13f72439bb560d 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -16,21 +16,21 @@
 #include "views/dolphinview.h"
 #include "views/dolphinviewactionhandler.h"
 
 #include "views/dolphinview.h"
 #include "views/dolphinviewactionhandler.h"
 

-#include <KPluginMetaData>

 #include <KActionCollection>
 #include <KAuthorized>
 #include <KConfigGroup>
 #include <KDialogJobUiDelegate>
 #include <KDirLister>
 #include <KFileItemListProperties>
 #include <KActionCollection>
 #include <KAuthorized>
 #include <KConfigGroup>
 #include <KDialogJobUiDelegate>
 #include <KDirLister>
 #include <KFileItemListProperties>

+#include <KIO/CommandLauncherJob>

 #include <KIconLoader>
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KMimeTypeEditor>
 #include <KIconLoader>
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KMimeTypeEditor>

-#include <KNS3/KMoreToolsMenuFactory>
+#include <KMoreToolsMenuFactory>

 #include <KPluginFactory>
 #include <KPluginFactory>

-#include <KIO/CommandLauncherJob>
+#include <KPluginMetaData>

 #include <KSharedConfig>
 #include <KTerminalLauncherJob>
 
 #include <KSharedConfig>
 #include <KTerminalLauncherJob>
 

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 022fabfa454b6ab112733b3af8b2cd0c4a771ee0..b6a8006644074e10ee7a228382a15f03eaf74fce 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -13,7 +13,7 @@
 #include "dolphinquery.h"
 
 #include <KLocalizedString>
 #include "dolphinquery.h"
 
 #include <KLocalizedString>

-#include <KNS3/KMoreToolsMenuFactory>
+#include <KMoreToolsMenuFactory>

 #include <KSeparator>
 #include <config-baloo.h>
 #ifdef HAVE_BALOO
 #include <KSeparator>
 #include <config-baloo.h>
 #ifdef HAVE_BALOO

diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index bb7f8584257c53aa85003d0c9d2c06b1936ce149..de91f1e1a4be8fde83bf0a36fa1f5bcd28412176 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -9,7 +9,7 @@
 #include "spaceinfoobserver.h"
 
 #include <KLocalizedString>
 #include "spaceinfoobserver.h"
 
 #include <KLocalizedString>

-#include <KNS3/KMoreToolsMenuFactory>
+#include <KMoreToolsMenuFactory>

 
 #include <QMouseEvent>
 
 
 #include <QMouseEvent>