Valgrind: Fix includes

Change-Id: I30248edc9f536cd3865799dd0b56c1360e72aa2f
Reviewed-by: hjk <[email protected]>

22 files changed, 51 insertions, 126 deletions

diff --git a/src/plugins/valgrind/callgrind/callgrindcostitem.cpp b/src/plugins/valgrind/callgrind/callgrindcostitem.cpp
index 40aa56de31e..d6fa4f99013 100644
--- a/src/plugins/valgrind/callgrind/callgrindcostitem.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcostitem.cpp
@@ -6,8 +6,6 @@
 #include "callgrindparsedata.h"
 #include "callgrindfunctioncall.h"
 
-#include <QList>
-#include <QString>
 #include <QStringList>
 
 namespace Valgrind::Callgrind {
diff --git a/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp
index c32e0ec9b7b..68f6964c344 100644
--- a/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp
@@ -5,13 +5,11 @@
 
 #include "callgrindfunction.h"
 #include "callgrindfunctioncall.h"
-#include "callgrindparsedata.h"
 #include "callgrindfunctioncycle.h"
+#include "callgrindparsedata.h"
 
 #include <utils/qtcassert.h>
 
-#include <QDebug>
-
 namespace Valgrind::Callgrind::Internal {
 
 CycleDetection::CycleDetection(ParseData *data)
diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
index 49d26262471..a623a6a8c98 100644
--- a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
+++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
@@ -11,11 +11,7 @@
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 
-#include <QChar>
-#include <QDebug>
-#include <QList>
 #include <QStringList>
-#include <QTextDocument>
 
 namespace Valgrind {
 namespace Callgrind {
diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.cpp b/src/plugins/valgrind/callgrind/callgrindfunction.cpp
index 0ec72d095d8..4015ae7d5b9 100644
--- a/src/plugins/valgrind/callgrind/callgrindfunction.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindfunction.cpp
@@ -2,20 +2,16 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "callgrindfunction.h"
-#include "callgrindfunction_p.h"
 
 #include "callgrindcostitem.h"
+#include "callgrindfunction_p.h"
 #include "callgrindfunctioncall.h"
 #include "callgrindparsedata.h"
 #include "../valgrindtr.h"
 
 #include <utils/qtcassert.h>
 
-#include <QString>
-#include <QStringList>
-#include <QDebug>
 #include <QFileInfo>
-#include <QCoreApplication>
 
 namespace Valgrind {
 namespace Callgrind {
diff --git a/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp
index f4d3fdfdedc..64dd7374bcb 100644
--- a/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp
@@ -2,14 +2,11 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "callgrindfunctioncycle.h"
-#include "callgrindfunction_p.h"
 
+#include "callgrindfunction_p.h"
 #include "callgrindfunctioncall.h"
 #include "callgrindparsedata.h"
 
-#include <QStringList>
-#include <QDebug>
-
 namespace Valgrind {
 namespace Callgrind {
 
diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
index 7b7f2a3e672..62fc8a7cd2f 100644
--- a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
@@ -10,7 +10,6 @@
 
 #include <utils/qtcassert.h>
 
-#include <QCoreApplication>
 #include <QHash>
 #include <QStringList>
 
diff --git a/src/plugins/valgrind/callgrind/callgrindparser.cpp b/src/plugins/valgrind/callgrind/callgrindparser.cpp
index 434e7751083..58964172306 100644
--- a/src/plugins/valgrind/callgrind/callgrindparser.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindparser.cpp
@@ -3,10 +3,10 @@
 
 #include "callgrindparser.h"
 
-#include "callgrindparsedata.h"
-#include "callgrindfunctioncall.h"
 #include "callgrindcostitem.h"
 #include "callgrindfunction.h"
+#include "callgrindfunctioncall.h"
+#include "callgrindparsedata.h"
 
 #include <utils/filepath.h>
 #include <utils/qtcassert.h>
@@ -14,7 +14,6 @@
 
 #include <QDebug>
 #include <QHash>
-#include <QList>
 #include <QStringList>
 
 // #define DEBUG_PARSER
diff --git a/src/plugins/valgrind/callgrind/callgrindproxymodel.cpp b/src/plugins/valgrind/callgrind/callgrindproxymodel.cpp
index 9d0c8353e6d..3ba426a93d3 100644
--- a/src/plugins/valgrind/callgrind/callgrindproxymodel.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindproxymodel.cpp
@@ -10,8 +10,6 @@
 
 #include <utils/qtcassert.h>
 
-#include <QDebug>
-
 namespace Valgrind {
 namespace Callgrind {
 
diff --git a/src/plugins/valgrind/callgrindcostdelegate.cpp b/src/plugins/valgrind/callgrindcostdelegate.cpp
index e6afe5df32f..e6ca54756c8 100644
--- a/src/plugins/valgrind/callgrindcostdelegate.cpp
+++ b/src/plugins/valgrind/callgrindcostdelegate.cpp
@@ -3,9 +3,8 @@
 
 #include "callgrindcostdelegate.h"
 
-#include "callgrindhelper.h"
-
 #include "callgrind/callgrindabstractmodel.h"
+#include "callgrindhelper.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/valgrind/callgrindcostview.cpp b/src/plugins/valgrind/callgrindcostview.cpp
index 3d54a99c295..4181abf6a99 100644
--- a/src/plugins/valgrind/callgrindcostview.cpp
+++ b/src/plugins/valgrind/callgrindcostview.cpp
@@ -3,17 +3,11 @@
 
 #include "callgrindcostview.h"
 
+#include "callgrind/callgrinddatamodel.h"
+#include "callgrind/callgrindcallmodel.h"
 #include "callgrindnamedelegate.h"
 
-#include <valgrind/callgrind/callgrindabstractmodel.h>
-#include <valgrind/callgrind/callgrinddatamodel.h>
-#include <valgrind/callgrind/callgrindfunction.h>
-#include <valgrind/callgrind/callgrindcallmodel.h>
-
 #include <QAbstractProxyModel>
-#include <QContextMenuEvent>
-#include <QMenu>
-#include <QDebug>
 
 using namespace Valgrind::Callgrind;
 
diff --git a/src/plugins/valgrind/callgrindengine.cpp b/src/plugins/valgrind/callgrindengine.cpp
index 192174c6e54..3d86b192db6 100644
--- a/src/plugins/valgrind/callgrindengine.cpp
+++ b/src/plugins/valgrind/callgrindengine.cpp
@@ -3,11 +3,8 @@
 
 #include "callgrindengine.h"
 
-#include "valgrindsettings.h"
-
-#include <valgrind/callgrind/callgrindparser.h>
-#include <valgrind/valgrindrunner.h>
-#include <valgrind/valgrindtr.h>
+#include "callgrind/callgrindparser.h"
+#include "valgrindtr.h"
 
 #include <debugger/analyzer/analyzermanager.h>
 
@@ -17,8 +14,6 @@
 #include <utils/qtcassert.h>
 #include <utils/temporaryfile.h>
 
-#include <QDebug>
-
 #define CALLGRIND_CONTROL_DEBUG 0
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/valgrind/callgrindtextmark.cpp b/src/plugins/valgrind/callgrindtextmark.cpp
index 07b6af16c24..39cbf3803a5 100644
--- a/src/plugins/valgrind/callgrindtextmark.cpp
+++ b/src/plugins/valgrind/callgrindtextmark.cpp
@@ -3,18 +3,15 @@
 
 #include "callgrindtextmark.h"
 
-#include "callgrindhelper.h"
-
 #include "callgrind/callgrinddatamodel.h"
 #include "callgrind/callgrindfunction.h"
+#include "callgrindhelper.h"
 #include "valgrindtr.h"
 
 #include <utils/qtcassert.h>
 
-#include <QDebug>
 #include <QLabel>
 #include <QLayout>
-#include <QPainter>
 
 using namespace Utils;
 using namespace Valgrind::Internal;
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index fb16a4441ef..219fe800bc1 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -3,30 +3,22 @@
 
 #include "callgrindtool.h"
 
+#include "callgrind/callgrindcallmodel.h"
+#include "callgrind/callgrinddatamodel.h"
+#include "callgrind/callgrindfunction.h"
+#include "callgrind/callgrindfunctioncall.h"
+#include "callgrind/callgrindparsedata.h"
+#include "callgrind/callgrindparser.h"
+#include "callgrind/callgrindproxymodel.h"
+#include "callgrind/callgrindstackbrowser.h"
 #include "callgrindcostdelegate.h"
 #include "callgrindcostview.h"
 #include "callgrindengine.h"
 #include "callgrindtextmark.h"
 #include "callgrindvisualisation.h"
+#include "valgrindsettings.h"
 #include "valgrindtr.h"
 
-#include <valgrind/callgrind/callgrindcallmodel.h>
-#include <valgrind/callgrind/callgrindcostitem.h>
-#include <valgrind/callgrind/callgrinddatamodel.h>
-#include <valgrind/callgrind/callgrindfunction.h>
-#include <valgrind/callgrind/callgrindfunctioncall.h>
-#include <valgrind/callgrind/callgrindparsedata.h>
-#include <valgrind/callgrind/callgrindparser.h>
-#include <valgrind/callgrind/callgrindproxymodel.h>
-#include <valgrind/callgrind/callgrindstackbrowser.h>
-#include <valgrind/valgrindsettings.h>
-
-#include <debugger/debuggerconstants.h>
-#include <debugger/analyzer/analyzerconstants.h>
-#include <debugger/analyzer/analyzermanager.h>
-#include <debugger/analyzer/analyzerutils.h>
-#include <debugger/analyzer/startremotedialog.h>
-
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
@@ -39,10 +31,10 @@
 
 #include <cppeditor/cppeditorconstants.h>
 
-#include <extensionsystem/pluginmanager.h>
-
-#include <texteditor/texteditor.h>
-#include <texteditor/textdocument.h>
+#include <debugger/debuggerconstants.h>
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/analyzer/analyzerutils.h>
+#include <debugger/analyzer/startremotedialog.h>
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
@@ -51,23 +43,22 @@
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/taskhub.h>
 
-#include <utils/fancymainwindow.h>
+#include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
+
 #include <utils/process.h>
 #include <utils/qtcassert.h>
-#include <utils/styledbar.h>
 #include <utils/utilsicons.h>
 
 #include <QAction>
 #include <QActionGroup>
 #include <QComboBox>
 #include <QFile>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QLineEdit>
 #include <QMenu>
 #include <QSortFilterProxyModel>
 #include <QTimer>
-#include <QToolBar>
 #include <QToolButton>
 
 using namespace Debugger;
diff --git a/src/plugins/valgrind/callgrindvisualisation.cpp b/src/plugins/valgrind/callgrindvisualisation.cpp
index d0673bbf849..93d129ae48c 100644
--- a/src/plugins/valgrind/callgrindvisualisation.cpp
+++ b/src/plugins/valgrind/callgrindvisualisation.cpp
@@ -3,22 +3,18 @@
 
 #include "callgrindvisualisation.h"
 
+#include "callgrind/callgrinddatamodel.h"
+#include "callgrind/callgrindfunction.h"
+#include "callgrind/callgrindproxymodel.h"
 #include "callgrindhelper.h"
 #include "valgrindtr.h"
 
-#include <valgrind/callgrind/callgrindabstractmodel.h>
-#include <valgrind/callgrind/callgrinddatamodel.h>
-#include <valgrind/callgrind/callgrindfunction.h>
-#include <valgrind/callgrind/callgrindproxymodel.h>
-
 #include <utils/qtcassert.h>
 
 #include <QAbstractItemModel>
-#include <QDebug>
 #include <QGraphicsRectItem>
 #include <QGraphicsScene>
 #include <QGraphicsSimpleTextItem>
-#include <QList>
 #include <QMouseEvent>
 #include <QPair>
 #include <QStaticText>
diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp
index ef6ab2856e1..695a1446faa 100644
--- a/src/plugins/valgrind/memcheckerrorview.cpp
+++ b/src/plugins/valgrind/memcheckerrorview.cpp
@@ -5,7 +5,6 @@
 
 #include "valgrindsettings.h"
 #include "valgrindtr.h"
-
 #include "xmlprotocol/error.h"
 #include "xmlprotocol/errorlistmodel.h"
 #include "xmlprotocol/frame.h"
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 599dec740b7..5f5a82df832 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -16,6 +16,14 @@
 #include "xmlprotocol/parser.h"
 #include "xmlprotocol/stack.h"
 
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/helpmanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/modemanager.h>
+
 #include <debugger/debuggerkitaspect.h>
 #include <debugger/debuggerruncontrol.h>
 #include <debugger/analyzer/analyzerconstants.h>
@@ -35,19 +43,7 @@
 #include <projectexplorer/taskhub.h>
 #include <projectexplorer/toolchain.h>
 
-#include <extensionsystem/iplugin.h>
-#include <extensionsystem/pluginmanager.h>
-
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/helpmanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/modemanager.h>
-
 #include <utils/checkablemessagebox.h>
-#include <utils/fancymainwindow.h>
 #include <utils/pathchooser.h>
 #include <utils/process.h>
 #include <utils/qtcassert.h>
@@ -55,22 +51,20 @@
 #include <utils/utilsicons.h>
 
 #include <QAction>
+#include <QCheckBox>
+#include <QComboBox>
 #include <QFile>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QHostAddress>
 #include <QInputDialog>
 #include <QLabel>
-#include <QMenu>
-#include <QToolButton>
-#include <QSortFilterProxyModel>
-
-#include <QCheckBox>
-#include <QComboBox>
 #include <QLineEdit>
+#include <QMenu>
 #include <QPushButton>
 #include <QSpinBox>
 #include <QStandardPaths>
+#include <QToolButton>
+#include <QSortFilterProxyModel>
 #include <QVBoxLayout>
 
 #ifdef Q_OS_WIN
@@ -1161,7 +1155,6 @@ MemcheckToolRunner::MemcheckToolRunner(RunControl *runControl)
                 this, &MemcheckToolRunner::startDebugger);
         connect(&m_runner, &ValgrindRunner::logMessageReceived,
                 this, &MemcheckToolRunner::appendLog);
-//        m_runner.disableXml();
     } else {
         connect(&m_runner, &ValgrindRunner::internalError,
                 this, &MemcheckToolRunner::internalParserError);
@@ -1177,7 +1170,6 @@ MemcheckToolRunner::MemcheckToolRunner(RunControl *runControl)
     dd->setupRunner(this);
 }
 
-
 const char heobProfileC[] = "Heob/Profile";
 const char heobProfileNameC[] = "Name";
 const char heobXmlC[] = "Xml";
diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 0b6abb771f9..4af25d2c7ca 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -6,23 +6,19 @@
 #include "valgrindsettings.h"
 #include "valgrindtr.h"
 
-#include <debugger/analyzer/analyzermanager.h>
-
 #include <coreplugin/icore.h>
 #include <coreplugin/ioutputpane.h>
-#include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>
+#include <coreplugin/progressmanager/progressmanager.h>
+
 #include <extensionsystem/pluginmanager.h>
 
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitaspects.h>
 #include <projectexplorer/projectexplorericons.h>
-#include <projectexplorer/runconfiguration.h>
-#include <projectexplorer/runconfigurationaspects.h>
 
 #include <QApplication>
 
-using namespace Debugger;
 using namespace Core;
 using namespace Utils;
 using namespace ProjectExplorer;
diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h
index d8c5a0ae690..5644e92d9b7 100644
--- a/src/plugins/valgrind/valgrindengine.h
+++ b/src/plugins/valgrind/valgrindengine.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
+#include "valgrindrunner.h"
 #include "valgrindsettings.h"
 
 #include <projectexplorer/runcontrol.h>
-#include <valgrind/valgrindrunner.h>
 
 #include <QFutureInterface>
 
diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp
index 3f81f05b20d..6c23677face 100644
--- a/src/plugins/valgrind/valgrindsettings.cpp
+++ b/src/plugins/valgrind/valgrindsettings.cpp
@@ -5,26 +5,21 @@
 
 #include "callgrindcostdelegate.h"
 #include "valgrindtr.h"
-
-#include <coreplugin/icore.h>
+#include "xmlprotocol/error.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
+
 #include <debugger/analyzer/analyzericons.h>
 #include <debugger/debuggertr.h>
 
 #include <utils/algorithm.h>
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
-#include <utils/treemodel.h>
 #include <utils/utilsicons.h>
 
-#include <valgrind/xmlprotocol/error.h>
-
-#include <QDebug>
 #include <QListView>
 #include <QMetaEnum>
 #include <QPushButton>
-#include <QSettings>
 #include <QStandardItemModel>
 
 using namespace Utils;
diff --git a/src/plugins/valgrind/valgrindtestrunnertest.cpp b/src/plugins/valgrind/valgrindtestrunnertest.cpp
index e8678329ed8..5ae6ee04179 100644
--- a/src/plugins/valgrind/valgrindtestrunnertest.cpp
+++ b/src/plugins/valgrind/valgrindtestrunnertest.cpp
@@ -3,24 +3,19 @@
 
 #include "valgrindtestrunnertest.h"
 
+#include "valgrindrunner.h"
 #include "xmlprotocol/frame.h"
 #include "xmlprotocol/stack.h"
-#include "valgrindrunner.h"
-
-#include <projectexplorer/devicesupport/devicemanager.h>
-#include <projectexplorer/projectexplorer.h>
 
 #include <utils/algorithm.h>
 #include <utils/processinterface.h>
 
 #include <QDebug>
-#include <QTest>
 #include <QDir>
-#include <QSignalSpy>
+#include <QTest>
 
 #define HEADER_LENGTH 3
 
-using namespace ProjectExplorer;
 using namespace Valgrind::XmlProtocol;
 using namespace Utils;
 
diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
index 96c1819b284..34276dc54c1 100644
--- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
+++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
@@ -8,14 +8,12 @@
 #include "../valgrindtr.h"
 
 #include <debugger/analyzer/diagnosticlocation.h>
+
 #include <utils/qtcassert.h>
 
-#include <QCoreApplication>
 #include <QDir>
 #include <QList>
 
-#include <cmath>
-
 namespace Valgrind {
 namespace XmlProtocol {
 
diff --git a/src/plugins/valgrind/xmlprotocol/stackmodel.cpp b/src/plugins/valgrind/xmlprotocol/stackmodel.cpp
index 535ceb38f9b..1027456b8c7 100644
--- a/src/plugins/valgrind/xmlprotocol/stackmodel.cpp
+++ b/src/plugins/valgrind/xmlprotocol/stackmodel.cpp
@@ -9,9 +9,6 @@
 
 #include <utils/qtcassert.h>
 
-#include <QDir>
-#include <QList>
-
 namespace Valgrind {
 namespace XmlProtocol {