mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-04-01 02:42:39 +08:00
Code

Removes reliance on special Qt keywords. (#295)

Browse Source 
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 <walter.bormans@paradoxcat.com>
This commit is contained in:
Walter Bormans 2021-01-15 09:08:27 +01:00 committed by GitHub
parent e03674fd4b
commit e66ef604a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DockContainerWidget.h
View File

@ -265,7 +265,7 @@ public:
*/ */
void closeOtherAreas(CDockAreaWidget* KeepOpenArea); void closeOtherAreas(CDockAreaWidget* KeepOpenArea);
signals: Q_SIGNALS:
/** /**
* This signal is emitted if one or multiple dock areas has been added to * This signal is emitted if one or multiple dock areas has been added to
* the internal list of dock areas. * the internal list of dock areas.

4
src/DockManager.h
View File

@ -506,7 +506,7 @@ public:
*/ */
void setSplitterSizes(CDockAreaWidget *ContainedArea, const QList<int>& sizes); void setSplitterSizes(CDockAreaWidget *ContainedArea, const QList<int>& sizes);
public slots: public Q_SLOTS:
/** /**
* Opens the perspective with the given name. * Opens the perspective with the given name.
*/ */
@ -519,7 +519,7 @@ public slots:
*/ */
void setDockWidgetFocused(CDockWidget* DockWidget); void setDockWidgetFocused(CDockWidget* DockWidget);
signals: Q_SIGNALS:
/** /**
* This signal is emitted if the list of perspectives changed * This signal is emitted if the list of perspectives changed
*/ */

6
src/DockWidget.h
View File

@ -58,7 +58,7 @@ private:
DockWidgetPrivate* d; ///< private data (pimpl) DockWidgetPrivate* d; ///< private data (pimpl)
friend struct DockWidgetPrivate; friend struct DockWidgetPrivate;
private slots: private Q_SLOTS:
/** /**
* Adjusts the toolbar icon sizes according to the floating state * Adjusts the toolbar icon sizes according to the floating state
*/ */
@ -484,7 +484,7 @@ public: // reimplements QFrame -----------------------------------------------
*/ */
virtual bool event(QEvent *e) override; virtual bool event(QEvent *e) override;
public slots: public Q_SLOTS:
/** /**
* This property controls whether the dock widget is open or closed. * This property controls whether the dock widget is open or closed.
* The toogleViewAction triggers this slot * The toogleViewAction triggers this slot
@ -545,7 +545,7 @@ public slots:
void showNormal(); void showNormal();
signals: Q_SIGNALS:
/** /**
* This signal is emitted if the dock widget is opened or closed * This signal is emitted if the dock widget is opened or closed
*/ */

2
src/FloatingDockContainer.h
View File

@ -118,7 +118,7 @@ private:
friend class CDockAreaWidget; friend class CDockAreaWidget;
friend class CFloatingWidgetTitleBar; friend class CFloatingWidgetTitleBar;
private slots: private Q_SLOTS:
void onDockAreasAddedOrRemoved(); void onDockAreasAddedOrRemoved();
void onDockAreaCurrentChanged(int Index); void onDockAreaCurrentChanged(int Index);