From 93ba7b56fcd69cdf1f4d869b0d10cc67ccacfebc Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Mon, 14 Jun 2021 17:54:29 +0200
Subject: [PATCH] Remove module prefix from KF includes

GIT_SILENT
---
 bookmarkmanager.cpp            | 2 +-
 bookmarkmanager.h              | 4 ++--
 config/hostpreferenceslist.cpp | 2 +-
 config/hostpreferenceslist.h   | 2 +-
 config/preferencesdialog.cpp   | 6 +++---
 config/preferencesdialog.h     | 2 +-
 connectiondelegate.cpp         | 2 +-
 core/hostpreferences.cpp       | 2 +-
 core/hostpreferences.h         | 2 +-
 core/remoteview.h              | 2 +-
 core/remoteviewfactory.h       | 6 +++---
 main.cpp                       | 2 +-
 mainwindow.h                   | 4 ++--
 rdp/rdpviewfactory.cpp         | 2 +-
 systemtrayicon.cpp             | 2 +-
 systemtrayicon.h               | 2 +-
 test/testview.h                | 2 +-
 vnc/vncview.cpp                | 8 ++++----
 vnc/vncviewfactory.cpp         | 2 +-
 19 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/bookmarkmanager.cpp b/bookmarkmanager.cpp
index 55bfbac5..c00297e3 100644
--- a/bookmarkmanager.cpp
+++ b/bookmarkmanager.cpp
@@ -8,7 +8,7 @@
 #include "mainwindow.h"
 #include "krdc_debug.h"
 
-#include <KBookmarks/KBookmarkOwner>
+#include <KBookmarkOwner>
 #include <KLocalizedString>
 
 #include <QStandardPaths>
diff --git a/bookmarkmanager.h b/bookmarkmanager.h
index b7356860..12c7fb97 100644
--- a/bookmarkmanager.h
+++ b/bookmarkmanager.h
@@ -10,8 +10,8 @@
 #include "core/remoteview.h"
 
 #include <KBookmarkManager>
-#include <KXmlGui/KActionCollection>
-#include <KBookmarks/KBookmarkMenu>
+#include <KActionCollection>
+#include <KBookmarkMenu>
 
 #include <QMenu>
 
diff --git a/config/hostpreferenceslist.cpp b/config/hostpreferenceslist.cpp
index dc696320..d3d0cf4d 100644
--- a/config/hostpreferenceslist.cpp
+++ b/config/hostpreferenceslist.cpp
@@ -10,7 +10,7 @@
 
 #include <QIcon>
 #include <KLocalizedString>
-#include <KWidgetsAddons/KMessageBox>
+#include <KMessageBox>
 
 #include <QFile>
 #include <QLayout>
diff --git a/config/hostpreferenceslist.h b/config/hostpreferenceslist.h
index d7e08b4b..d4a0214d 100644
--- a/config/hostpreferenceslist.h
+++ b/config/hostpreferenceslist.h
@@ -9,7 +9,7 @@
 
 #include "mainwindow.h"
 
-#include <KConfigCore/KConfigGroup>
+#include <KConfigGroup>
 
 #include <QDomDocument>
 #include <QWidget>
diff --git a/config/preferencesdialog.cpp b/config/preferencesdialog.cpp
index 06a4eeef..0770d223 100644
--- a/config/preferencesdialog.cpp
+++ b/config/preferencesdialog.cpp
@@ -9,11 +9,11 @@
 #include "hostpreferenceslist.h"
 #include "ui_general.h"
 
-#include <KConfigGui/KConfigSkeleton>
+#include <KConfigSkeleton>
 #include <KLocalizedString>
-#include <KCMUtils/KPluginSelector>
+#include <KPluginSelector>
 #include <KPluginMetaData>
-#include <KService/KPluginInfo>
+#include <KPluginInfo>
 
 PreferencesDialog::PreferencesDialog(QWidget *parent, KConfigSkeleton *skeleton)
         : KConfigDialog(parent, QLatin1String("preferences"), skeleton)
diff --git a/config/preferencesdialog.h b/config/preferencesdialog.h
index 95263610..2229d1fe 100644
--- a/config/preferencesdialog.h
+++ b/config/preferencesdialog.h
@@ -7,7 +7,7 @@
 #ifndef PREFERENCESDIALOG_H
 #define PREFERENCESDIALOG_H
 
-#include <KConfigWidgets/KConfigDialog>
+#include <KConfigDialog>
 
 #include <QDialogButtonBox>
 
diff --git a/connectiondelegate.cpp b/connectiondelegate.cpp
index e1d445be..4dd2856b 100644
--- a/connectiondelegate.cpp
+++ b/connectiondelegate.cpp
@@ -7,7 +7,7 @@
 #include "connectiondelegate.h"
 #include "remotedesktopsmodel.h"
 
-#include <KIconThemes/KIconLoader>
+#include <KIconLoader>
 #include <KLocalizedString>
 
 #include <QDateTime>
diff --git a/core/hostpreferences.cpp b/core/hostpreferences.cpp
index f8d7b85b..f95b039c 100644
--- a/core/hostpreferences.cpp
+++ b/core/hostpreferences.cpp
@@ -10,7 +10,7 @@
 #include "settings.h"
 
 #include <KLocalizedString>
-#include <KWidgetsAddons/KPageDialog>
+#include <KPageDialog>
 
 #include <QCheckBox>
 #include <QDialog>
diff --git a/core/hostpreferences.h b/core/hostpreferences.h
index 05370980..66870f36 100644
--- a/core/hostpreferences.h
+++ b/core/hostpreferences.h
@@ -11,7 +11,7 @@
 #include "remoteview.h"
 #include "krdccore_export.h"
 
-#include <KConfigCore/KConfigGroup>
+#include <KConfigGroup>
 
 class QCheckBox;
 class QWidget;
diff --git a/core/remoteview.h b/core/remoteview.h
index 201bb978..5754e92b 100644
--- a/core/remoteview.h
+++ b/core/remoteview.h
@@ -10,7 +10,7 @@
 #define REMOTEVIEW_H
 
 #ifndef QTONLY
-    #include <KWallet/KWallet>
+    #include <KWallet>
     #include "krdccore_export.h"
 #else
     #define KRDCCORE_EXPORT
diff --git a/core/remoteviewfactory.h b/core/remoteviewfactory.h
index d817a656..a8214fa4 100644
--- a/core/remoteviewfactory.h
+++ b/core/remoteviewfactory.h
@@ -10,9 +10,9 @@
 #include "remoteview.h"
 #include "krdccore_export.h"
 
-#include <KCoreAddons/KPluginFactory>
-#include <KConfigCore/KConfigGroup>
-#include <KCoreAddons/KPluginLoader>
+#include <KPluginFactory>
+#include <KConfigGroup>
+#include <KPluginLoader>
 
 /**
  * Factory to be implemented by any plugin.
diff --git a/main.cpp b/main.cpp
index 2960fcc7..cd9324ce 100644
--- a/main.cpp
+++ b/main.cpp
@@ -10,7 +10,7 @@
 #include "krdc_version.h"
 #include "settings.h"
 
-#include <KCoreAddons/KAboutData>
+#include <KAboutData>
 #include <Kdelibs4ConfigMigrator>
 #include <Kdelibs4Migration>
 #include <KLocalizedString>
diff --git a/mainwindow.h b/mainwindow.h
index 8bf8a53e..750f24d3 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -12,8 +12,8 @@
 #include "remoteview.h"
 #include "remoteviewfactory.h"
 
-#include <KXmlGui/KXmlGuiWindow>
-#include <KService/KPluginInfo>
+#include <KXmlGuiWindow>
+#include <KPluginInfo>
 
 class KComboBox;
 class KLineEdit;
diff --git a/rdp/rdpviewfactory.cpp b/rdp/rdpviewfactory.cpp
index 4965c1e6..9372f796 100644
--- a/rdp/rdpviewfactory.cpp
+++ b/rdp/rdpviewfactory.cpp
@@ -8,7 +8,7 @@
 
 #include <QStandardPaths>
 
-#include <KCoreAddons/KExportPlugin>
+#include <KPluginFactory>
 
 K_PLUGIN_FACTORY_WITH_JSON(KrdcFactory, "krdc_rdp.json", registerPlugin<RdpViewFactory>();)
 
diff --git a/systemtrayicon.cpp b/systemtrayicon.cpp
index 528cfa35..a515a676 100644
--- a/systemtrayicon.cpp
+++ b/systemtrayicon.cpp
@@ -7,7 +7,7 @@
 #include "systemtrayicon.h"
 #include "mainwindow.h"
 
-#include <KXmlGui/KActionCollection>
+#include <KActionCollection>
 #include <KLocalizedString>
 
 #include <QMenu>
diff --git a/systemtrayicon.h b/systemtrayicon.h
index 84cef9ae..ed5b148b 100644
--- a/systemtrayicon.h
+++ b/systemtrayicon.h
@@ -7,7 +7,7 @@
 #ifndef SYSTEMTRAYICON_H
 #define SYSTEMTRAYICON_H
 
-#include <KNotifications/KStatusNotifierItem>
+#include <KStatusNotifierItem>
 
 class MainWindow;
 
diff --git a/test/testview.h b/test/testview.h
index f006895c..f33db5e9 100644
--- a/test/testview.h
+++ b/test/testview.h
@@ -10,7 +10,7 @@
 #include "remoteview.h"
 #include "hostpreferences.h"
 
-#include <KConfigCore/KConfigGroup>
+#include <KConfigGroup>
 
 class TestHostPreferences;
 
diff --git a/vnc/vncview.cpp b/vnc/vncview.cpp
index 8e40eb75..b5c7442b 100644
--- a/vnc/vncview.cpp
+++ b/vnc/vncview.cpp
@@ -24,10 +24,10 @@
 #else
     #include "settings.h"
     #include <KActionCollection>
-    #include <KXmlGui/KMainWindow>
-    #include <KWidgetsAddons/KMessageBox>
-    #include <KWidgetsAddons/KPasswordDialog>
-    #include <KXmlGui/KXMLGUIClient>
+    #include <KMainWindow>
+    #include <KMessageBox>
+    #include <KPasswordDialog>
+    #include <KXMLGUIClient>
 #endif
 
 // Definition of key modifier mask constants
diff --git a/vnc/vncviewfactory.cpp b/vnc/vncviewfactory.cpp
index bb66af30..218d72be 100644
--- a/vnc/vncviewfactory.cpp
+++ b/vnc/vncviewfactory.cpp
@@ -7,7 +7,7 @@
 #include "vncviewfactory.h"
 #include "remoteviewfactory.h"
 
-#include <KCoreAddons/KExportPlugin>
+#include <KPluginFactory>
 
 K_PLUGIN_FACTORY_WITH_JSON(KrdcFactory, "krdc_vnc.json", registerPlugin<VncViewFactory>();)