From ff0f37f561cabb26f0b63b8548c2718d23ccd475 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Mon, 31 May 2021 00:44:56 +0200 Subject: [PATCH] Make sure property types are fully defined In Qt6 property types needs to be fully defined --- applets/notifications/filemenu.h | 2 +- applets/notifications/notificationapplet.h | 5 +++-- applets/panelspacer/plugin/panelspacer.h | 6 +----- applets/systemmonitor/systemmonitor/systemmonitor.h | 3 ++- applets/systemtray/container/systemtraycontainer.h | 4 ++-- kcms/colors/colors.h | 5 +++-- kcms/cursortheme/kcmcursortheme.h | 3 ++- kcms/desktoptheme/kcm.h | 5 +++-- kcms/fonts/fonts.h | 5 +++-- kcms/lookandfeel/kcm.h | 6 ++++-- kcms/notifications/kcm.h | 13 +++++++------ kcms/style/kcmstyle.h | 4 ++-- shell/containmentconfigview.h | 7 ++----- 13 files changed, 35 insertions(+), 33 deletions(-) diff --git a/applets/notifications/filemenu.h b/applets/notifications/filemenu.h index a9045ba6d..aa7f4f91e 100644 --- a/applets/notifications/filemenu.h +++ b/applets/notifications/filemenu.h @@ -20,10 +20,10 @@ #include #include +#include #include class QAction; -class QQuickItem; class FileMenu : public QObject { diff --git a/applets/notifications/notificationapplet.h b/applets/notifications/notificationapplet.h index 79ebaf866..7ce7d6953 100644 --- a/applets/notifications/notificationapplet.h +++ b/applets/notifications/notificationapplet.h @@ -21,12 +21,13 @@ #pragma once +#include +#include + #include -class QQuickItem; class QString; class QRect; -class QWindow; class NotificationApplet : public Plasma::Applet { diff --git a/applets/panelspacer/plugin/panelspacer.h b/applets/panelspacer/plugin/panelspacer.h index fb0d82227..717628edb 100644 --- a/applets/panelspacer/plugin/panelspacer.h +++ b/applets/panelspacer/plugin/panelspacer.h @@ -21,11 +21,7 @@ #pragma once #include - -namespace PlasmaQuick -{ -class AppletQuickItem; -} +#include namespace Plasma { diff --git a/applets/systemmonitor/systemmonitor/systemmonitor.h b/applets/systemmonitor/systemmonitor/systemmonitor.h index 4bd175fec..0d072ba74 100644 --- a/applets/systemmonitor/systemmonitor/systemmonitor.h +++ b/applets/systemmonitor/systemmonitor/systemmonitor.h @@ -27,13 +27,14 @@ #include #include +#include + class ApplicationListModel; class QQuickItem; namespace KSysGuard { class SensorFace; -class SensorFaceController; } class KConfigLoader; diff --git a/applets/systemtray/container/systemtraycontainer.h b/applets/systemtray/container/systemtraycontainer.h index 981841d93..c93fab590 100644 --- a/applets/systemtray/container/systemtraycontainer.h +++ b/applets/systemtray/container/systemtraycontainer.h @@ -21,9 +21,9 @@ #ifndef SYSTEMTRAYCONTAINER_H #define SYSTEMTRAYCONTAINER_H -#include +#include -class QQuickItem; +#include /** * @brief Thin wrapping 'Plasma::Applet' for SystemTray. diff --git a/kcms/colors/colors.h b/kcms/colors/colors.h index 1285a292d..984f5dc7d 100644 --- a/kcms/colors/colors.h +++ b/kcms/colors/colors.h @@ -29,6 +29,9 @@ #include +#include "colorsmodel.h" +#include "colorssettings.h" + class QProcess; class QTemporaryFile; @@ -37,9 +40,7 @@ namespace KIO class FileCopyJob; } -class ColorsModel; class FilterProxyModel; -class ColorsSettings; class ColorsData; class KCMColors : public KQuickAddons::ManagedConfigModule diff --git a/kcms/cursortheme/kcmcursortheme.h b/kcms/cursortheme/kcmcursortheme.h index fff72a5a7..149294cbd 100644 --- a/kcms/cursortheme/kcmcursortheme.h +++ b/kcms/cursortheme/kcmcursortheme.h @@ -24,6 +24,8 @@ #include #include +#include "cursorthemesettings.h" + class QQmlListReference; class QStandardItemModel; class QTemporaryFile; @@ -31,7 +33,6 @@ class QTemporaryFile; class CursorThemeModel; class SortProxyModel; class CursorTheme; -class CursorThemeSettings; class CursorThemeData; namespace KIO diff --git a/kcms/desktoptheme/kcm.h b/kcms/desktoptheme/kcm.h index 0fbbd5e31..20249ce5f 100644 --- a/kcms/desktoptheme/kcm.h +++ b/kcms/desktoptheme/kcm.h @@ -25,6 +25,9 @@ #include +#include "desktopthemesettings.h" +#include "themesmodel.h" + class QTemporaryFile; namespace Plasma @@ -38,10 +41,8 @@ class FileCopyJob; } class QQuickItem; -class DesktopThemeSettings; class DesktopThemeData; class FilterProxyModel; -class ThemesModel; class KCMDesktopTheme : public KQuickAddons::ManagedConfigModule { diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h index 0249df65d..a2835f9c4 100644 --- a/kcms/fonts/fonts.h +++ b/kcms/fonts/fonts.h @@ -33,9 +33,10 @@ #include +#include "fontsaasettings.h" +#include "fontssettings.h" + class FontsData; -class FontsSettings; -class FontsAASettings; /** * The Desktop/fonts tab in kcontrol. diff --git a/kcms/lookandfeel/kcm.h b/kcms/lookandfeel/kcm.h index 6151c44aa..f7870ffd4 100644 --- a/kcms/lookandfeel/kcm.h +++ b/kcms/lookandfeel/kcm.h @@ -25,14 +25,16 @@ #include #include #include + #include +#include #include #include +#include "lookandfeelsettings.h" + class QQuickItem; -class QStandardItemModel; -class LookAndFeelSettings; class LookAndFeelData; class KCMLookandFeel : public KQuickAddons::ManagedConfigModule diff --git a/kcms/notifications/kcm.h b/kcms/notifications/kcm.h index dc791012c..dc578f7ee 100644 --- a/kcms/notifications/kcm.h +++ b/kcms/notifications/kcm.h @@ -25,18 +25,19 @@ #include #include +#include "badgesettings.h" +#include "donotdisturbsettings.h" +#include "filterproxymodel.h" +#include "jobsettings.h" +#include "notificationsettings.h" +#include "sourcesmodel.h" + class QAction; -class SourcesModel; -class FilterProxyModel; class NotificationsData; namespace NotificationManager { -class DoNotDisturbSettings; -class NotificationSettings; -class JobSettings; -class BadgeSettings; class BehaviorSettings; } diff --git a/kcms/style/kcmstyle.h b/kcms/style/kcmstyle.h index 250b6a318..6853091a2 100644 --- a/kcms/style/kcmstyle.h +++ b/kcms/style/kcmstyle.h @@ -35,12 +35,12 @@ #include #include "gtkpage.h" +#include "stylesettings.h" +#include "stylesmodel.h" class QQuickItem; -class StyleSettings; class StyleData; -class StylesModel; class StyleConfigDialog; class KCMStyle : public KQuickAddons::ManagedConfigModule diff --git a/shell/containmentconfigview.h b/shell/containmentconfigview.h index 65b4d780b..1f07970a1 100644 --- a/shell/containmentconfigview.h +++ b/shell/containmentconfigview.h @@ -20,6 +20,8 @@ #ifndef CONTAINMENTCONFIGVIEW_H #define CONTAINMENTCONFIGVIEW_H +#include +#include #include namespace Plasma @@ -30,11 +32,6 @@ class Containment; class QAbstractItemModel; class CurrentContainmentActionsModel; -namespace KDeclarative -{ -class ConfigPropertyMap; -} - // TODO: out of the library? class ContainmentConfigView : public PlasmaQuick::ConfigView {