From 075a069d1c48921b7ccc4ef8c8a2aab56036c27f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 27 Mar 2013 13:39:21 +0100
Subject: [PATCH] Clean headers in QtSupport.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.
Change-Id: Iac7e32b861d60c4c386f64f065d05a1856e396cf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/qtsupport/baseqtversion.cpp | 7 -------
.../qtsupport/customexecutableconfigurationwidget.cpp | 2 --
.../qtsupport/customexecutablerunconfiguration.cpp | 1 -
src/plugins/qtsupport/debugginghelper.cpp | 6 ------
src/plugins/qtsupport/debugginghelperbuildtask.cpp | 4 ----
src/plugins/qtsupport/exampleslistmodel.cpp | 1 -
src/plugins/qtsupport/gettingstartedwelcomepage.cpp | 9 ---------
src/plugins/qtsupport/profilereader.cpp | 1 -
src/plugins/qtsupport/profilereader.h | 3 ---
src/plugins/qtsupport/qmldebugginglibrary.cpp | 3 ---
src/plugins/qtsupport/qmldebugginglibrary.h | 1 -
src/plugins/qtsupport/qmldumptool.cpp | 3 ---
src/plugins/qtsupport/qmlobservertool.cpp | 2 --
src/plugins/qtsupport/qtkitconfigwidget.cpp | 1 -
src/plugins/qtsupport/qtoptionspage.cpp | 3 ---
src/plugins/qtsupport/qtoutputformatter.cpp | 3 ---
src/plugins/qtsupport/qtparser.cpp | 2 --
src/plugins/qtsupport/qtsupportplugin.cpp | 3 ---
src/plugins/qtsupport/qtsupportplugin.h | 1 -
src/plugins/qtsupport/qtversionfactory.cpp | 4 ----
src/plugins/qtsupport/qtversionmanager.cpp | 6 ------
src/plugins/qtsupport/screenshotcropper.cpp | 1 -
22 files changed, 67 deletions(-)
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index d0315491cb2..531389dba9d 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -38,18 +38,11 @@
#include "profilereader.h"
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/toolchain.h>
-#include <projectexplorer/gnumakeparser.h>
-#include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/headerpath.h>
-#include <projectexplorer/task.h>
#include <qtsupport/debugginghelper.h>
#include <qtsupport/qtsupportconstants.h>
-#include <coreplugin/featureprovider.h>
-#include <utils/persistentsettings.h>
-#include <utils/environment.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/synchronousprocess.h>
diff --git a/src/plugins/qtsupport/customexecutableconfigurationwidget.cpp b/src/plugins/qtsupport/customexecutableconfigurationwidget.cpp
index 1487694baf0..a8ac601424c 100644
--- a/src/plugins/qtsupport/customexecutableconfigurationwidget.cpp
+++ b/src/plugins/qtsupport/customexecutableconfigurationwidget.cpp
@@ -33,9 +33,7 @@
#include <projectexplorer/target.h>
#include <projectexplorer/project.h>
#include <projectexplorer/environmentwidget.h>
-#include <coreplugin/helpmanager.h>
#include <utils/detailswidget.h>
-#include <utils/environment.h>
#include <utils/pathchooser.h>
#include <QCheckBox>
diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp
index 0104e3849f0..6e93267c358 100644
--- a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp
+++ b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp
@@ -33,7 +33,6 @@
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
#include <projectexplorer/abi.h>
diff --git a/src/plugins/qtsupport/debugginghelper.cpp b/src/plugins/qtsupport/debugginghelper.cpp
index 4085b3e9f14..3c0bebbbceb 100644
--- a/src/plugins/qtsupport/debugginghelper.cpp
+++ b/src/plugins/qtsupport/debugginghelper.cpp
@@ -31,14 +31,8 @@
#include <coreplugin/icore.h>
-#include <utils/synchronousprocess.h>
-
-#include <QFileInfo>
#include <QCoreApplication>
-#include <QHash>
-#include <QProcess>
#include <QDir>
-#include <QDateTime>
#include <QStringList>
#include <QDesktopServices>
diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.cpp b/src/plugins/qtsupport/debugginghelperbuildtask.cpp
index 459aebd9f98..8b856ab8559 100644
--- a/src/plugins/qtsupport/debugginghelperbuildtask.cpp
+++ b/src/plugins/qtsupport/debugginghelperbuildtask.cpp
@@ -34,10 +34,6 @@
#include "qmldebugginglibrary.h"
#include "baseqtversion.h"
#include "qtversionmanager.h"
-#include <coreplugin/messagemanager.h>
-#include <projectexplorer/abi.h>
-#include <projectexplorer/toolchainmanager.h>
-#include <projectexplorer/toolchain.h>
#include <utils/qtcassert.h>
#include <QCoreApplication>
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp
index 602b70c17fb..e4b8009baf2 100644
--- a/src/plugins/qtsupport/exampleslistmodel.cpp
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
@@ -38,7 +38,6 @@
#include <coreplugin/helpmanager.h>
#include <coreplugin/icore.h>
-#include <projectexplorer/kitmanager.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtversionmanager.h>
#include <utils/environment.h>
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
index 2ba9a6aaf46..c40aebeb048 100644
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
@@ -32,25 +32,19 @@
#include "exampleslistmodel.h"
#include "screenshotcropper.h"
-#include "qtsupportconstants.h"
-
#include <utils/pathchooser.h>
-#include <utils/fileutils.h>
#ifdef Q_OS_WIN
#include <utils/winutils.h>
#endif
#include <coreplugin/coreconstants.h>
-#include <coreplugin/coreplugin.h>
#include <coreplugin/documentmanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/helpmanager.h>
#include <coreplugin/modemanager.h>
#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/session.h>
#include <projectexplorer/project.h>
-#include <projectexplorer/projectnodes.h>
#include <QMutex>
#include <QThread>
@@ -59,9 +53,6 @@
#include <QWaitCondition>
#include <QDir>
#include <QBuffer>
-#include <QGraphicsProxyWidget>
-#include <QScrollBar>
-#include <QSortFilterProxyModel>
#include <QImage>
#include <QImageReader>
#include <QGridLayout>
diff --git a/src/plugins/qtsupport/profilereader.cpp b/src/plugins/qtsupport/profilereader.cpp
index ace9c591e2d..b538c0e6cc3 100644
--- a/src/plugins/qtsupport/profilereader.cpp
+++ b/src/plugins/qtsupport/profilereader.cpp
@@ -31,7 +31,6 @@
#include <coreplugin/icore.h>
-#include <QDir>
#include <QDebug>
using namespace QtSupport;
diff --git a/src/plugins/qtsupport/profilereader.h b/src/plugins/qtsupport/profilereader.h
index 763e9db17f6..2ba4c99aa67 100644
--- a/src/plugins/qtsupport/profilereader.h
+++ b/src/plugins/qtsupport/profilereader.h
@@ -31,9 +31,6 @@
#define PROFILEREADER_H
#include "qtsupport_global.h"
-#include "proparser/qmakeglobals.h"
-#include "proparser/qmakeparser.h"
-#include "proparser/qmakeevaluator.h"
#include "proparser/profileevaluator.h"
#include <coreplugin/messagemanager.h>
diff --git a/src/plugins/qtsupport/qmldebugginglibrary.cpp b/src/plugins/qtsupport/qmldebugginglibrary.cpp
index ea19d76c24e..b68073e6075 100644
--- a/src/plugins/qtsupport/qmldebugginglibrary.cpp
+++ b/src/plugins/qtsupport/qmldebugginglibrary.cpp
@@ -30,11 +30,8 @@
#include "qmldebugginglibrary.h"
#include "baseqtversion.h"
-#include "qtsupportconstants.h"
#include <coreplugin/icore.h>
-#include <utils/qtcassert.h>
-#include <projectexplorer/project.h>
#include <QDesktopServices>
#include <QCoreApplication>
#include <QDir>
diff --git a/src/plugins/qtsupport/qmldebugginglibrary.h b/src/plugins/qtsupport/qmldebugginglibrary.h
index 8fa594781a2..64a16a1e874 100644
--- a/src/plugins/qtsupport/qmldebugginglibrary.h
+++ b/src/plugins/qtsupport/qmldebugginglibrary.h
@@ -30,7 +30,6 @@
#ifndef QMLDEBUGGINGLIBRARY_H
#define QMLDEBUGGINGLIBRARY_H
-#include "qtsupport_global.h"
#include <utils/buildablehelperlibrary.h>
QT_FORWARD_DECLARE_CLASS(QDir)
diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp
index 9921878e73b..a9b50ed7cb8 100644
--- a/src/plugins/qtsupport/qmldumptool.cpp
+++ b/src/plugins/qtsupport/qmldumptool.cpp
@@ -36,9 +36,6 @@
#include <coreplugin/progressmanager/progressmanager.h>
#include <projectexplorer/project.h>
-#include <projectexplorer/toolchain.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/runconfiguration.h>
#include <utils/runextensions.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <utils/hostosinfo.h>
diff --git a/src/plugins/qtsupport/qmlobservertool.cpp b/src/plugins/qtsupport/qmlobservertool.cpp
index 95bd08e3e08..1ce7414a3d9 100644
--- a/src/plugins/qtsupport/qmlobservertool.cpp
+++ b/src/plugins/qtsupport/qmlobservertool.cpp
@@ -32,9 +32,7 @@
#include "qtsupportconstants.h"
#include "baseqtversion.h"
#include <coreplugin/icore.h>
-#include <utils/qtcassert.h>
-#include <projectexplorer/project.h>
#include <QDesktopServices>
#include <QCoreApplication>
#include <QDir>
diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp
index 7d4167edc48..c057d62d591 100644
--- a/src/plugins/qtsupport/qtkitconfigwidget.cpp
+++ b/src/plugins/qtsupport/qtkitconfigwidget.cpp
@@ -39,7 +39,6 @@
#include <utils/qtcassert.h>
#include <QComboBox>
-#include <QHBoxLayout>
#include <QPushButton>
namespace QtSupport {
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 9086fb066a2..a9e7024dfd7 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -43,16 +43,13 @@
#include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <utils/qtcassert.h>
-#include <utils/buildablehelperlibrary.h>
#include <utils/pathchooser.h>
#include <projectexplorer/toolchainmanager.h>
-#include <projectexplorer/toolchain.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/hostosinfo.h>
#include <utils/runextensions.h>
#include <QDir>
-#include <QToolTip>
#include <QMessageBox>
#include <QFileDialog>
#include <QTextBrowser>
diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp
index bd590ab88c4..34b7d38f1cb 100644
--- a/src/plugins/qtsupport/qtoutputformatter.cpp
+++ b/src/plugins/qtsupport/qtoutputformatter.cpp
@@ -31,11 +31,8 @@
#include <texteditor/basetexteditor.h>
#include <projectexplorer/project.h>
-#include <utils/qtcassert.h>
-#include <QFileInfo>
#include <QUrl>
-#include <QPlainTextEdit>
#include <QTextCursor>
using namespace ProjectExplorer;
diff --git a/src/plugins/qtsupport/qtparser.cpp b/src/plugins/qtsupport/qtparser.cpp
index 5acf924945b..3a56dc21ec3 100644
--- a/src/plugins/qtsupport/qtparser.cpp
+++ b/src/plugins/qtsupport/qtparser.cpp
@@ -32,8 +32,6 @@
#include <projectexplorer/task.h>
#include <projectexplorer/projectexplorerconstants.h>
-#include <utils/qtcassert.h>
-
using namespace QtSupport;
using ProjectExplorer::Task;
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index f593e2800a5..d7ad25f6465 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -40,14 +40,11 @@
#include "gettingstartedwelcomepage.h"
#include <coreplugin/variablemanager.h>
-#include <extensionsystem/pluginmanager.h>
-#include <projectexplorer/kitmanager.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/target.h>
#include <QtPlugin>
-#include <QMenu>
static const char kHostBins[] = "CurrentProject:QT_HOST_BINS";
static const char kInstallBins[] = "CurrentProject:QT_INSTALL_BINS";
diff --git a/src/plugins/qtsupport/qtsupportplugin.h b/src/plugins/qtsupport/qtsupportplugin.h
index 29ffe16ee22..ecaaafbd679 100644
--- a/src/plugins/qtsupport/qtsupportplugin.h
+++ b/src/plugins/qtsupport/qtsupportplugin.h
@@ -31,7 +31,6 @@
#define QTSUPPORTPLUGIN_H
#include <extensionsystem/iplugin.h>
-#include <coreplugin/icontext.h>
namespace QtSupport {
namespace Internal {
diff --git a/src/plugins/qtsupport/qtversionfactory.cpp b/src/plugins/qtsupport/qtversionfactory.cpp
index 5a898394424..dce849a8eb9 100644
--- a/src/plugins/qtsupport/qtversionfactory.cpp
+++ b/src/plugins/qtsupport/qtversionfactory.cpp
@@ -29,14 +29,10 @@
#include "qtversionfactory.h"
#include "profilereader.h"
-#include "qtversionmanager.h"
#include "baseqtversion.h"
#include <extensionsystem/pluginmanager.h>
#include <utils/environment.h>
-#include <utils/fileutils.h>
-
-#include <QSettings>
using namespace QtSupport;
using namespace QtSupport::Internal;
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 7e0ce50bdc9..517ba823878 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -34,11 +34,7 @@
#include "baseqtversion.h"
#include "qtfeatureprovider.h"
-#include "qtsupportconstants.h"
-
// only for legay restore
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/gcctoolchain.h>
#include <qtsupport/debugginghelper.h>
@@ -65,8 +61,6 @@
#include <QStringList>
#include <QTimer>
-#include <algorithm>
-
using namespace QtSupport;
using namespace QtSupport::Internal;
diff --git a/src/plugins/qtsupport/screenshotcropper.cpp b/src/plugins/qtsupport/screenshotcropper.cpp
index 0004ff8a62b..0bb4f26757f 100644
--- a/src/plugins/qtsupport/screenshotcropper.cpp
+++ b/src/plugins/qtsupport/screenshotcropper.cpp
@@ -35,7 +35,6 @@
#include <QDebug>
#include <QFile>
#include <QFileInfo>
-#include <QPainter>
namespace QtSupport {
namespace Internal {
--
GitLab