From a0835dd3d3e2dfcc96054a7c77ac9663837bd6f0 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 25 Oct 2022 18:10:16 +0200
Subject: [PATCH] ClassView: Remove unneeded includes

Substitute some includes with forward declarations.

Change-Id: I7638a2759b680cfc4e3dfb10631200bb46453998
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/classview/classviewconstants.h       |  2 ++
 src/plugins/classview/classviewmanager.cpp       | 10 ++--------
 src/plugins/classview/classviewmanager.h         |  5 -----
 .../classview/classviewnavigationwidget.cpp      | 11 ++++-------
 .../classviewnavigationwidgetfactory.cpp         |  6 ++----
 src/plugins/classview/classviewparser.cpp        |  8 --------
 src/plugins/classview/classviewparser.h          | 10 ----------
 .../classview/classviewparsertreeitem.cpp        | 16 +++-------------
 src/plugins/classview/classviewparsertreeitem.h  |  9 ++++++---
 src/plugins/classview/classviewplugin.cpp        |  1 +
 .../classview/classviewsymbolinformation.cpp     |  4 ----
 .../classview/classviewsymbollocation.cpp        |  2 +-
 src/plugins/classview/classviewtreeitemmodel.cpp |  1 +
 src/plugins/classview/classviewutils.cpp         |  3 +--
 src/plugins/classview/classviewutils.h           |  8 +++++---
 15 files changed, 28 insertions(+), 68 deletions(-)

diff --git a/src/plugins/classview/classviewconstants.h b/src/plugins/classview/classviewconstants.h
index a18636bb193..9a47bf16c03 100644
--- a/src/plugins/classview/classviewconstants.h
+++ b/src/plugins/classview/classviewconstants.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <Qt>
+
 namespace ClassView {
 namespace Constants {
 
diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp
index 90301a7c87c..ee1f89c7c75 100644
--- a/src/plugins/classview/classviewmanager.cpp
+++ b/src/plugins/classview/classviewmanager.cpp
@@ -2,20 +2,14 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "classviewmanager.h"
-#include "classviewsymbollocation.h"
-#include "classviewnavigationwidgetfactory.h"
+
 #include "classviewparser.h"
 #include "classviewutils.h"
 
-#include <utils/qtcassert.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/session.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <cppeditor/cppmodelmanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/idocument.h>
+#include <projectexplorer/session.h>
 #include <texteditor/texteditor.h>
 
 #include <QThread>
diff --git a/src/plugins/classview/classviewmanager.h b/src/plugins/classview/classviewmanager.h
index d2471096bdd..fe821224c1b 100644
--- a/src/plugins/classview/classviewmanager.h
+++ b/src/plugins/classview/classviewmanager.h
@@ -7,11 +7,6 @@
 #include <QSharedPointer>
 #include <QStandardItem>
 
-#include <cplusplus/CppDocument.h>
-#include <utils/id.h>
-
-#include "classviewparsertreeitem.h"
-
 namespace ClassView {
 namespace Internal {
 
diff --git a/src/plugins/classview/classviewnavigationwidget.cpp b/src/plugins/classview/classviewnavigationwidget.cpp
index e82bad227c0..225124a30af 100644
--- a/src/plugins/classview/classviewnavigationwidget.cpp
+++ b/src/plugins/classview/classviewnavigationwidget.cpp
@@ -2,23 +2,20 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "classviewnavigationwidget.h"
-#include "classviewmanager.h"
-#include "classviewsymbollocation.h"
-#include "classviewsymbolinformation.h"
-#include "classviewutils.h"
+
 #include "classviewconstants.h"
+#include "classviewmanager.h"
+#include "classviewutils.h"
 
 #include <coreplugin/find/itemviewfind.h>
-
 #include <cplusplus/Icons.h>
-
 #include <utils/navigationtreeview.h>
 #include <utils/qtcassert.h>
 
 #include <QDebug>
+#include <QElapsedTimer>
 #include <QVariant>
 #include <QVBoxLayout>
-#include <QElapsedTimer>
 
 enum { debug = false };
 
diff --git a/src/plugins/classview/classviewnavigationwidgetfactory.cpp b/src/plugins/classview/classviewnavigationwidgetfactory.cpp
index 25330c02142..31a7569224a 100644
--- a/src/plugins/classview/classviewnavigationwidgetfactory.cpp
+++ b/src/plugins/classview/classviewnavigationwidgetfactory.cpp
@@ -2,14 +2,12 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "classviewnavigationwidgetfactory.h"
+
 #include "classviewnavigationwidget.h"
-#include "classviewconstants.h"
 
-#include <coreplugin/icore.h>
-#include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcsettings.h>
 
-#include <QKeySequence>
 #include <QSettings>
 
 namespace ClassView {
diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp
index dab8fba5a54..cbc90bf4fe9 100644
--- a/src/plugins/classview/classviewparser.cpp
+++ b/src/plugins/classview/classviewparser.cpp
@@ -2,16 +2,8 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "classviewparser.h"
-#include "classviewconstants.h"
-#include "classviewutils.h"
 
-// cplusplus shared library. the same folder (cplusplus)
-#include <cplusplus/Symbol.h>
-
-// other
 #include <cppeditor/cppmodelmanager.h>
-#include <utils/algorithm.h>
-#include <utils/qtcassert.h>
 
 #include <QElapsedTimer>
 #include <QDebug>
diff --git a/src/plugins/classview/classviewparser.h b/src/plugins/classview/classviewparser.h
index 01d711c18e2..24d6c9c0656 100644
--- a/src/plugins/classview/classviewparser.h
+++ b/src/plugins/classview/classviewparser.h
@@ -7,16 +7,6 @@
 
 #include "classviewparsertreeitem.h"
 
-#include <cplusplus/CppDocument.h>
-
-// might be changed to forward declaration - is not done to be less dependent
-#include <projectexplorer/projectnodes.h>
-#include <projectexplorer/project.h>
-
-#include <QList>
-#include <QSharedPointer>
-#include <QStandardItem>
-
 namespace ClassView {
 namespace Internal {
 
diff --git a/src/plugins/classview/classviewparsertreeitem.cpp b/src/plugins/classview/classviewparsertreeitem.cpp
index 8d19fe157dd..51fbcef32e2 100644
--- a/src/plugins/classview/classviewparsertreeitem.cpp
+++ b/src/plugins/classview/classviewparsertreeitem.cpp
@@ -2,28 +2,18 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "classviewparsertreeitem.h"
-#include "classviewsymbollocation.h"
-#include "classviewsymbolinformation.h"
+
 #include "classviewconstants.h"
-#include "classviewutils.h"
 
 #include <cplusplus/Icons.h>
-#include <cplusplus/Name.h>
 #include <cplusplus/Overview.h>
-#include <cplusplus/Symbol.h>
-#include <cplusplus/Symbols.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/session.h>
-#include <utils/algorithm.h>
-
-#include <QHash>
-#include <QPair>
-#include <QIcon>
-#include <QStandardItem>
 
 #include <QDebug>
+#include <QHash>
+#include <QStandardItem>
 
 namespace ClassView {
 namespace Internal {
diff --git a/src/plugins/classview/classviewparsertreeitem.h b/src/plugins/classview/classviewparsertreeitem.h
index 11af21e4b8e..0641e26cbcb 100644
--- a/src/plugins/classview/classviewparsertreeitem.h
+++ b/src/plugins/classview/classviewparsertreeitem.h
@@ -3,15 +3,18 @@
 
 #pragma once
 
-#include "classviewsymbollocation.h"
 #include "classviewsymbolinformation.h"
+#include "classviewsymbollocation.h"
 
 #include <cplusplus/CppDocument.h>
 
 #include <QSharedPointer>
-#include <QHash>
 
-QT_FORWARD_DECLARE_CLASS(QStandardItem)
+QT_BEGIN_NAMESPACE
+template <typename K, typename T>
+class QHash;
+class QStandardItem;
+QT_END_NAMESPACE
 
 namespace ClassView {
 namespace Internal {
diff --git a/src/plugins/classview/classviewplugin.cpp b/src/plugins/classview/classviewplugin.cpp
index 077ff477de9..8858a832978 100644
--- a/src/plugins/classview/classviewplugin.cpp
+++ b/src/plugins/classview/classviewplugin.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "classviewplugin.h"
+
 #include "classviewmanager.h"
 #include "classviewnavigationwidgetfactory.h"
 
diff --git a/src/plugins/classview/classviewsymbolinformation.cpp b/src/plugins/classview/classviewsymbolinformation.cpp
index ff0d2b456c2..05a71b7bbae 100644
--- a/src/plugins/classview/classviewsymbolinformation.cpp
+++ b/src/plugins/classview/classviewsymbolinformation.cpp
@@ -3,12 +3,8 @@
 
 #include "classviewsymbolinformation.h"
 
-#include "classviewconstants.h"
-#include "classviewutils.h"
-
 #include <utils/utilsicons.h>
 
-#include <QPair>
 #include <QHash>
 
 namespace ClassView {
diff --git a/src/plugins/classview/classviewsymbollocation.cpp b/src/plugins/classview/classviewsymbollocation.cpp
index ae8d45efb22..8a5ad86781c 100644
--- a/src/plugins/classview/classviewsymbollocation.cpp
+++ b/src/plugins/classview/classviewsymbollocation.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "classviewsymbollocation.h"
-#include <QPair>
+
 #include <QHash>
 
 namespace ClassView {
diff --git a/src/plugins/classview/classviewtreeitemmodel.cpp b/src/plugins/classview/classviewtreeitemmodel.cpp
index cc7ee327db3..a3c50d392c7 100644
--- a/src/plugins/classview/classviewtreeitemmodel.cpp
+++ b/src/plugins/classview/classviewtreeitemmodel.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "classviewtreeitemmodel.h"
+
 #include "classviewconstants.h"
 #include "classviewmanager.h"
 #include "classviewutils.h"
diff --git a/src/plugins/classview/classviewutils.cpp b/src/plugins/classview/classviewutils.cpp
index 2be8fdabf04..31980b9ad03 100644
--- a/src/plugins/classview/classviewutils.cpp
+++ b/src/plugins/classview/classviewutils.cpp
@@ -2,11 +2,10 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "classviewutils.h"
+
 #include "classviewconstants.h"
-#include "classviewsymbolinformation.h"
 
 #include <QStandardItem>
-#include <QDebug>
 
 namespace ClassView {
 namespace Internal {
diff --git a/src/plugins/classview/classviewutils.h b/src/plugins/classview/classviewutils.h
index 28f9d2e27bc..6bcef1abdb2 100644
--- a/src/plugins/classview/classviewutils.h
+++ b/src/plugins/classview/classviewutils.h
@@ -3,14 +3,16 @@
 
 #pragma once
 
-#include "classviewsymbollocation.h"
 #include "classviewsymbolinformation.h"
+#include "classviewsymbollocation.h"
 
-#include <QVariant>
 #include <QList>
 #include <QSet>
+#include <QVariant>
 
-QT_FORWARD_DECLARE_CLASS(QStandardItem)
+QT_BEGIN_NAMESPACE
+class QStandardItem;
+QT_END_NAMESPACE
 
 namespace ClassView {
 namespace Internal {