Use Q_SIGNALS instead of signals in header files

And remove DQT_NO_SIGNALS_SLOTS_KEYWORDS from applets/kicker/CMakeLists.txt.

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();

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();

applets/digital-clock/plugin/clipboardmenu.h

@@ -46,7 +46,7 @@ public:
 
     Q_INVOKABLE void setupMenu(QAction *action);
 
-signals:
+Q_SIGNALS:
     void currentDateChanged();
     void secondsIncludedChanged();
 

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);

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\"
 )

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();

applets/notifications/globalshortcuts.h

@@ -34,7 +34,7 @@ public:
 
     Q_INVOKABLE void showDoNotDisturbOsd(bool doNotDisturb) const;
 
-signals:
+Q_SIGNALS:
     void toggleDoNotDisturbTriggered();
 
 private:

applets/notifications/notificationapplet.h

@@ -63,7 +63,7 @@ public:
 
     Q_INVOKABLE void forceActivateWindow(QWindow *window);
 
-signals:
+Q_SIGNALS:
     void dragActiveChanged();
     void dragPixmapSizeChanged();
     void focussedPlasmaDialogChanged();

applets/notifications/thumbnailer.h

@@ -64,7 +64,7 @@ public:
     void classBegin() override;
     void componentComplete() override;
 
-signals:
+Q_SIGNALS:
     void menuVisibleChanged();
 
     void urlChanged();

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);
 

applets/systemtray/plasmoidregistry.h

@@ -39,7 +39,7 @@ public:
     virtual QMap<QString, KPluginMetaData> 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.

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);
 

components/sessionsprivate/sessionsmodel.h

@@ -93,7 +93,7 @@ public:
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QHash<int, QByteArray> roleNames() const override;
 
-signals:
+Q_SIGNALS:
     void shouldLockChanged();
     void showNewSessionEntryChanged();
     void countChanged();

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);

freespacenotifier/freespacenotifier.h

@@ -37,7 +37,7 @@ public:
     explicit FreeSpaceNotifier(const QString &path, const KLocalizedString &notificationText, QObject *parent = nullptr);
     ~FreeSpaceNotifier() override;
 
-signals:
+Q_SIGNALS:
     void configureRequested();
 
 private:

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);

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();
 

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();

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();

kcms/icons/iconsizecategorymodel.h

@@ -51,7 +51,7 @@ public:
 
     void load();
 
-signals:
+Q_SIGNALS:
     void categorySelectedIndexChanged();
 
 private:

kcms/icons/iconsmodel.h

@@ -63,7 +63,7 @@ public:
 
     void load();
 
-signals:
+Q_SIGNALS:
     void pendingDeletionsChanged();
 
 private:

kcms/icons/main.h

@@ -85,7 +85,7 @@ public:
     // QML doesn't understand QList<QPixmap>, 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);

kcms/translations/translationssettings.h

@@ -33,7 +33,7 @@ public:
     QStringList configuredLanguages() const;
     void setConfiguredLanguages(const QStringList &langs);
 
-signals:
+Q_SIGNALS:
     void configuredLanguagesChanged();
 };
 

libnotificationmanager/abstractnotificationsmodel.h

@@ -62,7 +62,7 @@ public:
 
     void clear(Notifications::ClearFlags flags);
 
-signals:
+Q_SIGNALS:
     void lastReadChanged();
 
 protected:

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();

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();

libnotificationmanager/jobsmodel.h

@@ -84,7 +84,7 @@ public:
 
     void clear(Notifications::ClearFlags flags);
 
-signals:
+Q_SIGNALS:
     void serviceOwnershipLost();
 
 private:

libnotificationmanager/limitedrowcountproxymodel_p.h

@@ -35,7 +35,7 @@ public:
     int limit() const;
     void setLimit(int limit);
 
-signals:
+Q_SIGNALS:
     void limitChanged();
 
 protected:

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();

libnotificationmanager/notificationgroupcollapsingproxymodel_p.h

@@ -49,7 +49,7 @@ public:
 
     void collapseAll();
 
-signals:
+Q_SIGNALS:
     void limitChanged();
     void lastReadChanged();
     void expandUnreadChanged();

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();

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();
 

libnotificationmanager/settings.h

@@ -322,7 +322,7 @@ public:
      */
     Q_INVOKABLE void revokeApplicationInhibitions();
 
-signals:
+Q_SIGNALS:
     void settingsChanged();
 
     void liveChanged();

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:

phonon/platform_kde/kdeplatformplugin.h

@@ -49,7 +49,7 @@ public:
     QList<int> objectDescriptionIndexes(ObjectDescriptionType type) const override;
     QHash<QByteArray, QVariant> objectDescriptionProperties(ObjectDescriptionType type, int index) const override;
 
-signals:
+Q_SIGNALS:
     void objectDescriptionChanged(ObjectDescriptionType);
 };
 

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: