Port QML KCMs away from setAboutData

Let them use the JSON metadata instead

src/kcms/decoration/kcm.cpp

@@ -11,7 +11,6 @@
 #include "declarative-plugin/buttonsmodel.h"
 #include "decorationmodel.h"
 
-#include <KAboutData>
 #include <KConfigGroup>
 #include <KLocalizedString>
 #include <KNSCore/Engine>
@@ -36,8 +35,8 @@ namespace
 const KDecoration2::BorderSize s_defaultRecommendedBorderSize = KDecoration2::BorderSize::Normal;
 }
 
-KCMKWinDecoration::KCMKWinDecoration(QObject *parent, const QVariantList &arguments)
+KCMKWinDecoration::KCMKWinDecoration(QObject *parent, const KPluginMetaData &metaData, const QVariantList &arguments)
-    : KQuickAddons::ManagedConfigModule(parent, arguments)
+    : KQuickAddons::ManagedConfigModule(parent, metaData, arguments)
     , m_themesModel(new KDecoration2::Configuration::DecorationsModel(this))
     , m_proxyThemesModel(new QSortFilterProxyModel(this))
     , m_leftButtonsModel(new KDecoration2::Preview::ButtonsModel(DecorationButtonsList(), this))
@@ -45,15 +44,6 @@ KCMKWinDecoration::KCMKWinDecoration(QObject *parent, const QVariantList &argume
     , m_availableButtonsModel(new KDecoration2::Preview::ButtonsModel(this))
     , m_data(new KWinDecorationData(this))
 {
-    auto about = new KAboutData(QStringLiteral("kcm_kwindecoration"),
-                                i18n("Window Decorations"),
-                                QStringLiteral("1.0"),
-                                QString(),
-                                KAboutLicense::GPL);
-    about->addAuthor(i18n("Valerio Pilo"),
-                     i18n("Author"),
-                     QStringLiteral("vpilo@coldshock.net"));
-    setAboutData(about);
     setButtons(Apply | Default | Help);
     qmlRegisterAnonymousType<QAbstractListModel>("org.kde.kwin.KWinDecoration", 1);
     qmlRegisterAnonymousType<QSortFilterProxyModel>("org.kde.kwin.KWinDecoration", 1);

src/kcms/decoration/kcm.h

@@ -47,7 +47,7 @@ class KCMKWinDecoration : public KQuickAddons::ManagedConfigModule
     Q_PROPERTY(QAbstractListModel *availableButtonsModel READ availableButtonsModel CONSTANT)
 
 public:
-    KCMKWinDecoration(QObject *parent, const QVariantList &arguments);
+    KCMKWinDecoration(QObject *parent, const KPluginMetaData &metaData, const QVariantList &arguments);
 
     KWinDecorationSettings *settings() const;
     QSortFilterProxyModel *themesModel() const;

src/kcms/desktop/virtualdesktops.cpp

@@ -25,15 +25,10 @@ K_PLUGIN_FACTORY_WITH_JSON(VirtualDesktopsFactory,
 namespace KWin
 {
 
-VirtualDesktops::VirtualDesktops(QObject *parent, const QVariantList &args)
+VirtualDesktops::VirtualDesktops(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
-    : KQuickAddons::ManagedConfigModule(parent, args)
+    : KQuickAddons::ManagedConfigModule(parent, metaData, args)
     , m_data(new VirtualDesktopsData(this))
 {
-    KAboutData *about = new KAboutData(QStringLiteral("kcm_kwin_virtualdesktops"),
-                                       i18n("Virtual Desktops"),
-                                       QStringLiteral("2.0"), QString(), KAboutLicense::GPL);
-    setAboutData(about);
-
     qmlRegisterAnonymousType<VirtualDesktopsSettings>("org.kde.kwin.kcm.desktop", 0);
 
     setButtons(Apply | Default | Help);

src/kcms/desktop/virtualdesktops.h

@@ -27,7 +27,7 @@ class VirtualDesktops : public KQuickAddons::ManagedConfigModule
     Q_PROPERTY(VirtualDesktopsSettings *virtualDesktopsSettings READ virtualDesktopsSettings CONSTANT)
 
 public:
-    explicit VirtualDesktops(QObject *parent = nullptr, const QVariantList &list = QVariantList());
+    explicit VirtualDesktops(QObject *parent, const KPluginMetaData &metaData, const QVariantList &list);
     ~VirtualDesktops() override;
 
     QAbstractItemModel *desktopsModel() const;

src/kcms/effects/kcm.cpp

@@ -9,7 +9,6 @@
 #include "effectsfilterproxymodel.h"
 #include "effectsmodel.h"
 
-#include <KAboutData>
 #include <KLocalizedString>
 #include <KPluginFactory>
 
@@ -24,21 +23,12 @@ K_PLUGIN_FACTORY_WITH_JSON(DesktopEffectsKCMFactory,
 namespace KWin
 {
 
-DesktopEffectsKCM::DesktopEffectsKCM(QObject *parent, const QVariantList &args)
+DesktopEffectsKCM::DesktopEffectsKCM(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
-    : KQuickAddons::ConfigModule(parent, args)
+    : KQuickAddons::ConfigModule(parent, metaData, args)
     , m_model(new EffectsModel(this))
 {
     qmlRegisterType<EffectsFilterProxyModel>("org.kde.private.kcms.kwin.effects", 1, 0, "EffectsFilterProxyModel");
 
-    auto about = new KAboutData(
-        QStringLiteral("kcm_kwin_effects"),
-        i18n("Desktop Effects"),
-        QStringLiteral("2.0"),
-        QString(),
-        KAboutLicense::GPL);
-    about->addAuthor(i18n("Vlad Zahorodnii"), QString(), QStringLiteral("vlad.zahorodnii@kde.org"));
-    setAboutData(about);
-
     setButtons(Apply | Default | Help);
 
     connect(m_model, &EffectsModel::dataChanged, this, &DesktopEffectsKCM::updateNeedsSave);

src/kcms/effects/kcm.h

@@ -22,7 +22,7 @@ class DesktopEffectsKCM : public KQuickAddons::ConfigModule
     Q_PROPERTY(QAbstractItemModel *effectsModel READ effectsModel CONSTANT)
 
 public:
-    explicit DesktopEffectsKCM(QObject *parent = nullptr, const QVariantList &list = {});
+    explicit DesktopEffectsKCM(QObject *parent, const KPluginMetaData &metaData, const QVariantList &list);
     ~DesktopEffectsKCM() override;
 
     QAbstractItemModel *effectsModel() const;

src/kcms/rules/kcmrules.cpp

@@ -11,7 +11,6 @@
 #include <QDBusConnection>
 #include <QDBusMessage>
 
-#include <KAboutData>
 #include <KConfig>
 #include <KLocalizedString>
 #include <KPluginFactory>
@@ -19,21 +18,11 @@
 namespace KWin
 {
 
-KCMKWinRules::KCMKWinRules(QObject *parent, const QVariantList &arguments)
+KCMKWinRules::KCMKWinRules(QObject *parent, const KPluginMetaData &metaData, const QVariantList &arguments)
-    : KQuickAddons::ConfigModule(parent, arguments)
+    : KQuickAddons::ConfigModule(parent, metaData, arguments)
     , m_ruleBookModel(new RuleBookModel(this))
     , m_rulesModel(new RulesModel(this))
 {
-    auto about = new KAboutData(QStringLiteral("kcm_kwinrules"),
-                                i18n("Window Rules"),
-                                QStringLiteral("1.0"),
-                                QString(),
-                                KAboutLicense::GPL);
-    about->addAuthor(i18n("Ismael Asensio"),
-                     i18n("Author"),
-                     QStringLiteral("isma.af@gmail.com"));
-    setAboutData(about);
-
     setQuickHelp(i18n("<p><h1>Window-specific Settings</h1> Here you can customize window settings specifically only"
                       " for some windows.</p>"
                       " <p>Please note that this configuration will not take effect if you do not use"

src/kcms/rules/kcmrules.h

@@ -24,7 +24,7 @@ class KCMKWinRules : public KQuickAddons::ConfigModule
     Q_PROPERTY(int editIndex READ editIndex NOTIFY editIndexChanged)
 
 public:
-    explicit KCMKWinRules(QObject *parent, const QVariantList &arguments);
+    explicit KCMKWinRules(QObject *parent, const KPluginMetaData &metaData, const QVariantList &arguments);
 
     Q_INVOKABLE void setRuleDescription(int index, const QString &description);
     Q_INVOKABLE void editRule(int index);

src/kcms/virtualkeyboard/kcmvirtualkeyboard.cpp

@@ -6,7 +6,6 @@
 
 #include "kcmvirtualkeyboard.h"
 
-#include <KAboutData>
 #include <KApplicationTrader>
 #include <KConfigGroup>
 #include <KDesktopFile>
@@ -18,18 +17,12 @@
 
 K_PLUGIN_FACTORY_WITH_JSON(KcmVirtualKeyboardFactory, "kcm_virtualkeyboard.json", registerPlugin<KcmVirtualKeyboard>(); registerPlugin<VirtualKeyboardData>();)
 
-KcmVirtualKeyboard::KcmVirtualKeyboard(QObject *parent, const QVariantList &args)
+KcmVirtualKeyboard::KcmVirtualKeyboard(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
-    : KQuickAddons::ManagedConfigModule(parent)
+    : KQuickAddons::ManagedConfigModule(parent, metaData, args)
     , m_data(new VirtualKeyboardData(this))
     , m_model(new VirtualKeyboardsModel(this))
 {
     qmlRegisterAnonymousType<VirtualKeyboardSettings>("org.kde.kwin.virtualkeyboardsettings", 1);
-
-    setAboutData(new KAboutData(QStringLiteral("kcm_virtualkeyboard"),
-                                i18n("Virtual Keyboard"),
-                                QStringLiteral("1.0"),
-                                i18n("Choose Virtual Keyboard"),
-                                KAboutLicense::GPL));
 }
 
 KcmVirtualKeyboard::~KcmVirtualKeyboard() = default;

src/kcms/virtualkeyboard/kcmvirtualkeyboard.h

@@ -42,7 +42,7 @@ class KcmVirtualKeyboard : public KQuickAddons::ManagedConfigModule
     Q_PROPERTY(QAbstractItemModel *model READ keyboardsModel CONSTANT)
 
 public:
-    explicit KcmVirtualKeyboard(QObject *parent = nullptr, const QVariantList &list = QVariantList());
+    explicit KcmVirtualKeyboard(QObject *parent, const KPluginMetaData &metaData, const QVariantList &list);
     ~KcmVirtualKeyboard() override;
 
     VirtualKeyboardSettings *settings() const;

src/kcms/xwayland/kcmkwinxwayland.cpp

@@ -6,7 +6,6 @@
 
 #include "kcmkwinxwayland.h"
 
-#include <KAboutData>
 #include <KApplicationTrader>
 #include <KConfigGroup>
 #include <KDesktopFile>
@@ -18,19 +17,13 @@
 
 K_PLUGIN_FACTORY_WITH_JSON(KcmXwaylandFactory, "kcm_kwinxwayland.json", registerPlugin<KcmXwayland>(); registerPlugin<KWinXwaylandData>();)
 
-KcmXwayland::KcmXwayland(QObject *parent, const QVariantList &args)
+KcmXwayland::KcmXwayland(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
-    : KQuickAddons::ManagedConfigModule(parent)
+    : KQuickAddons::ManagedConfigModule(parent, metaData, args)
     , m_data(new KWinXwaylandData(this))
     , m_settings(new KWinXwaylandSettings(m_data))
 {
     registerSettings(m_settings);
     qmlRegisterAnonymousType<KWinXwaylandSettings>("org.kde.kwin.kwinxwaylandsettings", 1);
-
-    setAboutData(new KAboutData(QStringLiteral("kcm_kwinxwayland"),
-                                i18n("Legacy X11 App Support"),
-                                QStringLiteral("1.0"),
-                                i18n("Allow legacy X11 apps to read keystrokes typed in other apps"),
-                                KAboutLicense::GPL));
 }
 
 KcmXwayland::~KcmXwayland() = default;

src/kcms/xwayland/kcmkwinxwayland.h

@@ -19,7 +19,7 @@ class KcmXwayland : public KQuickAddons::ManagedConfigModule
     Q_PROPERTY(KWinXwaylandSettings *settings READ settings CONSTANT)
 
 public:
-    explicit KcmXwayland(QObject *parent = nullptr, const QVariantList &list = QVariantList());
+    explicit KcmXwayland(QObject *parent, const KPluginMetaData &metaData, const QVariantList &list);
     ~KcmXwayland() override;
 
     KWinXwaylandSettings *settings() const