Build with QT_NO_KEYWORDS

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

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.

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

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:

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:

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.

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.

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.

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.
      */

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

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.

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

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.

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

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

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

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

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

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

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: