feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ADS: Remove struct from FloatingDockContainer

Browse Source 
We do not use structs in Qt Creator.

Change-Id: I179013eb40f6fd2a836b49f40c6ee17b5f0ce6d7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2020-03-02 10:29:53 +01:00
committed by Tim Jenssen
parent bc64318e31
commit a24dead5f6
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/advanceddockingsystem/dockcontainerwidget.h
View File

@@ -52,7 +52,7 @@ class DockWidget;
class DockManager; class DockManager;
struct DockManagerPrivate; struct DockManagerPrivate;
class FloatingDockContainer; class FloatingDockContainer;
struct FloatingDockContainerPrivate; class FloatingDockContainerPrivate;
class FloatingDragPreview; class FloatingDragPreview;
struct FloatingDragPreviewPrivate; struct FloatingDragPreviewPrivate;
class DockingStateReader; class DockingStateReader;
@@ -75,7 +75,7 @@ private:
friend class DockAreaWidget; friend class DockAreaWidget;
friend struct DockAreaWidgetPrivate; friend struct DockAreaWidgetPrivate;
friend class FloatingDockContainer; friend class FloatingDockContainer;
friend struct FloatingDockContainerPrivate; friend class FloatingDockContainerPrivate;
friend class DockWidget; friend class DockWidget;
friend class FloatingDragPreview; friend class FloatingDragPreview;
friend struct FloatingDragPreviewPrivate; friend struct FloatingDragPreviewPrivate;

4
src/libs/advanceddockingsystem/dockmanager.h
View File

@@ -68,7 +68,7 @@ const char AUTO_RESTORE_WORKSPACE_SETTINGS_KEY[] = "QML/Designer/AutoRestoreLast
struct DockManagerPrivate; struct DockManagerPrivate;
class FloatingDockContainer; class FloatingDockContainer;
struct FloatingDockContainerPrivate; class FloatingDockContainerPrivate;
class DockComponentsFactory; class DockComponentsFactory;
class DockContainerWidget; class DockContainerWidget;
class DockContainerWidgetPrivate; class DockContainerWidgetPrivate;
@@ -98,7 +98,7 @@ private:
DockManagerPrivate *d; ///< private data (pimpl) DockManagerPrivate *d; ///< private data (pimpl)
friend struct DockManagerPrivate; friend struct DockManagerPrivate;
friend class FloatingDockContainer; friend class FloatingDockContainer;
friend struct FloatingDockContainerPrivate; friend class FloatingDockContainerPrivate;
friend class DockContainerWidget; friend class DockContainerWidget;
friend class DockContainerWidgetPrivate; friend class DockContainerWidgetPrivate;
friend class DockAreaTabBar; friend class DockAreaTabBar;

6
src/libs/advanceddockingsystem/floatingdockcontainer.cpp
View File

@@ -62,8 +62,9 @@ namespace ADS
/** /**
* Private data class of FloatingDockContainer class (pimpl) * Private data class of FloatingDockContainer class (pimpl)
*/ */
struct FloatingDockContainerPrivate class FloatingDockContainerPrivate
{ {
public:
FloatingDockContainer *q; FloatingDockContainer *q;
DockContainerWidget *m_dockContainer; DockContainerWidget *m_dockContainer;
unsigned int m_zOrderIndex = ++zOrderCounter; unsigned int m_zOrderIndex = ++zOrderCounter;
@@ -125,8 +126,7 @@ namespace ADS
q->setWindowIcon(QApplication::windowIcon()); q->setWindowIcon(QApplication::windowIcon());
} }
} }
}; }; // class FloatingDockContainerPrivate
// struct FloatingDockContainerPrivate
FloatingDockContainerPrivate::FloatingDockContainerPrivate(FloatingDockContainer *parent) FloatingDockContainerPrivate::FloatingDockContainerPrivate(FloatingDockContainer *parent)
: q(parent) : q(parent)

4
src/libs/advanceddockingsystem/floatingdockcontainer.h
View File

@@ -48,7 +48,7 @@ using FloatingWidgetBaseType = QWidget;
namespace ADS { namespace ADS {
struct FloatingDockContainerPrivate; class FloatingDockContainerPrivate;
class DockManager; class DockManager;
struct DockManagerPrivate; struct DockManagerPrivate;
class DockAreaWidget; class DockAreaWidget;
@@ -111,7 +111,7 @@ class ADS_EXPORT FloatingDockContainer : public FloatingWidgetBaseType,
Q_OBJECT Q_OBJECT
private: private:
FloatingDockContainerPrivate *d; ///< private data (pimpl) FloatingDockContainerPrivate *d; ///< private data (pimpl)
friend struct FloatingDockContainerPrivate; friend class FloatingDockContainerPrivate;
friend class DockManager; friend class DockManager;
friend struct DockManagerPrivate; friend struct DockManagerPrivate;
friend class DockAreaTabBar; friend class DockAreaTabBar;