Use cmake generated module data

- desktoppathsdata
- launchfeedbackdata
- smserverdata
- splashscreendata

kcms/desktoppaths/CMakeLists.txt

@@ -4,7 +4,14 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_desktoppaths\")
 set(kcm_desktoppaths_PART_SRCS
    globalpaths.cpp
    desktoppathssettings.cpp
-   desktoppathsdata.cpp
+)
+
+kcmutils_generate_module_data(
+    kcm_desktoppaths_PART_SRCS
+    MODULE_DATA_HEADER desktoppathsdata.h
+    MODULE_DATA_CLASS_NAME DesktopPathsData
+    SETTINGS_HEADERS desktoppathssettings.h
+    SETTINGS_CLASSES DesktopPathsSettings
 )
 
 ki18n_wrap_ui(kcm_desktoppaths_PART_SRCS globalpaths.ui)

kcms/desktoppaths/desktoppathsdata.cpp

-/*
- * Copyright (c) 2020 Cyril Rossi <cyril.rossi@enioka.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "desktoppathsdata.h"
-#include "desktoppathssettings.h"
-
-DesktopPathsData::DesktopPathsData(QObject *parent, const QVariantList &args)
-    : KCModuleData(parent, args)
-    , m_settings(new DesktopPathsSettings(this))
-{
-    autoRegisterSkeletons();
-}
-
-DesktopPathsSettings *DesktopPathsData::settings() const
-{
-    return m_settings;
-}
-
-#include "desktoppathsdata.moc"

kcms/desktoppaths/desktoppathsdata.h

-/*
- * Copyright (c) 2020 Cyril Rossi <cyril.rossi@enioka.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DESKTOPPATHSDATA_H
-#define DESKTOPPATHSDATA_H
-
-#include <QObject>
-
-#include <KCModuleData>
-
-class DesktopPathsSettings;
-
-class DesktopPathsData : public KCModuleData
-{
-    Q_OBJECT
-
-public:
-    explicit DesktopPathsData(QObject *parent = nullptr, const QVariantList &args = QVariantList());
-    DesktopPathsSettings *settings() const;
-
-private:
-    DesktopPathsSettings *m_settings;
-};
-
-#endif // DESKTOPPATHSDATA_H

kcms/ksmserver/CMakeLists.txt

 # KI18N Translation Domain for this library
 add_definitions(-DTRANSLATION_DOMAIN=\"kcmsmserver\")
 
-set(kcm_smserver_PART_SRCS kcmsmserver.cpp smserverdata.cpp)
+set(kcm_smserver_PART_SRCS kcmsmserver.cpp)
+
+kcmutils_generate_module_data(
+    kcm_smserver_PART_SRCS
+    MODULE_DATA_HEADER smserverdata.h
+    MODULE_DATA_CLASS_NAME SMServerData
+    SETTINGS_HEADERS smserversettings.h
+    SETTINGS_CLASSES SMServerSettings
+)
 
 qt5_add_dbus_interface(kcm_smserver_PART_SRCS org.freedesktop.login1.Manager.xml login1_manager)
 

kcms/ksmserver/smserverdata.cpp

-/*
- * Copyright (c) 2020 Benjamin Port <benjamin.port@enioka.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "smserverdata.h"
-
-#include <QVariantList>
-
-#include "smserversettings.h"
-
-SMServerData::SMServerData(QObject *parent, const QVariantList &args)
-    : KCModuleData(parent, args)
-    , m_settings(new SMServerSettings(this))
-{
-    autoRegisterSkeletons();
-}
-
-SMServerSettings *SMServerData::settings() const
-{
-    return m_settings;
-}
-
-
-#include "smserverdata.moc"

kcms/ksmserver/smserverdata.h

-/*
- * Copyright (c) 2020 Benjamin Port <benjamin.port@enioka.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef SMSERVERDATA_H
-#define SMSERVERDATA_H
-
-#include <QObject>
-
-#include "kcmoduledata.h"
-
-class SMServerSettings;
-
-class SMServerData : public KCModuleData
-{
-    Q_OBJECT
-
-public:
-    explicit SMServerData(QObject *parent = nullptr, const QVariantList &args = QVariantList());
-    SMServerSettings *settings() const;
-
-private:
-    SMServerSettings *m_settings;
-};
-
-#endif

kcms/ksplash/CMakeLists.txt

@@ -3,7 +3,14 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_splashscreen\")
 
 set(kcm_splashscreen_SRCS
   kcm.cpp
-  splashscreendata.cpp
+)
+
+kcmutils_generate_module_data(
+    kcm_splashscreen_SRCS
+    MODULE_DATA_HEADER splashscreendata.h
+    MODULE_DATA_CLASS_NAME SplashScreenData
+    SETTINGS_HEADERS splashscreensettings.h
+    SETTINGS_CLASSES SplashScreenSettings
 )
 
 kconfig_add_kcfg_files(kcm_splashscreen_SRCS splashscreensettings.kcfgc GENERATE_MOC)

kcms/ksplash/splashscreendata.cpp

-/*
- * Copyright (c) 2020 Benjamin Port <benjamin.port@enioka.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "splashscreendata.h"
-
-#include <QVariantList>
-
-#include "splashscreensettings.h"
-
-SplashScreenData::SplashScreenData(QObject *parent, const QVariantList &args)
-    : KCModuleData(parent, args)
-    , m_settings(new SplashScreenSettings(this))
-{
-    autoRegisterSkeletons();
-}
-
-SplashScreenSettings *SplashScreenData::settings() const
-{
-    return m_settings;
-}
-
-
-#include "splashscreendata.moc"

kcms/ksplash/splashscreendata.h

-/*
- * Copyright (c) 2020 Benjamin Port <benjamin.port@enioka.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef SPLASHSCREENDATA_H
-#define SPLASHSCREENDATA_H
-
-#include <QObject>
-
-#include "kcmoduledata.h"
-
-class SplashScreenSettings;
-
-class SplashScreenData : public KCModuleData
-{
-    Q_OBJECT
-
-public:
-    explicit SplashScreenData(QObject *parent = nullptr, const QVariantList &args = QVariantList());
-    SplashScreenSettings *settings() const;
-
-private:
-    SplashScreenSettings *m_settings;
-};
-
-#endif

kcms/launch/CMakeLists.txt

@@ -3,7 +3,15 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_launchfeedback\")
 
 ########### next target ###############
 
-set(kcm_launchfeedback_PART_SRCS launchfeedback.cpp launchfeedbacksettings.cpp launchfeedbackdata.cpp)
+set(kcm_launchfeedback_PART_SRCS launchfeedback.cpp launchfeedbacksettings.cpp)
+
+kcmutils_generate_module_data(
+    kcm_launchfeedback_PART_SRCS
+    MODULE_DATA_HEADER launchfeedbackdata.h
+    MODULE_DATA_CLASS_NAME LaunchFeedbackData
+    SETTINGS_HEADERS launchfeedbacksettings.h
+    SETTINGS_CLASSES LaunchFeedbackSettings
+)
 
 kconfig_add_kcfg_files(kcm_launchfeedback_PART_SRCS launchfeedbacksettingsbase.kcfgc GENERATE_MOC)
 

kcms/launch/launchfeedbackdata.cpp

-/*
- * Copyright (c) 2020 Benjamin Port <benjamin.port@enioka.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "launchfeedbackdata.h"
-
-#include <QVariantList>
-
-#include "launchfeedbacksettings.h"
-
-LaunchFeedbackData::LaunchFeedbackData(QObject *parent, const QVariantList &args)
-    : KCModuleData(parent, args)
-    , m_settings(new LaunchFeedbackSettings(this))
-{
-    autoRegisterSkeletons();
-}
-
-LaunchFeedbackSettings *LaunchFeedbackData::settings() const
-{
-    return m_settings;
-}
-
-
-#include "launchfeedbackdata.moc"

kcms/launch/launchfeedbackdata.h

-/*
- * Copyright (c) 2020 Benjamin Port <benjamin.port@enioka.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef LAUNCHFEEDBACKDATA_H
-#define LAUNCHFEEDBACKDATA_H
-
-#include <QObject>
-
-#include "kcmoduledata.h"
-
-class LaunchFeedbackSettings;
-
-class LaunchFeedbackData : public KCModuleData
-{
-    Q_OBJECT
-
-public:
-    explicit LaunchFeedbackData(QObject *parent = nullptr, const QVariantList &args = QVariantList());
-    LaunchFeedbackSettings *settings() const;
-
-private:
-    LaunchFeedbackSettings *m_settings;
-};
-
-#endif