From 84de3fda6e2db0d3e7fca67dbd194f3a143ddeae Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 12 Dec 2021 10:07:54 +0100 Subject: [PATCH] Use Q_SLOTS --- applets/appmenu/lib/appmenuapplet.h | 2 +- applets/notifications/notificationapplet.h | 2 +- dataengines/devicenotifications/devicenotificationsengine.h | 2 +- dataengines/devicenotifications/ksolidnotify.h | 2 +- dataengines/hotplug/deviceserviceaction.cpp | 2 +- gmenu-dbusmenu-proxy/actions.h | 2 +- gmenu-dbusmenu-proxy/menu.h | 4 ++-- kcms/icons/iconssettings.h | 2 +- kioslave/desktop/desktopnotifier.h | 4 ++-- libnotificationmanager/server_p.h | 2 +- solidautoeject/solidautoeject.h | 2 +- wallpapers/image/autotests/testfindpreferredimage.cpp | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/applets/appmenu/lib/appmenuapplet.h b/applets/appmenu/lib/appmenuapplet.h index f7822f655..e39be529f 100644 --- a/applets/appmenu/lib/appmenuapplet.h +++ b/applets/appmenu/lib/appmenuapplet.h @@ -54,7 +54,7 @@ Q_SIGNALS: void buttonGridChanged(); void requestActivateIndex(int index); -public slots: +public Q_SLOTS: void trigger(QQuickItem *ctx, int idx); protected: diff --git a/applets/notifications/notificationapplet.h b/applets/notifications/notificationapplet.h index 68ee5e603..a085ea242 100644 --- a/applets/notifications/notificationapplet.h +++ b/applets/notifications/notificationapplet.h @@ -54,7 +54,7 @@ Q_SIGNALS: void dragPixmapSizeChanged(); void focussedPlasmaDialogChanged(); -private slots: +private Q_SLOTS: void doDrag(QQuickItem *item, const QUrl &url, const QPixmap &pixmap); private: diff --git a/dataengines/devicenotifications/devicenotificationsengine.h b/dataengines/devicenotifications/devicenotificationsengine.h index 9c80a8fc8..dee5f8296 100644 --- a/dataengines/devicenotifications/devicenotificationsengine.h +++ b/dataengines/devicenotifications/devicenotificationsengine.h @@ -22,7 +22,7 @@ public: DeviceNotificationsEngine(QObject *parent, const QVariantList &args); ~DeviceNotificationsEngine() override; -private slots: +private Q_SLOTS: void notify(Solid::ErrorType solidError, const QString &error, const QString &errorDetails, const QString &udi); void clearNotification(const QString &udi); diff --git a/dataengines/devicenotifications/ksolidnotify.h b/dataengines/devicenotifications/ksolidnotify.h index 1300eda38..cd187e096 100644 --- a/dataengines/devicenotifications/ksolidnotify.h +++ b/dataengines/devicenotifications/ksolidnotify.h @@ -36,7 +36,7 @@ Q_SIGNALS: void blockingAppsReady(const QStringList &apps); void clearNotification(const QString &udi); -protected slots: +protected Q_SLOTS: void onDeviceAdded(const QString &udi); void onDeviceRemoved(const QString &udi); diff --git a/dataengines/hotplug/deviceserviceaction.cpp b/dataengines/hotplug/deviceserviceaction.cpp index d51afeeb0..13d55ffae 100644 --- a/dataengines/hotplug/deviceserviceaction.cpp +++ b/dataengines/hotplug/deviceserviceaction.cpp @@ -38,7 +38,7 @@ class DelayedExecutor : public QObject public: DelayedExecutor(const KServiceAction &service, Solid::Device &device); -private slots: +private Q_SLOTS: void _k_storageSetupDone(Solid::ErrorType error, QVariant errorData, const QString &udi); private: diff --git a/gmenu-dbusmenu-proxy/actions.h b/gmenu-dbusmenu-proxy/actions.h index a0de1c468..dea854ab6 100644 --- a/gmenu-dbusmenu-proxy/actions.h +++ b/gmenu-dbusmenu-proxy/actions.h @@ -34,7 +34,7 @@ Q_SIGNALS: void failedToLoad(); // expose error? void actionsChanged(const QStringList &dirtyActions); -private slots: +private Q_SLOTS: void onActionsChanged(const QStringList &removed, const StringBoolMap &enabledChanges, const QVariantMap &stateChanges, const GMenuActionMap &added); private: diff --git a/gmenu-dbusmenu-proxy/menu.h b/gmenu-dbusmenu-proxy/menu.h index be0c15fa6..9547aec0a 100644 --- a/gmenu-dbusmenu-proxy/menu.h +++ b/gmenu-dbusmenu-proxy/menu.h @@ -36,7 +36,7 @@ public: QVariantMap getItem(int id) const; // bool ok argument? QVariantMap getItem(int subscription, int sectionId, int id) const; -public slots: +public Q_SLOTS: void actionsChanged(const QStringList &dirtyActions, const QString &prefix); Q_SIGNALS: @@ -49,7 +49,7 @@ Q_SIGNALS: void itemsChanged(const QVector &itemIds); void menusChanged(const QVector &menuIds); -private slots: +private Q_SLOTS: void onMenuChanged(const GMenuChangeList &changes); private: diff --git a/kcms/icons/iconssettings.h b/kcms/icons/iconssettings.h index bc649f81c..4875e91a6 100644 --- a/kcms/icons/iconssettings.h +++ b/kcms/icons/iconssettings.h @@ -14,7 +14,7 @@ class IconsSettings : public IconsSettingsBase public: IconsSettings(QObject *parent = nullptr); ~IconsSettings() override; -public slots: +public Q_SLOTS: void updateIconTheme(); void updateThemeDirty(); diff --git a/kioslave/desktop/desktopnotifier.h b/kioslave/desktop/desktopnotifier.h index 15e2c7834..354778b6b 100644 --- a/kioslave/desktop/desktopnotifier.h +++ b/kioslave/desktop/desktopnotifier.h @@ -20,10 +20,10 @@ class DesktopNotifier : public KDEDModule public: DesktopNotifier(QObject *parent, const QList &); -public slots: +public Q_SLOTS: Q_SCRIPTABLE Q_NOREPLY void watchDir(const QString &path); -private slots: +private Q_SLOTS: void created(const QString &path); void dirty(const QString &path); diff --git a/libnotificationmanager/server_p.h b/libnotificationmanager/server_p.h index 06c73475d..7acc4889b 100644 --- a/libnotificationmanager/server_p.h +++ b/libnotificationmanager/server_p.h @@ -102,7 +102,7 @@ public: // stuff used by public class bool m_valid = false; uint m_highestNotificationId = 1; -private slots: +private Q_SLOTS: void onBroadcastNotification(const QMap &properties); private: diff --git a/solidautoeject/solidautoeject.h b/solidautoeject/solidautoeject.h index c3b5e4d7b..9ad132798 100644 --- a/solidautoeject/solidautoeject.h +++ b/solidautoeject/solidautoeject.h @@ -21,7 +21,7 @@ public: SolidAutoEject(QObject *parent, const QList &); ~SolidAutoEject() override; -private slots: +private Q_SLOTS: void onDeviceAdded(const QString &udi); void onEjectPressed(const QString &udi); diff --git a/wallpapers/image/autotests/testfindpreferredimage.cpp b/wallpapers/image/autotests/testfindpreferredimage.cpp index f1b684f7d..d37814590 100644 --- a/wallpapers/image/autotests/testfindpreferredimage.cpp +++ b/wallpapers/image/autotests/testfindpreferredimage.cpp @@ -20,7 +20,7 @@ class TestResolutions : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testResolutions_data(); void testResolutions();