From 9756b911dad49eb725d85024c31d42d580d0d9f7 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 4 May 2022 21:32:18 +0200 Subject: [PATCH] REmove duplicate header between header/file --- applets/appmenu/plugin/appmenumodel.cpp | 1 - applets/kicker/plugin/containmentinterface.cpp | 2 -- applets/kicker/plugin/recentusagemodel.cpp | 1 - applets/notifications/draghelper.cpp | 1 - applets/notifications/filemenu.cpp | 1 - applets/notifications/notificationapplet.cpp | 2 -- applets/panelspacer/plugin/panelspacer.cpp | 1 - applets/systemmonitor/systemmonitor/systemmonitor.cpp | 1 - applets/systemtray/container/systemtraycontainer.cpp | 2 -- applets/systemtray/statusnotifieritemsource.cpp | 1 - applets/systemtray/systemtraymodel.cpp | 1 - appmenu/appmenu.cpp | 3 --- dataengines/statusnotifieritem/statusnotifieritemsource.cpp | 1 - gmenu-dbusmenu-proxy/actions.cpp | 1 - kcms/autostart/autostartmodel.cpp | 1 - kcms/colors/colors.cpp | 5 ----- kcms/cursortheme/kcmcursortheme.cpp | 2 -- kcms/desktoptheme/kcm.cpp | 2 -- kcms/fonts/fonts.cpp | 3 --- kcms/lookandfeel/kcm.cpp | 3 --- kcms/lookandfeel/lookandfeelmanager.cpp | 1 - kcms/notifications/kcm.cpp | 2 -- kcms/style/kcmstyle.cpp | 2 -- kcms/users/src/fingerprintmodel.cpp | 5 ----- kcms/users/src/fprintdevice.cpp | 3 --- kcms/users/src/kcm.cpp | 1 - klipper/klipper.cpp | 1 - libkworkspace/autostartscriptdesktopfile.cpp | 2 -- libnotificationmanager/job_p.cpp | 1 - logout-greeter/shutdowndlg.cpp | 1 - runners/bookmarks/browsers/firefox.cpp | 1 - runners/recentdocuments/recentdocuments.cpp | 1 - shell/containmentconfigview.cpp | 1 - wallpapers/image/plugin/slidefiltermodel.cpp | 1 - 34 files changed, 58 deletions(-) diff --git a/applets/appmenu/plugin/appmenumodel.cpp b/applets/appmenu/plugin/appmenumodel.cpp index 2928fa505..98ef974ee 100644 --- a/applets/appmenu/plugin/appmenumodel.cpp +++ b/applets/appmenu/plugin/appmenumodel.cpp @@ -7,7 +7,6 @@ #include "appmenumodel.h" -#include #include #include #include diff --git a/applets/kicker/plugin/containmentinterface.cpp b/applets/kicker/plugin/containmentinterface.cpp index 23bcea67e..d6497629d 100644 --- a/applets/kicker/plugin/containmentinterface.cpp +++ b/applets/kicker/plugin/containmentinterface.cpp @@ -10,8 +10,6 @@ #include #include -#include - #include // FIXME HACK TODO: Unfortunately we have no choice but to hard-code a list of diff --git a/applets/kicker/plugin/recentusagemodel.cpp b/applets/kicker/plugin/recentusagemodel.cpp index 8920479c9..87232ce4b 100644 --- a/applets/kicker/plugin/recentusagemodel.cpp +++ b/applets/kicker/plugin/recentusagemodel.cpp @@ -39,7 +39,6 @@ #include #include -#include #include #include diff --git a/applets/notifications/draghelper.cpp b/applets/notifications/draghelper.cpp index 49b2d4785..8031053b5 100644 --- a/applets/notifications/draghelper.cpp +++ b/applets/notifications/draghelper.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include diff --git a/applets/notifications/filemenu.cpp b/applets/notifications/filemenu.cpp index 8d0f8ff59..9c92d6c8a 100644 --- a/applets/notifications/filemenu.cpp +++ b/applets/notifications/filemenu.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include diff --git a/applets/notifications/notificationapplet.cpp b/applets/notifications/notificationapplet.cpp index c9afd19e8..29ae9a714 100644 --- a/applets/notifications/notificationapplet.cpp +++ b/applets/notifications/notificationapplet.cpp @@ -7,10 +7,8 @@ #include "notificationapplet.h" #include -#include #include #include -#include #include diff --git a/applets/panelspacer/plugin/panelspacer.cpp b/applets/panelspacer/plugin/panelspacer.cpp index 856d19bb2..8d7a75b06 100644 --- a/applets/panelspacer/plugin/panelspacer.cpp +++ b/applets/panelspacer/plugin/panelspacer.cpp @@ -12,7 +12,6 @@ #include #include -#include class SpacersTrackerSingleton { diff --git a/applets/systemmonitor/systemmonitor/systemmonitor.cpp b/applets/systemmonitor/systemmonitor/systemmonitor.cpp index 40cf09e52..5c92cc404 100644 --- a/applets/systemmonitor/systemmonitor/systemmonitor.cpp +++ b/applets/systemmonitor/systemmonitor/systemmonitor.cpp @@ -13,7 +13,6 @@ #include #include -#include #include #include diff --git a/applets/systemtray/container/systemtraycontainer.cpp b/applets/systemtray/container/systemtraycontainer.cpp index 19bb14d19..f40a2ac11 100644 --- a/applets/systemtray/container/systemtraycontainer.cpp +++ b/applets/systemtray/container/systemtraycontainer.cpp @@ -7,8 +7,6 @@ #include "systemtraycontainer.h" #include "debug.h" -#include - #include #include #include diff --git a/applets/systemtray/statusnotifieritemsource.cpp b/applets/systemtray/statusnotifieritemsource.cpp index a205d65f4..05629723e 100644 --- a/applets/systemtray/statusnotifieritemsource.cpp +++ b/applets/systemtray/statusnotifieritemsource.cpp @@ -6,7 +6,6 @@ */ #include "statusnotifieritemsource.h" -#include "statusnotifieritem_interface.h" #include "statusnotifieritemservice.h" #include "systemtraytypes.h" diff --git a/applets/systemtray/systemtraymodel.cpp b/applets/systemtray/systemtraymodel.cpp index cbfde5205..135dc7fbe 100644 --- a/applets/systemtray/systemtraymodel.cpp +++ b/applets/systemtray/systemtraymodel.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/appmenu/appmenu.cpp b/appmenu/appmenu.cpp index f66569829..8b56e2ee7 100644 --- a/appmenu/appmenu.cpp +++ b/appmenu/appmenu.cpp @@ -6,8 +6,6 @@ SPDX-License-Identifier: MIT */ -#include - #include "appmenu.h" #include "appmenu_dbus.h" #include "appmenu_debug.h" @@ -35,7 +33,6 @@ #else #include #endif -#include #endif static const QByteArray s_x11AppMenuServiceNamePropertyName = QByteArrayLiteral("_KDE_NET_WM_APPMENU_SERVICE_NAME"); diff --git a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp index 233530749..9e989d825 100644 --- a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp +++ b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp @@ -6,7 +6,6 @@ */ #include "statusnotifieritemsource.h" -#include "statusnotifieritem_interface.h" #include "statusnotifieritemservice.h" #include "systemtraytypes.h" diff --git a/gmenu-dbusmenu-proxy/actions.cpp b/gmenu-dbusmenu-proxy/actions.cpp index 5d9370c80..bc6f35275 100644 --- a/gmenu-dbusmenu-proxy/actions.cpp +++ b/gmenu-dbusmenu-proxy/actions.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include static const QString s_orgGtkActions = QStringLiteral("org.gtk.Actions"); diff --git a/kcms/autostart/autostartmodel.cpp b/kcms/autostart/autostartmodel.cpp index cc962cb6e..a5d7bb380 100644 --- a/kcms/autostart/autostartmodel.cpp +++ b/kcms/autostart/autostartmodel.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/kcms/colors/colors.cpp b/kcms/colors/colors.cpp index 29d695d87..de997ad04 100644 --- a/kcms/colors/colors.cpp +++ b/kcms/colors/colors.cpp @@ -10,7 +10,6 @@ #include "colors.h" -#include #include #include #include @@ -35,16 +34,12 @@ #include #include -#include - #include #include "krdb.h" #include "colorsapplicator.h" #include "colorsdata.h" -#include "colorsmodel.h" -#include "colorssettings.h" #include "filterproxymodel.h" #include "../kcms-common_p.h" diff --git a/kcms/cursortheme/kcmcursortheme.cpp b/kcms/cursortheme/kcmcursortheme.cpp index f845a2dea..69f511b9c 100644 --- a/kcms/cursortheme/kcmcursortheme.cpp +++ b/kcms/cursortheme/kcmcursortheme.cpp @@ -40,8 +40,6 @@ #include -#include "cursorthemesettings.h" - #ifdef HAVE_XFIXES #include #endif diff --git a/kcms/desktoptheme/kcm.cpp b/kcms/desktoptheme/kcm.cpp index 63e4e0f7a..33ab2502f 100644 --- a/kcms/desktoptheme/kcm.cpp +++ b/kcms/desktoptheme/kcm.cpp @@ -28,9 +28,7 @@ #include #include "desktopthemedata.h" -#include "desktopthemesettings.h" #include "filterproxymodel.h" -#include "themesmodel.h" Q_LOGGING_CATEGORY(KCM_DESKTOP_THEME, "kcm_desktoptheme") diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp index 5798ea056..81e90cfdb 100644 --- a/kcms/fonts/fonts.cpp +++ b/kcms/fonts/fonts.cpp @@ -36,9 +36,6 @@ #include "kxftconfig.h" #include "previewimageprovider.h" -#include "fontsaasettings.h" -#include "fontssettings.h" - #include "fontsdata.h" /**** DLL Interface ****/ diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp index ea622eef4..b8ee2238c 100644 --- a/kcms/lookandfeel/kcm.cpp +++ b/kcms/lookandfeel/kcm.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -46,8 +45,6 @@ #include #include -#include "lookandfeelmanager.h" -#include "lookandfeelsettings.h" #ifdef HAVE_XCURSOR #include "../cursortheme/xcursor/xcursortheme.h" #include diff --git a/kcms/lookandfeel/lookandfeelmanager.cpp b/kcms/lookandfeel/lookandfeelmanager.cpp index e4dabc763..344257b2b 100644 --- a/kcms/lookandfeel/lookandfeelmanager.cpp +++ b/kcms/lookandfeel/lookandfeelmanager.cpp @@ -15,7 +15,6 @@ #include "lookandfeeldata.h" #include "lookandfeelsettings.h" #include -#include #include #include #include diff --git a/kcms/notifications/kcm.cpp b/kcms/notifications/kcm.cpp index 81aeaa8cc..8569916ca 100644 --- a/kcms/notifications/kcm.cpp +++ b/kcms/notifications/kcm.cpp @@ -26,9 +26,7 @@ #include -#include "filterproxymodel.h" #include "notificationsdata.h" -#include "sourcesmodel.h" #include #include diff --git a/kcms/style/kcmstyle.cpp b/kcms/style/kcmstyle.cpp index b749a2cc9..778bdc1b2 100644 --- a/kcms/style/kcmstyle.cpp +++ b/kcms/style/kcmstyle.cpp @@ -44,8 +44,6 @@ #include "previewitem.h" #include "styledata.h" -#include "stylesettings.h" -#include "stylesmodel.h" K_PLUGIN_FACTORY_WITH_JSON(KCMStyleFactory, "kcm_style.json", registerPlugin(); registerPlugin();) diff --git a/kcms/users/src/fingerprintmodel.cpp b/kcms/users/src/fingerprintmodel.cpp index f5cf5d8bb..5e8ab6f92 100644 --- a/kcms/users/src/fingerprintmodel.cpp +++ b/kcms/users/src/fingerprintmodel.cpp @@ -18,13 +18,8 @@ License along with this library. If not, see . */ -#include - #include "fingerprintmodel.h" -#include "fprint_device_interface.h" -#include "fprint_manager_interface.h" - FingerprintModel::FingerprintModel(QObject* parent) : QObject(parent) , m_managerDbusInterface(new NetReactivatedFprintManagerInterface(QStringLiteral("net.reactivated.Fprint"), QStringLiteral("/net/reactivated/Fprint/Manager"), QDBusConnection::systemBus(), this)) diff --git a/kcms/users/src/fprintdevice.cpp b/kcms/users/src/fprintdevice.cpp index 4906c486d..9c9532461 100644 --- a/kcms/users/src/fprintdevice.cpp +++ b/kcms/users/src/fprintdevice.cpp @@ -20,9 +20,6 @@ #include "fprintdevice.h" -#include "fprint_device_interface.h" -#include "fprint_manager_interface.h" - FprintDevice::FprintDevice(QDBusObjectPath path, QObject *parent) : QObject(parent) , m_devicePath(path.path()) diff --git a/kcms/users/src/kcm.cpp b/kcms/users/src/kcm.cpp index 0f62a098d..416ea24fd 100644 --- a/kcms/users/src/kcm.cpp +++ b/kcms/users/src/kcm.cpp @@ -22,7 +22,6 @@ #include "accounts_interface.h" #include "user.h" -#include "fingerprintmodel.h" Q_LOGGING_CATEGORY(kcm_users, "kcm_users") diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp index 1c7d18aa2..3b11c6ecc 100644 --- a/klipper/klipper.cpp +++ b/klipper/klipper.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/libkworkspace/autostartscriptdesktopfile.cpp b/libkworkspace/autostartscriptdesktopfile.cpp index 683c19d04..f44e96d38 100644 --- a/libkworkspace/autostartscriptdesktopfile.cpp +++ b/libkworkspace/autostartscriptdesktopfile.cpp @@ -5,8 +5,6 @@ #include "autostartscriptdesktopfile.h" #include -#include -#include #include static const auto autostartScriptKey = QStringLiteral("X-KDE-AutostartScript"); diff --git a/libnotificationmanager/job_p.cpp b/libnotificationmanager/job_p.cpp index ae00d7519..ba75e627c 100644 --- a/libnotificationmanager/job_p.cpp +++ b/libnotificationmanager/job_p.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include diff --git a/logout-greeter/shutdowndlg.cpp b/logout-greeter/shutdowndlg.cpp index 92209def7..cd037ae95 100644 --- a/logout-greeter/shutdowndlg.cpp +++ b/logout-greeter/shutdowndlg.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) diff --git a/runners/bookmarks/browsers/firefox.cpp b/runners/bookmarks/browsers/firefox.cpp index 32ae4228c..3c5885ca7 100644 --- a/runners/bookmarks/browsers/firefox.cpp +++ b/runners/bookmarks/browsers/firefox.cpp @@ -13,7 +13,6 @@ #include "fetchsqlite.h" #include #include -#include #include #include diff --git a/runners/recentdocuments/recentdocuments.cpp b/runners/recentdocuments/recentdocuments.cpp index 8b5f076fe..62a8c8447 100644 --- a/runners/recentdocuments/recentdocuments.cpp +++ b/runners/recentdocuments/recentdocuments.cpp @@ -6,7 +6,6 @@ #include "recentdocuments.h" -#include #include #include diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp index af51c51a8..a3549be77 100644 --- a/shell/containmentconfigview.cpp +++ b/shell/containmentconfigview.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include #else diff --git a/wallpapers/image/plugin/slidefiltermodel.cpp b/wallpapers/image/plugin/slidefiltermodel.cpp index 7cb3213fe..13066a6e8 100644 --- a/wallpapers/image/plugin/slidefiltermodel.cpp +++ b/wallpapers/image/plugin/slidefiltermodel.cpp @@ -10,7 +10,6 @@ #include "slidemodel.h" #include -#include #include #include