From e66ef604a71960c10e885d8b8a98b4f5c92d7745 Mon Sep 17 00:00:00 2001 From: Walter Bormans Date: Fri, 15 Jan 2021 09:08:27 +0100 Subject: [PATCH] Removes reliance on special Qt keywords. (#295) This allows Qt Advanced Docking system to be compiled with the QT_NO_KEYWORDS definition. This can help avoid conflicts with other dependancies for a project. Co-authored-by: Walter Bormans --- src/DockContainerWidget.h | 2 +- src/DockManager.h | 4 ++-- src/DockWidget.h | 6 +++--- src/FloatingDockContainer.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/DockContainerWidget.h b/src/DockContainerWidget.h index 0bc674b..8a323ba 100644 --- a/src/DockContainerWidget.h +++ b/src/DockContainerWidget.h @@ -265,7 +265,7 @@ public: */ void closeOtherAreas(CDockAreaWidget* KeepOpenArea); -signals: +Q_SIGNALS: /** * This signal is emitted if one or multiple dock areas has been added to * the internal list of dock areas. diff --git a/src/DockManager.h b/src/DockManager.h index c3924d3..9681d09 100644 --- a/src/DockManager.h +++ b/src/DockManager.h @@ -506,7 +506,7 @@ public: */ void setSplitterSizes(CDockAreaWidget *ContainedArea, const QList& sizes); -public slots: +public Q_SLOTS: /** * Opens the perspective with the given name. */ @@ -519,7 +519,7 @@ public slots: */ void setDockWidgetFocused(CDockWidget* DockWidget); -signals: +Q_SIGNALS: /** * This signal is emitted if the list of perspectives changed */ diff --git a/src/DockWidget.h b/src/DockWidget.h index ed1a3d2..4d2328e 100644 --- a/src/DockWidget.h +++ b/src/DockWidget.h @@ -58,7 +58,7 @@ private: DockWidgetPrivate* d; ///< private data (pimpl) friend struct DockWidgetPrivate; -private slots: +private Q_SLOTS: /** * Adjusts the toolbar icon sizes according to the floating state */ @@ -484,7 +484,7 @@ public: // reimplements QFrame ----------------------------------------------- */ virtual bool event(QEvent *e) override; -public slots: +public Q_SLOTS: /** * This property controls whether the dock widget is open or closed. * The toogleViewAction triggers this slot @@ -545,7 +545,7 @@ public slots: void showNormal(); -signals: +Q_SIGNALS: /** * This signal is emitted if the dock widget is opened or closed */ diff --git a/src/FloatingDockContainer.h b/src/FloatingDockContainer.h index 1265332..559cf2f 100644 --- a/src/FloatingDockContainer.h +++ b/src/FloatingDockContainer.h @@ -118,7 +118,7 @@ private: friend class CDockAreaWidget; friend class CFloatingWidgetTitleBar; -private slots: +private Q_SLOTS: void onDockAreasAddedOrRemoved(); void onDockAreaCurrentChanged(int Index);