diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fd3e771b7a..3f3ecfff26 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,11 +15,8 @@ add_definitions(
 )
 remove_definitions(
     -DQT_NO_CAST_FROM_BYTEARRAY
-    -DQT_NO_SIGNALS_SLOTS_KEYWORDS
     -DQT_NO_CAST_FROM_ASCII
     -DQT_NO_CAST_TO_ASCII
-    -DQT_NO_FOREACH
-    -DQT_NO_KEYWORDS
 )
 
 ##########################################
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 883d92b699..921f5a4c94 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -111,7 +111,7 @@ public:
     bool isFoldersPanelEnabled() const;
     bool isInformationPanelEnabled() const;
 
-public slots:
+public Q_SLOTS:
     /**
      * Opens each directory in \p dirs in a separate tab. If \a splitView is set,
      * 2 directories are collected within one tab.
@@ -174,7 +174,7 @@ public slots:
      */
     void openNewTab(const QUrl& url);
 
-signals:
+Q_SIGNALS:
     /**
      * Is sent if the selection of the currently active view has
      * been changed.
@@ -216,7 +216,7 @@ protected:
     /** Handles QWhatsThisClickedEvent and passes all others on. */
     bool eventFilter(QObject*, QEvent*) override;
 
-protected slots:
+protected Q_SLOTS:
     /**
      * Calls the base method KXmlGuiWindow::saveNewToolbarConfig().
      * Is also used to set toolbar constraints and UrlNavigator position
@@ -224,7 +224,7 @@ protected slots:
      */
     void saveNewToolbarConfig() override;
 
-private slots:
+private Q_SLOTS:
     /**
      * Refreshes the views of the main window by recreating them according to
      * the given Dolphin settings.
diff --git a/src/dolphinnewfilemenu.h b/src/dolphinnewfilemenu.h
index 5b2cc5e755..650863cb11 100644
--- a/src/dolphinnewfilemenu.h
+++ b/src/dolphinnewfilemenu.h
@@ -28,10 +28,10 @@ public:
     DolphinNewFileMenu(KActionCollection* collection, QObject* parent);
     ~DolphinNewFileMenu() override;
 
-signals:
+Q_SIGNALS:
     void errorMessage(const QString& error);
 
-protected slots:
+protected Q_SLOTS:
     /** @see KNewFileMenu::slotResult() */
     void slotResult(KJob* job) override;
 };
diff --git a/src/dolphinrecenttabsmenu.h b/src/dolphinrecenttabsmenu.h
index 6107356934..74a7727d33 100644
--- a/src/dolphinrecenttabsmenu.h
+++ b/src/dolphinrecenttabsmenu.h
@@ -20,15 +20,15 @@ class DolphinRecentTabsMenu : public KActionMenu
 public:
     explicit DolphinRecentTabsMenu(QObject* parent);
 
-public slots:
+public Q_SLOTS:
     void rememberClosedTab(const QUrl& url, const QByteArray& state);
     void undoCloseTab();
 
-signals:
+Q_SIGNALS:
     void restoreClosedTab(const QByteArray& state);
     void closedTabsCountChanged(unsigned int count);
 
-private slots:
+private Q_SLOTS:
     void handleAction(QAction* action);
 
 private:
diff --git a/src/dolphintabbar.h b/src/dolphintabbar.h
index 88366c97c6..d601b0a9c3 100644
--- a/src/dolphintabbar.h
+++ b/src/dolphintabbar.h
@@ -16,7 +16,7 @@ class DolphinTabBar : public QTabBar
 public:
     explicit DolphinTabBar(QWidget* parent);
 
-signals:
+Q_SIGNALS:
     void openNewActivatedTab(int index);
     void tabDropEvent(int index, QDropEvent* event);
     void tabDetachRequested(int index);
@@ -35,7 +35,7 @@ protected:
      */
     void contextMenuEvent(QContextMenuEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void slotAutoActivationTimeout();
 
 private:
diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h
index a3659aa184..512ac22fed 100644
--- a/src/dolphintabpage.h
+++ b/src/dolphintabpage.h
@@ -149,12 +149,12 @@ public:
      */
     void setActive(bool active);
 
-signals:
+Q_SIGNALS:
     void activeViewChanged(DolphinViewContainer* viewContainer);
     void activeViewUrlChanged(const QUrl& url);
     void splitterMoved(int pos, int index);
 
-private slots:
+private Q_SLOTS:
     /**
      * Deletes all zombie viewContainers that were used for the animation
      * and resets the minimum size of the others to a sane value.
diff --git a/src/dolphintabwidget.h b/src/dolphintabwidget.h
index fbfe283026..e0146d7c71 100644
--- a/src/dolphintabwidget.h
+++ b/src/dolphintabwidget.h
@@ -65,7 +65,7 @@ public:
      */
     bool isUrlOpen(const QUrl& url) const;
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted when the active view has been changed, by changing the current
      * tab or by activating another view when split view is enabled in the current
@@ -90,7 +90,7 @@ signals:
      */
     void currentUrlChanged(const QUrl& url);
 
-public slots:
+public Q_SLOTS:
     /**
      * Opens a new view with the current URL that is part of a tab and activates
      * the tab.
@@ -167,7 +167,7 @@ public slots:
     /** Moves all selected items to the inactive view. */
     void moveToInactiveSplitView();
 
-private slots:
+private Q_SLOTS:
     /**
      * Opens the tab with the index \a index in a new Dolphin instance and closes
      * this tab.
diff --git a/src/dolphinurlnavigator.h b/src/dolphinurlnavigator.h
index 1962e2f062..2ae67352ae 100644
--- a/src/dolphinurlnavigator.h
+++ b/src/dolphinurlnavigator.h
@@ -76,7 +76,7 @@ public:
      */
     void setPlaceholderText(const QString &text);
 
-public slots:
+public Q_SLOTS:
     /**
      * Switches to "breadcrumb" mode if the editable mode is not set to be
      * preferred in the Dolphin settings.
diff --git a/src/dolphinurlnavigatorscontroller.h b/src/dolphinurlnavigatorscontroller.h
index 797cbf4f98..4f6802725f 100644
--- a/src/dolphinurlnavigatorscontroller.h
+++ b/src/dolphinurlnavigatorscontroller.h
@@ -30,7 +30,7 @@ class DolphinUrlNavigatorsController : public QObject
 public:
     DolphinUrlNavigatorsController() = delete;
 
-public slots:
+public Q_SLOTS:
     /**
      * Refreshes all DolphinUrlNavigators to get synchronized with the
      * Dolphin settings if they were changed.
@@ -57,7 +57,7 @@ private:
      */
     static void unregisterDolphinUrlNavigator(DolphinUrlNavigator *dolphinUrlNavigator);
 
-private slots:
+private Q_SLOTS:
     /**
      * Sets the completion mode for all DolphinUrlNavigators and saves it in settings.
      */
diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 77b74d1899..eeb9204c13 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -175,7 +175,7 @@ public:
      */
     QString caption() const;
 
-public slots:
+public Q_SLOTS:
     /**
      * Sets the current active URL, where all actions are applied. The
      * URL navigator is synchronized with this URL. The signals
@@ -198,7 +198,7 @@ public slots:
      */
     void setSearchModeEnabled(bool enabled);
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted whenever the filter bar has changed its visibility state.
      */
@@ -215,7 +215,7 @@ signals:
      */
     void writeStateChanged(bool isFolderWritable);
 
-private slots:
+private Q_SLOTS:
     /**
      * Updates the number of items (= number of files + number of
      * directories) in the statusbar. If files are selected, the number
diff --git a/src/filterbar/filterbar.h b/src/filterbar/filterbar.h
index 74c8457fcf..d6ca402afd 100644
--- a/src/filterbar/filterbar.h
+++ b/src/filterbar/filterbar.h
@@ -35,7 +35,7 @@ public:
      */
     void selectAll();
 
-public slots:
+public Q_SLOTS:
     /** Clears the input field. */
     void clear();
     /** Clears the input field if the "lock button" is disabled. */
@@ -43,7 +43,7 @@ public slots:
     /** The input field is cleared also if the "lock button" is released. */
     void slotToggleLockButton(bool checked);
 
-signals:
+Q_SIGNALS:
     /**
      * Signal that reports the name filter has been
      * changed to \a nameFilter.
diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h
index 9226531521..8ef524a2df 100644
--- a/src/kitemviews/kfileitemlistview.h
+++ b/src/kitemviews/kfileitemlistview.h
@@ -94,11 +94,11 @@ protected:
     void onTransactionEnd() override;
     void resizeEvent(QGraphicsSceneResizeEvent* event) override;
 
-protected slots:
+protected Q_SLOTS:
     void slotItemsRemoved(const KItemRangeList& itemRanges) override;
     void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) override;
 
-private slots:
+private Q_SLOTS:
     void triggerVisibleIndexRangeUpdate();
     void updateVisibleIndexRange();
 
diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index 8444354348..886a1c6de5 100644
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -185,7 +185,7 @@ public:
      */
     static QList<RoleInfo> rolesInformation();
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if the loading of a directory has been started. It is
      * assured that a signal directoryLoadingCompleted() will be send after
@@ -250,7 +250,7 @@ protected:
     void onSortRoleChanged(const QByteArray& current, const QByteArray& previous, bool resortItems = true) override;
     void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) override;
 
-private slots:
+private Q_SLOTS:
     /**
      * Resorts all items dependent on the set sortRole(), sortOrder()
      * and foldersFirst() settings.
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h
index 09706a54a4..8e1e1fcbeb 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.h
+++ b/src/kitemviews/kfileitemmodelrolesupdater.h
@@ -159,7 +159,7 @@ public:
     void setScanDirectories(bool enabled);
     bool scanDirectories() const;
 
-private slots:
+private Q_SLOTS:
     void slotItemsInserted(const KItemRangeList& itemRanges);
     void slotItemsRemoved(const KItemRangeList& itemRanges);
     void slotItemsMoved(const KItemRange& itemRange, const QList<int> &movedToIndexes);
diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h
index 537bab1420..9d96d2ce0c 100644
--- a/src/kitemviews/kitemlistcontainer.h
+++ b/src/kitemviews/kitemlistcontainer.h
@@ -51,7 +51,7 @@ protected:
     void scrollContentsBy(int dx, int dy) override;
     void wheelEvent(QWheelEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);
     void slotModelChanged(KItemModelBase* current, KItemModelBase* previous);
     void slotViewChanged(KItemListView* current, KItemListView* previous);
diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h
index cdbc5b4704..24339134e7 100644
--- a/src/kitemviews/kitemlistcontroller.h
+++ b/src/kitemviews/kitemlistcontroller.h
@@ -126,7 +126,7 @@ public:
 
     bool processEvent(QEvent* event, const QTransform& transform);
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if exactly one item has been activated by e.g. a mouse-click
      * or by pressing Return/Enter.
@@ -217,10 +217,10 @@ signals:
     void decreaseZoom();
     void swipeUp();
 
-public slots:
+public Q_SLOTS:
     void slotStateChanged(QScroller::State newState);
 
-private slots:
+private Q_SLOTS:
     void slotViewScrollOffsetChanged(qreal current, qreal previous);
 
     /**
diff --git a/src/kitemviews/kitemlistheader.h b/src/kitemviews/kitemlistheader.h
index e8cfc420aa..6875a0f5e7 100644
--- a/src/kitemviews/kitemlistheader.h
+++ b/src/kitemviews/kitemlistheader.h
@@ -58,7 +58,7 @@ public:
      */
     qreal preferredColumnWidth(const QByteArray& role) const;
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if the width of a column has been adjusted by the user with the mouse
      * (no signal is emitted if KItemListHeader::setColumnWidth() is invoked).
diff --git a/src/kitemviews/kitemlistselectionmanager.h b/src/kitemviews/kitemlistselectionmanager.h
index 2be5783997..2fc5061fea 100644
--- a/src/kitemviews/kitemlistselectionmanager.h
+++ b/src/kitemviews/kitemlistselectionmanager.h
@@ -63,7 +63,7 @@ public:
 
     KItemModelBase* model() const;
 
-signals:
+Q_SIGNALS:
     void currentChanged(int current, int previous);
     void selectionChanged(const KItemSet& current, const KItemSet& previous);
 
diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index e6bf5ad908..a847943350 100644
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -270,7 +270,7 @@ public:
 
     void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
 
-signals:
+Q_SIGNALS:
     void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);
     void scrollOffsetChanged(qreal current, qreal previous);
     void maximumScrollOffsetChanged(qreal current, qreal previous);
@@ -378,7 +378,7 @@ protected:
     virtual void updateFont();
     virtual void updatePalette();
 
-protected slots:
+protected Q_SLOTS:
     virtual void slotItemsInserted(const KItemRangeList& itemRanges);
     virtual void slotItemsRemoved(const KItemRangeList& itemRanges);
     virtual void slotItemsMoved(const KItemRange& itemRange, const QList<int>& movedToIndexes);
@@ -392,7 +392,7 @@ protected slots:
     virtual void slotCurrentChanged(int current, int previous);
     virtual void slotSelectionChanged(const KItemSet& current, const KItemSet& previous);
 
-private slots:
+private Q_SLOTS:
     void slotAnimationFinished(QGraphicsWidget* widget,
                                KItemListViewAnimation::AnimationType type);
     void slotLayoutTimerFinished();
diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h
index aad499853f..86bbcaf14e 100644
--- a/src/kitemviews/kitemlistwidget.h
+++ b/src/kitemviews/kitemlistwidget.h
@@ -173,7 +173,7 @@ public:
      */
     virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr);
 
-signals:
+Q_SIGNALS:
     void roleEditingCanceled(int index, const QByteArray& role, const QVariant& value);
     void roleEditingFinished(int index, const QByteArray& role, const QVariant& value);
 
@@ -198,7 +198,7 @@ protected:
 
     const KItemListWidgetInformant* informant() const;
 
-private slots:
+private Q_SLOTS:
     void slotHoverAnimationFinished();
 
 private:
diff --git a/src/kitemviews/kitemmodelbase.h b/src/kitemviews/kitemmodelbase.h
index d68eab568e..2ce4c9fd31 100644
--- a/src/kitemviews/kitemmodelbase.h
+++ b/src/kitemviews/kitemmodelbase.h
@@ -183,7 +183,7 @@ public:
      * @return Parent directory of the items that are shown
      */
     virtual QUrl directory() const;
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if one or more items have been inserted. Each item-range consists
      * of:
diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h
index c19f1759db..1c3c61c383 100644
--- a/src/kitemviews/kstandarditemlistwidget.h
+++ b/src/kitemviews/kstandarditemlistwidget.h
@@ -177,10 +177,10 @@ protected:
         QStaticText staticText;
     };
 
-public slots:
+public Q_SLOTS:
     void finishRoleEditing();
 
-private slots:
+private Q_SLOTS:
     void slotCutItemsChanged();
     void slotRoleEditingCanceled(const QByteArray& role, const QVariant& value);
     void slotRoleEditingFinished(const QByteArray& role, const QVariant& value);
diff --git a/src/kitemviews/private/kdirectorycontentscounter.h b/src/kitemviews/private/kdirectorycontentscounter.h
index cc8616ff79..c90925e445 100644
--- a/src/kitemviews/private/kdirectorycontentscounter.h
+++ b/src/kitemviews/private/kdirectorycontentscounter.h
@@ -38,7 +38,7 @@ public:
      */
     void scanDirectory(const QString& path);
 
-signals:
+Q_SIGNALS:
     /**
      * Signals that the directory \a path contains \a count items of size \a
      * Size calculation depends on parameter DetailsModeSettings::recursiveDirectorySizeLimit
@@ -47,7 +47,7 @@ signals:
 
     void requestDirectoryContentsCount(const QString& path, KDirectoryContentsCounterWorker::Options options);
 
-private slots:
+private Q_SLOTS:
     void slotResult(const QString& path, int count, long size);
     void slotDirWatchDirty(const QString& path);
     void slotItemsRemoved();
diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.h b/src/kitemviews/private/kdirectorycontentscounterworker.h
index 8e6359746c..48a2d1ff9b 100644
--- a/src/kitemviews/private/kdirectorycontentscounterworker.h
+++ b/src/kitemviews/private/kdirectorycontentscounterworker.h
@@ -42,13 +42,13 @@ public:
      */
     static CountResult subItemsCount(const QString& path, Options options);
 
-signals:
+Q_SIGNALS:
     /**
      * Signals that the directory \a path contains \a count items and optionally the size of its content.
      */
     void result(const QString& path, int count, long size);
 
-public slots:
+public Q_SLOTS:
     /**
      * Requests the number of items inside the directory \a path using the
      * options \a options. The result is announced via the signal \a result.
diff --git a/src/kitemviews/private/kfileitemclipboard.h b/src/kitemviews/private/kfileitemclipboard.h
index 7495c32ddd..8182013087 100644
--- a/src/kitemviews/private/kfileitemclipboard.h
+++ b/src/kitemviews/private/kfileitemclipboard.h
@@ -29,13 +29,13 @@ public:
 
     QList<QUrl> cutItems() const;
 
-signals:
+Q_SIGNALS:
     void cutItemsChanged();
 
 protected:
     ~KFileItemClipboard() override;
 
-private slots:
+private Q_SLOTS:
     void updateCutItems();
 
 private:
diff --git a/src/kitemviews/private/kfileitemmodeldirlister.h b/src/kitemviews/private/kfileitemmodeldirlister.h
index c44c136b0d..5636959757 100644
--- a/src/kitemviews/private/kfileitemmodeldirlister.h
+++ b/src/kitemviews/private/kfileitemmodeldirlister.h
@@ -26,7 +26,7 @@ public:
     explicit KFileItemModelDirLister(QObject* parent = nullptr);
     ~KFileItemModelDirLister() override;
 
-signals:
+Q_SIGNALS:
     /** Is emitted whenever an error has occurred. */
     void errorMessage(const QString& msg);
 
diff --git a/src/kitemviews/private/kitemlistheaderwidget.h b/src/kitemviews/private/kitemlistheaderwidget.h
index ca85f21395..44adc23c5b 100644
--- a/src/kitemviews/private/kitemlistheaderwidget.h
+++ b/src/kitemviews/private/kitemlistheaderwidget.h
@@ -54,7 +54,7 @@ public:
 
     void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if the width of a visible role has been adjusted by the user with the mouse
      * (no signal is emitted if KItemListHeader::setVisibleRoleWidth() is invoked).
@@ -100,7 +100,7 @@ protected:
     void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) override;
     void hoverMoveEvent(QGraphicsSceneHoverEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous);
     void slotSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous);
 
diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h
index 27c9a203fd..72f5695ce5 100644
--- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h
+++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h
@@ -48,12 +48,12 @@ public:
     void cancelSearch();
     bool shouldClearSearchIfInputTimeReached();
 
-public slots:
+public Q_SLOTS:
 
     void slotCurrentChanged(int current, int previous);
     void slotSelectionChanged(const KItemSet& current, const KItemSet& previous);
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if the current item should be changed corresponding
      * to \a text.
diff --git a/src/kitemviews/private/kitemlistroleeditor.h b/src/kitemviews/private/kitemlistroleeditor.h
index a636806241..070cf5ce95 100644
--- a/src/kitemviews/private/kitemlistroleeditor.h
+++ b/src/kitemviews/private/kitemlistroleeditor.h
@@ -33,7 +33,7 @@ public:
 
     bool eventFilter(QObject* watched, QEvent* event) override;
 
-signals:
+Q_SIGNALS:
     void roleEditingFinished(const QByteArray& role, const QVariant& value);
     void roleEditingCanceled(const QByteArray& role, const QVariant& value);
 
@@ -41,7 +41,7 @@ protected:
     bool event(QEvent* event) override;
     void keyPressEvent(QKeyEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     /**
      * Increases the size of the editor in case if there is not
      * enough room for the text.
diff --git a/src/kitemviews/private/kitemlistrubberband.h b/src/kitemviews/private/kitemlistrubberband.h
index 7886b1e846..11febcf7eb 100644
--- a/src/kitemviews/private/kitemlistrubberband.h
+++ b/src/kitemviews/private/kitemlistrubberband.h
@@ -33,7 +33,7 @@ public:
     void setActive(bool active);
     bool isActive() const;
 
-signals:
+Q_SIGNALS:
     void activationChanged(bool active);
     void startPositionChanged(const QPointF& current, const QPointF& previous);
     void endPositionChanged(const QPointF& current, const QPointF& previous);
diff --git a/src/kitemviews/private/kitemlistsmoothscroller.h b/src/kitemviews/private/kitemlistsmoothscroller.h
index c0e02491ee..55548219ed 100644
--- a/src/kitemviews/private/kitemlistsmoothscroller.h
+++ b/src/kitemviews/private/kitemlistsmoothscroller.h
@@ -72,7 +72,7 @@ public:
 protected:
     bool eventFilter(QObject* obj, QEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void slotAnimationStateChanged(QAbstractAnimation::State newState,
                                    QAbstractAnimation::State oldState);
 
diff --git a/src/kitemviews/private/kitemlistviewanimation.h b/src/kitemviews/private/kitemlistviewanimation.h
index 3f6772b8bb..8d11dbf89b 100644
--- a/src/kitemviews/private/kitemlistviewanimation.h
+++ b/src/kitemviews/private/kitemlistviewanimation.h
@@ -72,10 +72,10 @@ public:
      */
     bool isStarted(QGraphicsWidget* widget) const;
 
-signals:
+Q_SIGNALS:
     void finished(QGraphicsWidget* widget, KItemListViewAnimation::AnimationType type);
 
-private slots:
+private Q_SLOTS:
     void slotFinished();
 
 private:
diff --git a/src/middleclickactioneventfilter.h b/src/middleclickactioneventfilter.h
index 6943b53cec..d5765a346f 100644
--- a/src/middleclickactioneventfilter.h
+++ b/src/middleclickactioneventfilter.h
@@ -25,7 +25,7 @@ public:
     explicit MiddleClickActionEventFilter(QObject *parent);
     ~MiddleClickActionEventFilter() override;
 
-signals:
+Q_SIGNALS:
     void actionMiddleClicked(QAction *action);
 
 protected:
diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h
index 3ece6d3d4d..26c8e4cb95 100644
--- a/src/panels/folders/folderspanel.h
+++ b/src/panels/folders/folderspanel.h
@@ -40,7 +40,7 @@ public:
 
     void rename(const KFileItem& item);
 
-signals:
+Q_SIGNALS:
     void folderActivated(const QUrl& url);
     void folderMiddleClicked(const QUrl& url);
     void errorMessage(const QString& error);
@@ -55,7 +55,7 @@ protected:
     /** @see QWidget::keyPressEvent() */
     void keyPressEvent(QKeyEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void slotItemActivated(int index);
     void slotItemMiddleClicked(int index);
     void slotItemContextMenuRequested(int index, const QPointF& pos);
diff --git a/src/panels/folders/treeviewcontextmenu.h b/src/panels/folders/treeviewcontextmenu.h
index 519e3a0ef7..35f44e90bf 100644
--- a/src/panels/folders/treeviewcontextmenu.h
+++ b/src/panels/folders/treeviewcontextmenu.h
@@ -38,7 +38,7 @@ public:
     /** Opens the context menu modal. */
     void open(const QPoint& pos);
 
-private slots:
+private Q_SLOTS:
     /** Cuts the item m_fileItem. */
     void cut();
 
diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h
index 31a48332b4..baeb6e875d 100644
--- a/src/panels/information/informationpanel.h
+++ b/src/panels/information/informationpanel.h
@@ -28,10 +28,10 @@ public:
     explicit InformationPanel(QWidget* parent = nullptr);
     ~InformationPanel() override;
 
-signals:
+Q_SIGNALS:
     void urlActivated(const QUrl& url);
 
-public slots:
+public Q_SLOTS:
     /**
      * This is invoked to inform the panel that the user has selected a new
      * set of items.
@@ -59,7 +59,7 @@ protected:
     /** @see QWidget::contextMenuEvent() */
     void contextMenuEvent(QContextMenuEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     /**
      * Shows the information for the item of the URL which has been provided by
      * InformationPanel::requestDelayedItemInfo() and provides default actions.
diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index abdfdeb354..78fcf3cd08 100644
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -76,12 +76,12 @@ public:
      */
     void setPreviewAutoPlay(bool autoPlay);
 
-signals:
+Q_SIGNALS:
     void urlActivated( const QUrl& url );
     void configurationFinished();
     void contextMenuRequested(const QPoint& pos);
 
-public slots:
+public Q_SLOTS:
     /**
      * Is invoked after the file meta data configuration dialog has been
      * closed and refreshes the displayed meta data by the panel.
@@ -94,7 +94,7 @@ protected:
 
     bool event(QEvent * event) override;
 
-private slots:
+private Q_SLOTS:
     /**
      * Is invoked if no preview is available for the item. In this
      * case the icon will be shown.
diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h
index b21b0cdc76..5510b05442 100644
--- a/src/panels/information/phononwidget.h
+++ b/src/panels/information/phononwidget.h
@@ -48,7 +48,7 @@ class PhononWidget : public QWidget
         void setAutoPlay(bool autoPlay);
         bool eventFilter(QObject *object, QEvent *event) override;
 
-    signals:
+    Q_SIGNALS:
         /**
          * Is emitted whenever the video-state
          * has changed: If true is returned, a video
@@ -59,14 +59,14 @@ class PhononWidget : public QWidget
          */
         void hasVideoChanged(bool hasVideo);
 
-    public slots:
+    public Q_SLOTS:
         void play();
 
     protected:
         void showEvent(QShowEvent *event) override;
         void hideEvent(QHideEvent *event) override;
 
-    private slots:
+    private Q_SLOTS:
         void stateChanged(Phonon::State newstate);
         void stop();
         void finished();
diff --git a/src/panels/panel.h b/src/panels/panel.h
index 3a61a41f07..5932ae6af5 100644
--- a/src/panels/panel.h
+++ b/src/panels/panel.h
@@ -38,7 +38,7 @@ public:
 
     QSize sizeHint() const override;
 
-public slots:
+public Q_SLOTS:
     /**
      * This is invoked every time the folder being displayed in the
      * active Dolphin view changes.
diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h
index 2b1f3bc14f..cd4079a73a 100644
--- a/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@ -125,7 +125,7 @@ public:
     bool isGroupHidden(KFilePlacesModel::GroupType type) const;
     void setGroupHidden(KFilePlacesModel::GroupType type, bool hidden);
 
-signals:
+Q_SIGNALS:
     void errorMessage(const QString& message);
     void storageSetupDone(int index, bool success);
     void storageTearDownRequested(const QString& mountPath);
@@ -137,7 +137,7 @@ protected:
     void onItemRemoved(int index, KStandardItem* removedItem) override;
     void onItemChanged(int index, const QSet<QByteArray>& changedRoles) override;
 
-private slots:
+private Q_SLOTS:
     void slotStorageTearDownDone(Solid::ErrorType error, const QVariant& errorData);
     void slotStorageSetupDone(Solid::ErrorType error, const QVariant& errorData, const QString& udi);
 
diff --git a/src/panels/places/placesitemsignalhandler.h b/src/panels/places/placesitemsignalhandler.h
index d0e236af46..da47839155 100644
--- a/src/panels/places/placesitemsignalhandler.h
+++ b/src/panels/places/placesitemsignalhandler.h
@@ -37,7 +37,7 @@ public:
     explicit PlacesItemSignalHandler(PlacesItem* item, QObject* parent = nullptr);
     ~PlacesItemSignalHandler() override;
 
-public slots:
+public Q_SLOTS:
     /**
      * Calls PlacesItem::onAccessibilityChanged()
      */
@@ -47,7 +47,7 @@ public slots:
 
     void onTrashEmptinessChanged(bool isTrashEmpty);
 
-signals:
+Q_SIGNALS:
     void tearDownExternallyRequested(const QString& udi);
 
 private:
diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index 67b484c652..39f8da3656 100644
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -33,7 +33,7 @@ public:
 
     bool eventFilter(QObject *obj, QEvent *event) override;
 
-signals:
+Q_SIGNALS:
     void placeActivated(const QUrl& url);
     void placeMiddleClicked(const QUrl& url);
     void errorMessage(const QString& error);
@@ -46,12 +46,12 @@ protected:
     bool urlChanged() override;
     void showEvent(QShowEvent* event) override;
 
-public slots:
+public Q_SLOTS:
     void readSettings() override;
     void showHiddenEntries(bool shown);
     int hiddenListCount();
 
-private slots:
+private Q_SLOTS:
     void slotItemActivated(int index);
     void slotItemMiddleClicked(int index);
     void slotItemContextMenuRequested(int index, const QPointF& pos);
diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h
index 35de108df3..dc6605da6b 100644
--- a/src/panels/terminal/terminalpanel.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -48,11 +48,11 @@ public:
     bool hasProgramRunning() const;
     QString runningProgramName() const;
 
-public slots:
+public Q_SLOTS:
     void terminalExited();
     void dockVisibilityChanged();
 
-signals:
+Q_SIGNALS:
     void hideTerminalPanel();
 
     /**
@@ -65,7 +65,7 @@ protected:
 
     void showEvent(QShowEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void slotMostLocalUrlResult(KJob* job);
     void slotKonsolePartCurrentDirectoryChanged(const QString& dir);
 
diff --git a/src/search/dolphinfacetswidget.h b/src/search/dolphinfacetswidget.h
index 21eb473601..83345b3444 100644
--- a/src/search/dolphinfacetswidget.h
+++ b/src/search/dolphinfacetswidget.h
@@ -48,13 +48,13 @@ public:
 
     void setFacetType(const QString& type);
 
-signals:
+Q_SIGNALS:
     void facetChanged();
 
 protected:
     void changeEvent(QEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void updateTagsMenu();
     void updateTagsMenuItems(const QUrl&, const KFileItemList& items);
 
diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index f0fe2a4242..1bd21f17b7 100644
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -93,7 +93,7 @@ protected:
     void keyReleaseEvent(QKeyEvent* event) override;
     bool eventFilter(QObject* obj, QEvent* event) override;
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted when a searching should be triggered.
      */
@@ -118,7 +118,7 @@ signals:
     void activated();
     void focusViewRequest();
 
-private slots:
+private Q_SLOTS:
     void emitSearchRequest();
     void emitCloseRequest();
     void slotConfigurationChanged();
diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index e1e9c94883..0e5b83f7ad 100644
--- a/src/settings/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
@@ -51,7 +51,7 @@ public:
     ~ApplyViewPropsJob() override;
     int progress() const;
 
-private slots:
+private Q_SLOTS:
     void slotResult(KJob* job) override;
     void slotEntries(KIO::Job*, const KIO::UDSEntryList&);
 
diff --git a/src/settings/contextmenu/contextmenusettingspage.h b/src/settings/contextmenu/contextmenusettingspage.h
index 88b42770fb..a8fae08f67 100644
--- a/src/settings/contextmenu/contextmenusettingspage.h
+++ b/src/settings/contextmenu/contextmenusettingspage.h
@@ -39,7 +39,7 @@ public:
 protected:
     void showEvent(QShowEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     /**
      * Loads locally installed services.
      */
diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h
index 1f1a514564..65ce95274e 100644
--- a/src/settings/dolphinsettingsdialog.h
+++ b/src/settings/dolphinsettingsdialog.h
@@ -26,10 +26,10 @@ public:
     explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = nullptr, KActionCollection* actions = {});
     ~DolphinSettingsDialog() override;
 
-signals:
+Q_SIGNALS:
     void settingsChanged();
 
-private slots:
+private Q_SLOTS:
     /** Enables the Apply button. */
     void enableApply();
     void applySettings();
diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h
index 606b43cba7..1e61aa24dc 100644
--- a/src/settings/general/previewssettingspage.h
+++ b/src/settings/general/previewssettingspage.h
@@ -37,7 +37,7 @@ public:
 protected:
     void showEvent(QShowEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void configureService(const QModelIndex& index);
 
 private:
diff --git a/src/settings/serviceitemdelegate.h b/src/settings/serviceitemdelegate.h
index dc810e3a8b..5c516916f7 100644
--- a/src/settings/serviceitemdelegate.h
+++ b/src/settings/serviceitemdelegate.h
@@ -35,10 +35,10 @@ public:
                                    const QStyleOptionViewItem& option,
                                    const QPersistentModelIndex& index) const override;
 
-signals:
+Q_SIGNALS:
     void requestServiceConfiguration(const QModelIndex& index);
 
-private slots:
+private Q_SLOTS:
     void slotCheckBoxClicked(bool checked);
     void slotConfigureButtonClicked();
 };
diff --git a/src/settings/settingspagebase.h b/src/settings/settingspagebase.h
index 8b230a9c76..c6842dec47 100644
--- a/src/settings/settingspagebase.h
+++ b/src/settings/settingspagebase.h
@@ -32,7 +32,7 @@ public:
      */
     virtual void restoreDefaults() = 0;
 
-signals:
+Q_SIGNALS:
     /** Is emitted if a setting has been changed. */
     void changed();
 };
diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h
index 1090e0822b..51e7e90c95 100644
--- a/src/settings/startup/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
@@ -34,7 +34,7 @@ public:
     /** @see SettingsPageBase::restoreDefaults() */
     void restoreDefaults() override;
 
-private slots:
+private Q_SLOTS:
     void slotSettingsChanged();
     void updateInitialViewOptions();
     void selectHomeUrl();
diff --git a/src/settings/viewmodes/dolphinfontrequester.h b/src/settings/viewmodes/dolphinfontrequester.h
index 1613184b21..56b28f9b60 100644
--- a/src/settings/viewmodes/dolphinfontrequester.h
+++ b/src/settings/viewmodes/dolphinfontrequester.h
@@ -43,11 +43,11 @@ public:
     void setCustomFont(const QFont& font);
     QFont customFont() const;
 
-signals:
+Q_SIGNALS:
     /** Is emitted, if the font has been changed. */
     void changed();
 
-private slots:
+private Q_SLOTS:
     void openFontDialog();
     void changeMode(int index);
 
diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h
index d5756bb3aa..798968345c 100644
--- a/src/settings/viewmodes/viewsettingstab.h
+++ b/src/settings/viewmodes/viewsettingstab.h
@@ -39,10 +39,10 @@ public:
     void applySettings();
     void restoreDefaultSettings();
 
-signals:
+Q_SIGNALS:
     void changed();
 
-private slots:
+private Q_SLOTS:
 
     void slotDefaultSliderMoved(int value);
     void slotPreviewSliderMoved(int value);
diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index b03d3c75ad..f07bb8088f 100644
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -36,10 +36,10 @@ public:
     explicit ViewPropertiesDialog(DolphinView* dolphinView);
     ~ViewPropertiesDialog() override;
 
-public slots:
+public Q_SLOTS:
     void accept() override;
 
-private slots:
+private Q_SLOTS:
     void slotApply();
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
@@ -51,7 +51,7 @@ private slots:
     void slotItemChanged(QListWidgetItem *item);
     void markAsDirty(bool isDirty);
 
-signals:
+Q_SIGNALS:
     void isDirtyChanged(bool isDirty);
 
 private:
diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index 262b5a9ed0..61c358f390 100644
--- a/src/settings/viewpropsprogressinfo.h
+++ b/src/settings/viewpropsprogressinfo.h
@@ -45,10 +45,10 @@ public:
 protected:
     void closeEvent(QCloseEvent* event) override;
 
-public slots:
+public Q_SLOTS:
     void reject() override;
 
-private slots:
+private Q_SLOTS:
     void updateProgress();
     void applyViewProperties();
 
diff --git a/src/statusbar/dolphinstatusbar.h b/src/statusbar/dolphinstatusbar.h
index 30968be6e3..7b4434539c 100644
--- a/src/statusbar/dolphinstatusbar.h
+++ b/src/statusbar/dolphinstatusbar.h
@@ -79,12 +79,12 @@ public:
      */
     void updateSpaceInfo();
 
-public slots:
+public Q_SLOTS:
     void setText(const QString& text);
     void setUrl(const QUrl& url);
     void setZoomLevel(int zoomLevel);
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if the stop-button has been pressed during showing a progress.
      */
@@ -95,7 +95,7 @@ signals:
 protected:
     void contextMenuEvent(QContextMenuEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void showZoomSliderToolTip(int zoomLevel);
     void updateProgressInfo();
 
diff --git a/src/statusbar/mountpointobserver.h b/src/statusbar/mountpointobserver.h
index 30d5f8f7d4..9f5346d496 100644
--- a/src/statusbar/mountpointobserver.h
+++ b/src/statusbar/mountpointobserver.h
@@ -68,20 +68,20 @@ public:
      */
     static MountPointObserver* observerForUrl(const QUrl& url);
 
-signals:
+Q_SIGNALS:
     /**
      * This signal is emitted when the size has been retrieved.
      */
     void spaceInfoChanged(quint64 size, quint64 available);
 
-public slots:
+public Q_SLOTS:
     /**
      * If this slot is invoked, MountPointObserver starts a new driveSize job
      * to get the drive's size.
      */
     void update();
 
-private slots:
+private Q_SLOTS:
     void freeSpaceResult(KIO::Job* job, KIO::filesize_t size, KIO::filesize_t available);
 
 private:
diff --git a/src/statusbar/mountpointobservercache.h b/src/statusbar/mountpointobservercache.h
index aeb117cbbf..ab16fa760b 100644
--- a/src/statusbar/mountpointobservercache.h
+++ b/src/statusbar/mountpointobservercache.h
@@ -28,7 +28,7 @@ public:
      */
     MountPointObserver* observerForUrl(const QUrl& url);
 
-private slots:
+private Q_SLOTS:
     /**
      * Removes the given \a observer from the cache.
      */
diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h
index ac55a9f49f..4f3ecde356 100644
--- a/src/statusbar/spaceinfoobserver.h
+++ b/src/statusbar/spaceinfoobserver.h
@@ -27,16 +27,16 @@ public:
 
     void setUrl(const QUrl& url);
 
-public slots:
+public Q_SLOTS:
     void update();
 
-signals:
+Q_SIGNALS:
     /**
      * This signal is emitted when the size or available space changes.
      */
     void valuesChanged();
 
-private slots:
+private Q_SLOTS:
     void spaceInfoChanged(quint64 size, quint64 available);
 
 private:
diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 7cc5c49e2e..5b16942a40 100644
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -42,7 +42,7 @@ protected:
     void hideEvent(QHideEvent* event) override;
     void mousePressEvent(QMouseEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void slotValuesChanged();
 
 private:
diff --git a/src/tests/dolphinmainwindowtest.cpp b/src/tests/dolphinmainwindowtest.cpp
index a307eb495e..40f8f6bcd8 100644
--- a/src/tests/dolphinmainwindowtest.cpp
+++ b/src/tests/dolphinmainwindowtest.cpp
@@ -20,7 +20,7 @@ class DolphinMainWindowTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void init();
     void testClosingTabsWithSearchBoxVisible();
diff --git a/src/tests/dolphinquerytest.cpp b/src/tests/dolphinquerytest.cpp
index 4644040581..dfee3dbd5b 100644
--- a/src/tests/dolphinquerytest.cpp
+++ b/src/tests/dolphinquerytest.cpp
@@ -18,7 +18,7 @@ class DolphinSearchBoxTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void testBalooSearchParsing_data();
     void testBalooSearchParsing();
 };
diff --git a/src/tests/dolphinsearchboxtest.cpp b/src/tests/dolphinsearchboxtest.cpp
index 1210679f10..0a2113facb 100644
--- a/src/tests/dolphinsearchboxtest.cpp
+++ b/src/tests/dolphinsearchboxtest.cpp
@@ -12,7 +12,7 @@ class DolphinSearchBoxTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void init();
     void cleanup();
 
diff --git a/src/tests/draganddrophelpertest.cpp b/src/tests/draganddrophelpertest.cpp
index 584b7098b5..9379347f0a 100644
--- a/src/tests/draganddrophelpertest.cpp
+++ b/src/tests/draganddrophelpertest.cpp
@@ -11,7 +11,7 @@ class DragAndDropHelperTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void testUrlListMatchesUrl_data();
     void testUrlListMatchesUrl();
 };
diff --git a/src/tests/kfileitemlistviewtest.cpp b/src/tests/kfileitemlistviewtest.cpp
index 8d6a49c6b7..2aa9941c7d 100644
--- a/src/tests/kfileitemlistviewtest.cpp
+++ b/src/tests/kfileitemlistviewtest.cpp
@@ -17,7 +17,7 @@ class KFileItemListViewTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void init();
     void cleanup();
     void testGroupedItemChanges();
diff --git a/src/tests/kfileitemmodelbenchmark.cpp b/src/tests/kfileitemmodelbenchmark.cpp
index 37874cea8a..5c44a354f6 100644
--- a/src/tests/kfileitemmodelbenchmark.cpp
+++ b/src/tests/kfileitemmodelbenchmark.cpp
@@ -43,7 +43,7 @@ class KFileItemModelBenchmark : public QObject
 public:
     KFileItemModelBenchmark();
 
-private slots:
+private Q_SLOTS:
     void insertAndRemoveManyItems_data();
     void insertAndRemoveManyItems();
 
diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
index 8fd1883ac6..bf3ce8aed7 100644
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@ -45,7 +45,7 @@ class KFileItemModelTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void init();
     void cleanup();
 
diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp
index 80b88c03ee..eb938728d5 100644
--- a/src/tests/kitemlistcontrollertest.cpp
+++ b/src/tests/kitemlistcontrollertest.cpp
@@ -68,7 +68,7 @@ class KItemListControllerTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/src/tests/kitemlistkeyboardsearchmanagertest.cpp b/src/tests/kitemlistkeyboardsearchmanagertest.cpp
index 10cf3ab1c3..2005c9ccaf 100644
--- a/src/tests/kitemlistkeyboardsearchmanagertest.cpp
+++ b/src/tests/kitemlistkeyboardsearchmanagertest.cpp
@@ -13,7 +13,7 @@ class KItemListKeyboardSearchManagerTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void init();
 
     void testBasicKeyboardSearch();
diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index d6e0e2c96b..b1e3f54f81 100644
--- a/src/tests/kitemlistselectionmanagertest.cpp
+++ b/src/tests/kitemlistselectionmanagertest.cpp
@@ -51,7 +51,7 @@ class KItemListSelectionManagerTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void init();
     void cleanup();
 
diff --git a/src/tests/kitemrangetest.cpp b/src/tests/kitemrangetest.cpp
index 023f180f59..2ebca23081 100644
--- a/src/tests/kitemrangetest.cpp
+++ b/src/tests/kitemrangetest.cpp
@@ -15,7 +15,7 @@ class KItemRangeTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void testFromSortedContainer_data();
     void testFromSortedContainer();
 };
diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp
index d19752c336..9b40e150dc 100644
--- a/src/tests/kitemsettest.cpp
+++ b/src/tests/kitemsettest.cpp
@@ -84,7 +84,7 @@ class KItemSetTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
 
     void testConstruction_data();
diff --git a/src/tests/kstandarditemmodeltest.cpp b/src/tests/kstandarditemmodeltest.cpp
index c263c01283..c04e71524b 100644
--- a/src/tests/kstandarditemmodeltest.cpp
+++ b/src/tests/kstandarditemmodeltest.cpp
@@ -16,7 +16,7 @@ class KStandardItemModelTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void init();
     void cleanup();
 
diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp
index d289b390d2..15a494691d 100644
--- a/src/tests/placesitemmodeltest.cpp
+++ b/src/tests/placesitemmodeltest.cpp
@@ -34,7 +34,7 @@ class PlacesItemModelTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void init();
     void cleanup();
 
diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp
index a9588cb192..fb3023db55 100644
--- a/src/tests/viewpropertiestest.cpp
+++ b/src/tests/viewpropertiestest.cpp
@@ -14,7 +14,7 @@ class ViewPropertiesTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void init();
     void cleanup();
 
diff --git a/src/trash/dolphintrash.h b/src/trash/dolphintrash.h
index 2120059efe..1ef7d7d024 100644
--- a/src/trash/dolphintrash.h
+++ b/src/trash/dolphintrash.h
@@ -28,7 +28,7 @@ public:
     static KIO::Job* empty(QWidget *window);
     static bool isEmpty();
 
-signals:
+Q_SIGNALS:
     void emptinessChanged(bool isEmpty);
 
 private:
diff --git a/src/views/dolphinnewfilemenuobserver.h b/src/views/dolphinnewfilemenuobserver.h
index b95bdac46f..82f09daa26 100644
--- a/src/views/dolphinnewfilemenuobserver.h
+++ b/src/views/dolphinnewfilemenuobserver.h
@@ -29,7 +29,7 @@ public:
     void attach(const DolphinNewFileMenu* menu);
     void detach(const DolphinNewFileMenu* menu);
 
-signals:
+Q_SIGNALS:
     void itemCreated(const QUrl& url);
     void errorMessage(const QString& error);
 
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index ab3e86f15c..be8263917d 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -315,7 +315,7 @@ public:
      */
     void hideToolTip(const ToolTipManager::HideBehavior behavior = ToolTipManager::HideBehavior::Later);
 
-public slots:
+public Q_SLOTS:
     /**
      * Changes the directory to \a url. If the current directory is equal to
      * \a url, nothing will be done (use DolphinView::reload() instead).
@@ -409,7 +409,7 @@ public slots:
     /** Activates the view if the item list container gets focus. */
     bool eventFilter(QObject* watched, QEvent* event) override;
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if the view has been activated by e. g. a mouse click.
      */
@@ -600,7 +600,7 @@ protected:
     void hideEvent(QHideEvent* event) override;
     bool event(QEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     /**
      * Marks the view as active (DolphinView:isActive() will return true)
      * and emits the 'activated' signal if it is not already active.
diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h
index 87ee87a588..63a20f170f 100644
--- a/src/views/tooltips/dolphinfilemetadatawidget.h
+++ b/src/views/tooltips/dolphinfilemetadatawidget.h
@@ -46,7 +46,7 @@ public:
     void setItems(const KFileItemList& items);
     KFileItemList items() const;
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted after the meta data has been received for the items
      * set by DolphinFileMetaDataWidget::setItems().
diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h
index 6dfc750a9d..3688e815ca 100644
--- a/src/views/tooltips/tooltipmanager.h
+++ b/src/views/tooltips/tooltipmanager.h
@@ -50,14 +50,14 @@ public:
      */
     void hideToolTip(const HideBehavior behavior = HideBehavior::Later);
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted when the user clicks a tag or a link
      * in the metadata widget.
      */
     void urlActivated(const QUrl& url);
 
-private slots:
+private Q_SLOTS:
     void startContentRetrieval();
     void setPreviewPix(const KFileItem& item, const QPixmap& pix);
     void previewFailed();
diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index 5f425fe852..6e3977fb2a 100644
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -50,7 +50,7 @@ public:
 
     QList<QAction*> actions(const KFileItemList& items) const;
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if an information message with the content \a msg
      * should be shown.
@@ -69,7 +69,7 @@ signals:
      */
     void operationCompletedMessage(const QString& msg);
 
-private slots:
+private Q_SLOTS:
     /**
      * Invokes verifyDirectory() with a small delay. If delayedDirectoryVerification()
      * is invoked before the delay has been exceeded, the delay will be reset. This
diff --git a/src/views/viewmodecontroller.h b/src/views/viewmodecontroller.h
index 31594328bc..bd92a60a24 100644
--- a/src/views/viewmodecontroller.h
+++ b/src/views/viewmodecontroller.h
@@ -61,14 +61,14 @@ public:
     void setNameFilter(const QString& nameFilter);
     QString nameFilter() const;
 
-public slots:
+public Q_SLOTS:
     /**
      * Sets the URL to \a url and emits the signals cancelPreviews() and
      * urlChanged() if \a url is different for the current URL.
      */
     void setUrl(const QUrl& url);
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if the URL has been changed by ViewModeController::setUrl().
      */