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

ADS: Remove struct from DockManager

Browse Source 
We do not use struct in Qt Creator.

Change-Id: I7755d66bc7b77825ab17ed333b23cbe36e52ff72
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2020-03-02 10:43:54 +01:00
committed by Tim Jenssen
parent 2642f8537d
commit 95182dc6b9
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/advanceddockingsystem/dockareawidget.h
View File

@@ -69,7 +69,7 @@ private:
friend class DockWidgetTab; friend class DockWidgetTab;
friend class DockWidgetPrivate; friend class DockWidgetPrivate;
friend class DockWidget; friend class DockWidget;
friend struct DockManagerPrivate; friend class DockManagerPrivate;
friend class DockManager; friend class DockManager;
void onTabCloseRequested(int index); void onTabCloseRequested(int index);

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

@@ -50,7 +50,7 @@ class DockContainerWidgetPrivate;
class DockAreaWidget; class DockAreaWidget;
class DockWidget; class DockWidget;
class DockManager; class DockManager;
struct DockManagerPrivate; class DockManagerPrivate;
class FloatingDockContainer; class FloatingDockContainer;
class FloatingDockContainerPrivate; class FloatingDockContainerPrivate;
class FloatingDragPreview; class FloatingDragPreview;
@@ -71,7 +71,7 @@ private:
DockContainerWidgetPrivate *d; ///< private data (pimpl) DockContainerWidgetPrivate *d; ///< private data (pimpl)
friend class DockContainerWidgetPrivate; friend class DockContainerWidgetPrivate;
friend class DockManager; friend class DockManager;
friend struct DockManagerPrivate; friend class DockManagerPrivate;
friend class DockAreaWidget; friend class DockAreaWidget;
friend struct DockAreaWidgetPrivate; friend struct DockAreaWidgetPrivate;
friend class FloatingDockContainer; friend class FloatingDockContainer;

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

@@ -77,8 +77,9 @@ namespace ADS
/** /**
* Private data class of DockManager class (pimpl) * Private data class of DockManager class (pimpl)
*/ */
struct DockManagerPrivate class DockManagerPrivate
{ {
public:
DockManager *q; DockManager *q;
QList<FloatingDockContainer *> m_floatingWidgets; QList<FloatingDockContainer *> m_floatingWidgets;
QList<DockContainerWidget *> m_containers; QList<DockContainerWidget *> m_containers;
@@ -144,8 +145,7 @@ namespace ADS
bool restoreContainer(int index, DockingStateReader &stream, bool testing); bool restoreContainer(int index, DockingStateReader &stream, bool testing);
void workspaceLoadingProgress(); void workspaceLoadingProgress();
}; }; // class DockManagerPrivate
// struct DockManagerPrivate
DockManagerPrivate::DockManagerPrivate(DockManager *parent) DockManagerPrivate::DockManagerPrivate(DockManager *parent)
: q(parent) : q(parent)

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

@@ -66,7 +66,7 @@ const char STARTUP_WORKSPACE_SETTINGS_KEY[] = "QML/Designer/StartupWorkspace";
const char AUTO_RESTORE_WORKSPACE_SETTINGS_KEY[] = "QML/Designer/AutoRestoreLastWorkspace"; const char AUTO_RESTORE_WORKSPACE_SETTINGS_KEY[] = "QML/Designer/AutoRestoreLastWorkspace";
} // namespace Constants } // namespace Constants
struct DockManagerPrivate; class DockManagerPrivate;
class FloatingDockContainer; class FloatingDockContainer;
class FloatingDockContainerPrivate; class FloatingDockContainerPrivate;
class DockComponentsFactory; class DockComponentsFactory;
@@ -96,7 +96,7 @@ class ADS_EXPORT DockManager : public DockContainerWidget
Q_OBJECT Q_OBJECT
private: private:
DockManagerPrivate *d; ///< private data (pimpl) DockManagerPrivate *d; ///< private data (pimpl)
friend struct DockManagerPrivate; friend class DockManagerPrivate;
friend class FloatingDockContainer; friend class FloatingDockContainer;
friend class FloatingDockContainerPrivate; friend class FloatingDockContainerPrivate;
friend class DockContainerWidget; friend class DockContainerWidget;

2
src/libs/advanceddockingsystem/dockwidget.h
View File

@@ -75,7 +75,7 @@ protected:
friend class DockAreaWidget; friend class DockAreaWidget;
friend class FloatingDockContainer; friend class FloatingDockContainer;
friend class DockManager; friend class DockManager;
friend struct DockManagerPrivate; friend class DockManagerPrivate;
friend class DockContainerWidgetPrivate; friend class DockContainerWidgetPrivate;
friend class DockAreaTabBar; friend class DockAreaTabBar;
friend class DockWidgetTab; friend class DockWidgetTab;

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

@@ -50,7 +50,7 @@ namespace ADS {
class FloatingDockContainerPrivate; class FloatingDockContainerPrivate;
class DockManager; class DockManager;
struct DockManagerPrivate; class DockManagerPrivate;
class DockAreaWidget; class DockAreaWidget;
class DockContainerWidget; class DockContainerWidget;
class DockWidget; class DockWidget;
@@ -113,7 +113,7 @@ private:
FloatingDockContainerPrivate *d; ///< private data (pimpl) FloatingDockContainerPrivate *d; ///< private data (pimpl)
friend class FloatingDockContainerPrivate; friend class FloatingDockContainerPrivate;
friend class DockManager; friend class DockManager;
friend struct DockManagerPrivate; friend class DockManagerPrivate;
friend class DockAreaTabBar; friend class DockAreaTabBar;
friend struct DockWidgetTabPrivate; friend struct DockWidgetTabPrivate;
friend class DockWidgetTab; friend class DockWidgetTab;