diff --git a/applets/appmenu/lib/appmenuapplet.h b/applets/appmenu/lib/appmenuapplet.h index d0e63bcf4..50dad0a15 100644 --- a/applets/appmenu/lib/appmenuapplet.h +++ b/applets/appmenu/lib/appmenuapplet.h @@ -62,7 +62,7 @@ public: int view() const; void setView(int type); -signals: +Q_SIGNALS: void modelChanged(); void viewChanged(); void currentIndexChanged(); diff --git a/applets/appmenu/plugin/appmenumodel.h b/applets/appmenu/plugin/appmenumodel.h index a6b6f84c1..33d8c0f2f 100644 --- a/applets/appmenu/plugin/appmenumodel.h +++ b/applets/appmenu/plugin/appmenumodel.h @@ -66,7 +66,7 @@ public: QRect screenGeometry() const; void setScreenGeometry(QRect geometry); -signals: +Q_SIGNALS: void requestActivateIndex(int index); private Q_SLOTS: @@ -74,7 +74,7 @@ private Q_SLOTS: void setVisible(bool visible); void update(); -signals: +Q_SIGNALS: void menuAvailableChanged(); void modelNeedsUpdate(); void screenGeometryChanged(); diff --git a/applets/digital-clock/plugin/clipboardmenu.h b/applets/digital-clock/plugin/clipboardmenu.h index a35d8e888..2489e6f2d 100644 --- a/applets/digital-clock/plugin/clipboardmenu.h +++ b/applets/digital-clock/plugin/clipboardmenu.h @@ -46,7 +46,7 @@ public: Q_INVOKABLE void setupMenu(QAction *action); -signals: +Q_SIGNALS: void currentDateChanged(); void secondsIncludedChanged(); diff --git a/applets/icon/iconapplet.h b/applets/icon/iconapplet.h index dca972530..32c51efca 100644 --- a/applets/icon/iconapplet.h +++ b/applets/icon/iconapplet.h @@ -68,7 +68,7 @@ public: Q_INVOKABLE bool isAcceptableDrag(QObject *dropEvent); -signals: +Q_SIGNALS: void urlChanged(const QUrl &url); void nameChanged(const QString &name); diff --git a/applets/kicker/CMakeLists.txt b/applets/kicker/CMakeLists.txt index 1000e4865..65614739c 100644 --- a/applets/kicker/CMakeLists.txt +++ b/applets/kicker/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( # -DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY - -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_USE_FAST_OPERATOR_PLUS -DTRANSLATION_DOMAIN=\"libkicker\" ) diff --git a/applets/notifications/filemenu.h b/applets/notifications/filemenu.h index f1dd451e7..a9045ba6d 100644 --- a/applets/notifications/filemenu.h +++ b/applets/notifications/filemenu.h @@ -47,7 +47,7 @@ public: Q_INVOKABLE void open(int x, int y); -signals: +Q_SIGNALS: void actionTriggered(QAction *action); void urlChanged(); diff --git a/applets/notifications/globalshortcuts.h b/applets/notifications/globalshortcuts.h index aa1f8d403..b7f66a127 100644 --- a/applets/notifications/globalshortcuts.h +++ b/applets/notifications/globalshortcuts.h @@ -34,7 +34,7 @@ public: Q_INVOKABLE void showDoNotDisturbOsd(bool doNotDisturb) const; -signals: +Q_SIGNALS: void toggleDoNotDisturbTriggered(); private: diff --git a/applets/notifications/notificationapplet.h b/applets/notifications/notificationapplet.h index a3c8abc0a..79ebaf866 100644 --- a/applets/notifications/notificationapplet.h +++ b/applets/notifications/notificationapplet.h @@ -63,7 +63,7 @@ public: Q_INVOKABLE void forceActivateWindow(QWindow *window); -signals: +Q_SIGNALS: void dragActiveChanged(); void dragPixmapSizeChanged(); void focussedPlasmaDialogChanged(); diff --git a/applets/notifications/thumbnailer.h b/applets/notifications/thumbnailer.h index 2329dfbd6..9ca05265e 100644 --- a/applets/notifications/thumbnailer.h +++ b/applets/notifications/thumbnailer.h @@ -64,7 +64,7 @@ public: void classBegin() override; void componentComplete() override; -signals: +Q_SIGNALS: void menuVisibleChanged(); void urlChanged(); diff --git a/applets/systemtray/dbusserviceobserver.h b/applets/systemtray/dbusserviceobserver.h index 862bff022..2a9e18294 100644 --- a/applets/systemtray/dbusserviceobserver.h +++ b/applets/systemtray/dbusserviceobserver.h @@ -44,7 +44,7 @@ public: void unregisterPlugin(const QString &pluginId); bool isDBusActivable(const QString &pluginId); -signals: +Q_SIGNALS: void serviceStarted(const QString &pluginId); void serviceStopped(const QString &pluginId); diff --git a/applets/systemtray/plasmoidregistry.h b/applets/systemtray/plasmoidregistry.h index 801fc7bfc..d9b6b1d2e 100644 --- a/applets/systemtray/plasmoidregistry.h +++ b/applets/systemtray/plasmoidregistry.h @@ -39,7 +39,7 @@ public: virtual QMap systemTrayApplets(); bool isSystemTrayApplet(const QString &pluginId); -signals: +Q_SIGNALS: /** * @brief Emitted when new plasmoid configuration is registered. * Emitted on initial run or when new plasmoid is installed in the system. diff --git a/applets/systemtray/systemtraysettings.h b/applets/systemtray/systemtraysettings.h index 139cd1353..3f4dfbe54 100644 --- a/applets/systemtray/systemtraysettings.h +++ b/applets/systemtray/systemtraysettings.h @@ -51,7 +51,7 @@ public: virtual void cleanupPlugin(const QString &pluginId); -signals: +Q_SIGNALS: void configurationChanged(); void enabledPluginsChanged(const QStringList &enabledPlugins, const QStringList &disabledPlugins); diff --git a/components/sessionsprivate/sessionsmodel.h b/components/sessionsprivate/sessionsmodel.h index 60a86d76a..90deffdfd 100644 --- a/components/sessionsprivate/sessionsmodel.h +++ b/components/sessionsprivate/sessionsmodel.h @@ -93,7 +93,7 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const override; QHash roleNames() const override; -signals: +Q_SIGNALS: void shouldLockChanged(); void showNewSessionEntryChanged(); void countChanged(); diff --git a/dataengines/devicenotifications/ksolidnotify.h b/dataengines/devicenotifications/ksolidnotify.h index 9a632ded7..3ad8dbc48 100644 --- a/dataengines/devicenotifications/ksolidnotify.h +++ b/dataengines/devicenotifications/ksolidnotify.h @@ -45,7 +45,7 @@ class KSolidNotify : public QObject public: explicit KSolidNotify(QObject *parent); -signals: +Q_SIGNALS: void notify(Solid::ErrorType solidError, const QString &error, const QString &errorDetails, const QString &udi); void blockingAppsReady(const QStringList &apps); void clearNotification(const QString &udi); diff --git a/freespacenotifier/freespacenotifier.h b/freespacenotifier/freespacenotifier.h index 8952462f0..6cb10016c 100644 --- a/freespacenotifier/freespacenotifier.h +++ b/freespacenotifier/freespacenotifier.h @@ -37,7 +37,7 @@ public: explicit FreeSpaceNotifier(const QString &path, const KLocalizedString ¬ificationText, QObject *parent = nullptr); ~FreeSpaceNotifier() override; -signals: +Q_SIGNALS: void configureRequested(); private: diff --git a/gmenu-dbusmenu-proxy/actions.h b/gmenu-dbusmenu-proxy/actions.h index dbce54365..df7a799fe 100644 --- a/gmenu-dbusmenu-proxy/actions.h +++ b/gmenu-dbusmenu-proxy/actions.h @@ -42,7 +42,7 @@ public: bool isValid() const; // basically "has actions" -signals: +Q_SIGNALS: void loaded(); void failedToLoad(); // expose error? void actionsChanged(const QStringList &dirtyActions); diff --git a/gmenu-dbusmenu-proxy/menu.h b/gmenu-dbusmenu-proxy/menu.h index c2191f666..7b98a8cbd 100644 --- a/gmenu-dbusmenu-proxy/menu.h +++ b/gmenu-dbusmenu-proxy/menu.h @@ -52,7 +52,7 @@ public: public slots: void actionsChanged(const QStringList &dirtyActions, const QString &prefix); -signals: +Q_SIGNALS: void menuAppeared(); // emitted the first time a menu was successfully loaded void menuDisappeared(); diff --git a/gmenu-dbusmenu-proxy/window.h b/gmenu-dbusmenu-proxy/window.h index fec0e6985..060d254a9 100644 --- a/gmenu-dbusmenu-proxy/window.h +++ b/gmenu-dbusmenu-proxy/window.h @@ -83,7 +83,7 @@ public: QString status() const; uint version() const; -signals: +Q_SIGNALS: // don't want to pollute X stuff into Menu, let all of that be in MenuProxy void requestWriteWindowProperties(); void requestRemoveWindowProperties(); diff --git a/kcms/fonts/fontsaasettings.h b/kcms/fonts/fontsaasettings.h index 498f8136a..04169d6d4 100644 --- a/kcms/fonts/fontsaasettings.h +++ b/kcms/fonts/fontsaasettings.h @@ -59,7 +59,7 @@ public: void setSubPixel(KXftConfig::SubPixel::Type type); void setHinting(KXftConfig::Hint::Style hinting); -signals: +Q_SIGNALS: void excludeChanged(); void excludeFromChanged(); void excludeToChanged(); diff --git a/kcms/icons/iconsizecategorymodel.h b/kcms/icons/iconsizecategorymodel.h index e2b48ea86..e107a4055 100644 --- a/kcms/icons/iconsizecategorymodel.h +++ b/kcms/icons/iconsizecategorymodel.h @@ -51,7 +51,7 @@ public: void load(); -signals: +Q_SIGNALS: void categorySelectedIndexChanged(); private: diff --git a/kcms/icons/iconsmodel.h b/kcms/icons/iconsmodel.h index 9b1e220d8..b748e2f88 100644 --- a/kcms/icons/iconsmodel.h +++ b/kcms/icons/iconsmodel.h @@ -63,7 +63,7 @@ public: void load(); -signals: +Q_SIGNALS: void pendingDeletionsChanged(); private: diff --git a/kcms/icons/main.h b/kcms/icons/main.h index c72225a05..bb0bb184c 100644 --- a/kcms/icons/main.h +++ b/kcms/icons/main.h @@ -85,7 +85,7 @@ public: // QML doesn't understand QList, hence wrapped in a QVariantList Q_INVOKABLE QVariantList previewIcons(const QString &themeName, int size, qreal dpr, int limit = -1); -signals: +Q_SIGNALS: void downloadingFileChanged(); void showSuccessMessage(const QString &message); diff --git a/kcms/translations/translationssettings.h b/kcms/translations/translationssettings.h index 4758ebb68..2717676f6 100644 --- a/kcms/translations/translationssettings.h +++ b/kcms/translations/translationssettings.h @@ -33,7 +33,7 @@ public: QStringList configuredLanguages() const; void setConfiguredLanguages(const QStringList &langs); -signals: +Q_SIGNALS: void configuredLanguagesChanged(); }; diff --git a/libnotificationmanager/abstractnotificationsmodel.h b/libnotificationmanager/abstractnotificationsmodel.h index f50cae096..825a607f5 100644 --- a/libnotificationmanager/abstractnotificationsmodel.h +++ b/libnotificationmanager/abstractnotificationsmodel.h @@ -62,7 +62,7 @@ public: void clear(Notifications::ClearFlags flags); -signals: +Q_SIGNALS: void lastReadChanged(); protected: diff --git a/libnotificationmanager/job.h b/libnotificationmanager/job.h index 789a716a8..eda62b15d 100644 --- a/libnotificationmanager/job.h +++ b/libnotificationmanager/job.h @@ -207,7 +207,7 @@ public: Q_INVOKABLE void resume(); Q_INVOKABLE void kill(); -signals: +Q_SIGNALS: void updatedChanged(); void summaryChanged(); void textChanged(); diff --git a/libnotificationmanager/job_p.h b/libnotificationmanager/job_p.h index c4a9ee245..1a9f156f1 100644 --- a/libnotificationmanager/job_p.h +++ b/libnotificationmanager/job_p.h @@ -69,7 +69,7 @@ public: void terminate(uint errorCode, const QString &errorMessage, const QVariantMap &hints); void update(const QVariantMap &properties); -signals: +Q_SIGNALS: void closed(); void infoMessageChanged(); diff --git a/libnotificationmanager/jobsmodel.h b/libnotificationmanager/jobsmodel.h index ec0fdcc01..bdacf4403 100644 --- a/libnotificationmanager/jobsmodel.h +++ b/libnotificationmanager/jobsmodel.h @@ -84,7 +84,7 @@ public: void clear(Notifications::ClearFlags flags); -signals: +Q_SIGNALS: void serviceOwnershipLost(); private: diff --git a/libnotificationmanager/limitedrowcountproxymodel_p.h b/libnotificationmanager/limitedrowcountproxymodel_p.h index d1f8ee883..f7af0678c 100644 --- a/libnotificationmanager/limitedrowcountproxymodel_p.h +++ b/libnotificationmanager/limitedrowcountproxymodel_p.h @@ -35,7 +35,7 @@ public: int limit() const; void setLimit(int limit); -signals: +Q_SIGNALS: void limitChanged(); protected: diff --git a/libnotificationmanager/notificationfilterproxymodel_p.h b/libnotificationmanager/notificationfilterproxymodel_p.h index 2cf6745f1..c13f8fd9c 100644 --- a/libnotificationmanager/notificationfilterproxymodel_p.h +++ b/libnotificationmanager/notificationfilterproxymodel_p.h @@ -56,7 +56,7 @@ public: QStringList whitelistedNotifyRcNames() const; void setWhitelistedNotifyRcNames(const QStringList &whitelist); -signals: +Q_SIGNALS: void urgenciesChanged(); void showExpiredChanged(); void showDismissedChanged(); diff --git a/libnotificationmanager/notificationgroupcollapsingproxymodel_p.h b/libnotificationmanager/notificationgroupcollapsingproxymodel_p.h index 10fecf9c0..f5b6ac9fa 100644 --- a/libnotificationmanager/notificationgroupcollapsingproxymodel_p.h +++ b/libnotificationmanager/notificationgroupcollapsingproxymodel_p.h @@ -49,7 +49,7 @@ public: void collapseAll(); -signals: +Q_SIGNALS: void limitChanged(); void lastReadChanged(); void expandUnreadChanged(); diff --git a/libnotificationmanager/notifications.h b/libnotificationmanager/notifications.h index c2b08cea6..caeddb1fb 100644 --- a/libnotificationmanager/notifications.h +++ b/libnotificationmanager/notifications.h @@ -530,7 +530,7 @@ public: bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override; -signals: +Q_SIGNALS: void limitChanged(); void showExpiredChanged(); void showDismissedChanged(); diff --git a/libnotificationmanager/notificationsortproxymodel_p.h b/libnotificationmanager/notificationsortproxymodel_p.h index faaff39ec..7c82c4623 100644 --- a/libnotificationmanager/notificationsortproxymodel_p.h +++ b/libnotificationmanager/notificationsortproxymodel_p.h @@ -40,7 +40,7 @@ public: Qt::SortOrder sortOrder() const; void setSortOrder(Qt::SortOrder sortOrder); -signals: +Q_SIGNALS: void sortModeChanged(); void sortOrderChanged(); diff --git a/libnotificationmanager/settings.h b/libnotificationmanager/settings.h index c808dd6be..e615c5e4f 100644 --- a/libnotificationmanager/settings.h +++ b/libnotificationmanager/settings.h @@ -322,7 +322,7 @@ public: */ Q_INVOKABLE void revokeApplicationInhibitions(); -signals: +Q_SIGNALS: void settingsChanged(); void liveChanged(); diff --git a/libnotificationmanager/watchednotificationsmodel.h b/libnotificationmanager/watchednotificationsmodel.h index a33359f33..1c6f57479 100644 --- a/libnotificationmanager/watchednotificationsmodel.h +++ b/libnotificationmanager/watchednotificationsmodel.h @@ -44,7 +44,7 @@ public: Q_INVOKABLE void reply(uint notificationId, const QString &text) override; bool valid(); -signals: +Q_SIGNALS: void validChanged(bool valid); private: diff --git a/phonon/platform_kde/kdeplatformplugin.h b/phonon/platform_kde/kdeplatformplugin.h index cfc0f9020..a425d658e 100644 --- a/phonon/platform_kde/kdeplatformplugin.h +++ b/phonon/platform_kde/kdeplatformplugin.h @@ -49,7 +49,7 @@ public: QList objectDescriptionIndexes(ObjectDescriptionType type) const override; QHash objectDescriptionProperties(ObjectDescriptionType type, int index) const override; -signals: +Q_SIGNALS: void objectDescriptionChanged(ObjectDescriptionType); }; diff --git a/shell/currentcontainmentactionsmodel.h b/shell/currentcontainmentactionsmodel.h index 6e2cf756f..c0aba0708 100644 --- a/shell/currentcontainmentactionsmodel.h +++ b/shell/currentcontainmentactionsmodel.h @@ -61,7 +61,7 @@ public: Q_INVOKABLE void showAbout(int row, QQuickItem *ctx = nullptr); Q_INVOKABLE void save(); -signals: +Q_SIGNALS: void configurationChanged(); private: