From f65b0899c3666561cafac14f67ab0bb8a5bfa00a Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Mon, 8 Feb 2021 23:09:59 +0100 Subject: Build with QT_NO_KEYWORDS --- src/kitemviews/kfileitemlistview.h | 4 ++-- src/kitemviews/kfileitemmodel.h | 4 ++-- src/kitemviews/kfileitemmodelrolesupdater.h | 2 +- src/kitemviews/kitemlistcontainer.h | 2 +- src/kitemviews/kitemlistcontroller.h | 6 +++--- src/kitemviews/kitemlistheader.h | 2 +- src/kitemviews/kitemlistselectionmanager.h | 2 +- src/kitemviews/kitemlistview.h | 6 +++--- src/kitemviews/kitemlistwidget.h | 4 ++-- src/kitemviews/kitemmodelbase.h | 2 +- src/kitemviews/kstandarditemlistwidget.h | 4 ++-- src/kitemviews/private/kdirectorycontentscounter.h | 4 ++-- src/kitemviews/private/kdirectorycontentscounterworker.h | 4 ++-- src/kitemviews/private/kfileitemclipboard.h | 4 ++-- src/kitemviews/private/kfileitemmodeldirlister.h | 2 +- src/kitemviews/private/kitemlistheaderwidget.h | 4 ++-- src/kitemviews/private/kitemlistkeyboardsearchmanager.h | 4 ++-- src/kitemviews/private/kitemlistroleeditor.h | 4 ++-- src/kitemviews/private/kitemlistrubberband.h | 2 +- src/kitemviews/private/kitemlistsmoothscroller.h | 2 +- src/kitemviews/private/kitemlistviewanimation.h | 4 ++-- 21 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src/kitemviews') diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h index 922653152..8ef524a2d 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 844435434..886a1c6de 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -185,7 +185,7 @@ public: */ static QList 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 09706a54a..8e1e1fcbe 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 &movedToIndexes); diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h index 537bab142..9d96d2ce0 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 cdbc5b470..24339134e 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 e8cfc420a..6875a0f5e 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 2be578399..2fc5061fe 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 e6bf5ad90..a84794335 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& 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 aad499853..86bbcaf14 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 d68eab568..2ce4c9fd3 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 c19f1759d..1c3c61c38 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 cc8616ff7..c90925e44 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 8e6359746..48a2d1ff9 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 7495c32dd..818201308 100644 --- a/src/kitemviews/private/kfileitemclipboard.h +++ b/src/kitemviews/private/kfileitemclipboard.h @@ -29,13 +29,13 @@ public: QList 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 c44c136b0..563695975 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 ca85f2139..44adc23c5 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 27c9a203f..72f5695ce 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 a63680624..070cf5ce9 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 7886b1e84..11febcf7e 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 c0e02491e..55548219e 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 3f6772b8b..8d11dbf89 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: -- cgit v1.3