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

We do not use struct in Qt Creator.

Change-Id: I299effff6a7e6b79494be9a9e2dece1d6492714a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/libs/advanceddockingsystem/dockmanager.h           | 4 ++--
 src/libs/advanceddockingsystem/dockwidget.h            | 2 +-
 src/libs/advanceddockingsystem/dockwidgettab.cpp       | 6 +++---
 src/libs/advanceddockingsystem/dockwidgettab.h         | 4 ++--
 src/libs/advanceddockingsystem/floatingdockcontainer.h | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/libs/advanceddockingsystem/dockmanager.h b/src/libs/advanceddockingsystem/dockmanager.h
index b4682e7e0e6..721f7e76027 100644
--- a/src/libs/advanceddockingsystem/dockmanager.h
+++ b/src/libs/advanceddockingsystem/dockmanager.h
@@ -75,7 +75,7 @@ class DockContainerWidgetPrivate;
 class DockOverlay;
 class DockAreaTabBar;
 class DockWidgetTab;
-struct DockWidgetTabPrivate;
+class DockWidgetTabPrivate;
 struct DockAreaWidgetPrivate;
 class IconProvider;
 
@@ -104,7 +104,7 @@ private:
     friend class DockAreaTabBar;
     friend class DockWidgetTab;
     friend struct DockAreaWidgetPrivate;
-    friend struct DockWidgetTabPrivate;
+    friend class DockWidgetTabPrivate;
     friend class FloatingDragPreview;
     friend class FloatingDragPreviewPrivate;
     friend class DockAreaTitleBar;
diff --git a/src/libs/advanceddockingsystem/dockwidget.h b/src/libs/advanceddockingsystem/dockwidget.h
index e44e6b0d91d..c83528a578c 100644
--- a/src/libs/advanceddockingsystem/dockwidget.h
+++ b/src/libs/advanceddockingsystem/dockwidget.h
@@ -79,7 +79,7 @@ protected:
     friend class DockContainerWidgetPrivate;
     friend class DockAreaTabBar;
     friend class DockWidgetTab;
-    friend struct DockWidgetTabPrivate;
+    friend class DockWidgetTabPrivate;
     friend struct DockAreaTitleBarPrivate;
 
     /**
diff --git a/src/libs/advanceddockingsystem/dockwidgettab.cpp b/src/libs/advanceddockingsystem/dockwidgettab.cpp
index c82fc877c5b..69d0f88ee51 100644
--- a/src/libs/advanceddockingsystem/dockwidgettab.cpp
+++ b/src/libs/advanceddockingsystem/dockwidgettab.cpp
@@ -67,8 +67,9 @@ namespace ADS
     /**
      * Private data class of DockWidgetTab class (pimpl)
      */
-    struct DockWidgetTabPrivate
+    class DockWidgetTabPrivate
     {
+    public:
         DockWidgetTab *q;
         DockWidget *m_dockWidget;
         QLabel *m_iconLabel = nullptr;
@@ -155,8 +156,7 @@ namespace ADS
             m_globalDragStartMousePosition = globalPos;
             m_dragStartMousePosition = q->mapFromGlobal(globalPos);
         }
-    };
-    // struct DockWidgetTabPrivate
+    }; // class DockWidgetTabPrivate
 
     DockWidgetTabPrivate::DockWidgetTabPrivate(DockWidgetTab *parent)
         : q(parent)
diff --git a/src/libs/advanceddockingsystem/dockwidgettab.h b/src/libs/advanceddockingsystem/dockwidgettab.h
index 95e973fc4f1..500cf529f1c 100644
--- a/src/libs/advanceddockingsystem/dockwidgettab.h
+++ b/src/libs/advanceddockingsystem/dockwidgettab.h
@@ -43,7 +43,7 @@ namespace ADS {
 
 class DockWidget;
 class DockAreaWidget;
-struct DockWidgetTabPrivate;
+class DockWidgetTabPrivate;
 
 /**
  * A dock widget tab that shows a title and an icon.
@@ -57,7 +57,7 @@ class ADS_EXPORT DockWidgetTab : public QFrame
 
 private:
     DockWidgetTabPrivate *d; ///< private data (pimpl)
-    friend struct DockWidgetTabPrivate;
+    friend class DockWidgetTabPrivate;
     friend class DockWidget;
     void onDockWidgetFeaturesChanged();
     void detachDockWidget();
diff --git a/src/libs/advanceddockingsystem/floatingdockcontainer.h b/src/libs/advanceddockingsystem/floatingdockcontainer.h
index 043465e11f2..e562ea4c19c 100644
--- a/src/libs/advanceddockingsystem/floatingdockcontainer.h
+++ b/src/libs/advanceddockingsystem/floatingdockcontainer.h
@@ -57,7 +57,7 @@ class DockWidget;
 class DockManager;
 class DockAreaTabBar;
 class DockWidgetTab;
-struct DockWidgetTabPrivate;
+class DockWidgetTabPrivate;
 class DockAreaTitleBar;
 struct DockAreaTitleBarPrivate;
 class FloatingWidgetTitleBar;
@@ -115,7 +115,7 @@ private:
     friend class DockManager;
     friend class DockManagerPrivate;
     friend class DockAreaTabBar;
-    friend struct DockWidgetTabPrivate;
+    friend class DockWidgetTabPrivate;
     friend class DockWidgetTab;
     friend class DockAreaTitleBar;
     friend struct DockAreaTitleBarPrivate;