From a24dead5f63d7eb0b209539daebf5b2ce558b1c0 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 2 Mar 2020 10:29:53 +0100
Subject: [PATCH] ADS: Remove struct from FloatingDockContainer

We do not use structs in Qt Creator.

Change-Id: I179013eb40f6fd2a836b49f40c6ee17b5f0ce6d7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/libs/advanceddockingsystem/dockcontainerwidget.h     | 4 ++--
 src/libs/advanceddockingsystem/dockmanager.h             | 4 ++--
 src/libs/advanceddockingsystem/floatingdockcontainer.cpp | 6 +++---
 src/libs/advanceddockingsystem/floatingdockcontainer.h   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libs/advanceddockingsystem/dockcontainerwidget.h b/src/libs/advanceddockingsystem/dockcontainerwidget.h
index 497b4caa194..b4b78b29e5f 100644
--- a/src/libs/advanceddockingsystem/dockcontainerwidget.h
+++ b/src/libs/advanceddockingsystem/dockcontainerwidget.h
@@ -52,7 +52,7 @@ class DockWidget;
 class DockManager;
 struct DockManagerPrivate;
 class FloatingDockContainer;
-struct FloatingDockContainerPrivate;
+class FloatingDockContainerPrivate;
 class FloatingDragPreview;
 struct FloatingDragPreviewPrivate;
 class DockingStateReader;
@@ -75,7 +75,7 @@ private:
     friend class DockAreaWidget;
     friend struct DockAreaWidgetPrivate;
     friend class FloatingDockContainer;
-    friend struct FloatingDockContainerPrivate;
+    friend class FloatingDockContainerPrivate;
     friend class DockWidget;
     friend class FloatingDragPreview;
     friend struct FloatingDragPreviewPrivate;
diff --git a/src/libs/advanceddockingsystem/dockmanager.h b/src/libs/advanceddockingsystem/dockmanager.h
index a788e82d6a1..76f1d032d0b 100644
--- a/src/libs/advanceddockingsystem/dockmanager.h
+++ b/src/libs/advanceddockingsystem/dockmanager.h
@@ -68,7 +68,7 @@ const char AUTO_RESTORE_WORKSPACE_SETTINGS_KEY[] = "QML/Designer/AutoRestoreLast
 
 struct DockManagerPrivate;
 class FloatingDockContainer;
-struct FloatingDockContainerPrivate;
+class FloatingDockContainerPrivate;
 class DockComponentsFactory;
 class DockContainerWidget;
 class DockContainerWidgetPrivate;
@@ -98,7 +98,7 @@ private:
     DockManagerPrivate *d; ///< private data (pimpl)
     friend struct DockManagerPrivate;
     friend class FloatingDockContainer;
-    friend struct FloatingDockContainerPrivate;
+    friend class FloatingDockContainerPrivate;
     friend class DockContainerWidget;
     friend class DockContainerWidgetPrivate;
     friend class DockAreaTabBar;
diff --git a/src/libs/advanceddockingsystem/floatingdockcontainer.cpp b/src/libs/advanceddockingsystem/floatingdockcontainer.cpp
index 6bf2d9efbdc..892ab023024 100644
--- a/src/libs/advanceddockingsystem/floatingdockcontainer.cpp
+++ b/src/libs/advanceddockingsystem/floatingdockcontainer.cpp
@@ -62,8 +62,9 @@ namespace ADS
     /**
      * Private data class of FloatingDockContainer class (pimpl)
      */
-    struct FloatingDockContainerPrivate
+    class FloatingDockContainerPrivate
     {
+    public:
         FloatingDockContainer *q;
         DockContainerWidget *m_dockContainer;
         unsigned int m_zOrderIndex = ++zOrderCounter;
@@ -125,8 +126,7 @@ namespace ADS
                 q->setWindowIcon(QApplication::windowIcon());
             }
         }
-    };
-    // struct FloatingDockContainerPrivate
+    }; // class FloatingDockContainerPrivate
 
     FloatingDockContainerPrivate::FloatingDockContainerPrivate(FloatingDockContainer *parent)
         : q(parent)
diff --git a/src/libs/advanceddockingsystem/floatingdockcontainer.h b/src/libs/advanceddockingsystem/floatingdockcontainer.h
index 83be9c2662f..de7c2d0ed41 100644
--- a/src/libs/advanceddockingsystem/floatingdockcontainer.h
+++ b/src/libs/advanceddockingsystem/floatingdockcontainer.h
@@ -48,7 +48,7 @@ using FloatingWidgetBaseType = QWidget;
 
 namespace ADS {
 
-struct FloatingDockContainerPrivate;
+class FloatingDockContainerPrivate;
 class DockManager;
 struct DockManagerPrivate;
 class DockAreaWidget;
@@ -111,7 +111,7 @@ class ADS_EXPORT FloatingDockContainer : public FloatingWidgetBaseType,
     Q_OBJECT
 private:
     FloatingDockContainerPrivate *d; ///< private data (pimpl)
-    friend struct FloatingDockContainerPrivate;
+    friend class FloatingDockContainerPrivate;
     friend class DockManager;
     friend struct DockManagerPrivate;
     friend class DockAreaTabBar;