From f6017b8dcaf92d8438fe8794e166de427e996213 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 3 Apr 2013 10:58:05 +0200
Subject: [PATCH] Clean headers in QmlJsTools.

Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I22fb33b8589dcd2f4b880eb320d7fa86de8a6f67
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
---
 src/plugins/qmljstools/qmlconsoleedit.cpp         |  1 -
 src/plugins/qmljstools/qmlconsoleitemdelegate.h   |  1 -
 src/plugins/qmljstools/qmlconsoleitemmodel.cpp    |  2 --
 src/plugins/qmljstools/qmlconsolepane.cpp         |  3 ---
 src/plugins/qmljstools/qmlconsoleview.cpp         |  1 -
 src/plugins/qmljstools/qmljsbundleprovider.cpp    | 14 --------------
 .../qmljscodestylepreferencesfactory.cpp          |  1 -
 .../qmljstools/qmljscodestylesettingspage.cpp     |  1 -
 .../qmljstools/qmljsfindexportedcpptypes.cpp      | 11 -----------
 src/plugins/qmljstools/qmljsfunctionfilter.cpp    |  1 -
 src/plugins/qmljstools/qmljsindenter.cpp          |  1 -
 src/plugins/qmljstools/qmljsmodelmanager.cpp      | 15 ---------------
 src/plugins/qmljstools/qmljsplugindumper.cpp      |  2 --
 .../qmljstools/qmljsrefactoringchanges.cpp        |  3 ---
 src/plugins/qmljstools/qmljstools_test.cpp        | 11 -----------
 src/plugins/qmljstools/qmljstoolsplugin.cpp       |  6 ------
 src/plugins/qmljstools/qmljstoolsplugin.h         |  4 ----
 17 files changed, 78 deletions(-)

diff --git a/src/plugins/qmljstools/qmlconsoleedit.cpp b/src/plugins/qmljstools/qmlconsoleedit.cpp
index 22c96098862..8c1e8c041d0 100644
--- a/src/plugins/qmljstools/qmlconsoleedit.cpp
+++ b/src/plugins/qmljstools/qmlconsoleedit.cpp
@@ -30,7 +30,6 @@
 #include "qmlconsoleedit.h"
 #include "qmlconsoleitemmodel.h"
 #include "qmlconsolemodel.h"
-#include "qmlconsolemanager.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/qmljstools/qmlconsoleitemdelegate.h b/src/plugins/qmljstools/qmlconsoleitemdelegate.h
index c9b7c8118d4..a51de51eae3 100644
--- a/src/plugins/qmljstools/qmlconsoleitemdelegate.h
+++ b/src/plugins/qmljstools/qmlconsoleitemdelegate.h
@@ -32,7 +32,6 @@
 
 #include "qmlconsoleitemmodel.h"
 #include "qmlconsolemodel.h"
-#include "qmlconsolemanager.h"
 
 #include <QStyledItemDelegate>
 
diff --git a/src/plugins/qmljstools/qmlconsoleitemmodel.cpp b/src/plugins/qmljstools/qmlconsoleitemmodel.cpp
index 002d836a8ad..fa7a900e35b 100644
--- a/src/plugins/qmljstools/qmlconsoleitemmodel.cpp
+++ b/src/plugins/qmljstools/qmlconsoleitemmodel.cpp
@@ -29,8 +29,6 @@
 
 #include "qmlconsoleitemmodel.h"
 
-#include <utils/qtcassert.h>
-
 #include <QFontMetrics>
 #include <QFont>
 
diff --git a/src/plugins/qmljstools/qmlconsolepane.cpp b/src/plugins/qmljstools/qmlconsolepane.cpp
index cda210ce274..2a283730559 100644
--- a/src/plugins/qmljstools/qmlconsolepane.cpp
+++ b/src/plugins/qmljstools/qmlconsolepane.cpp
@@ -30,12 +30,9 @@
 #include "qmlconsolepane.h"
 #include "qmlconsoleview.h"
 #include "qmlconsoleproxymodel.h"
-#include "qmlconsoleitemmodel.h"
-#include "qmlconsolemanager.h"
 #include "qmlconsoleitemdelegate.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/icontext.h>
 #include <coreplugin/findplaceholder.h>
 #include <utils/savedaction.h>
 #include <aggregation/aggregate.h>
diff --git a/src/plugins/qmljstools/qmlconsoleview.cpp b/src/plugins/qmljstools/qmlconsoleview.cpp
index 6a3117370f2..c44ddd7f45a 100644
--- a/src/plugins/qmljstools/qmlconsoleview.cpp
+++ b/src/plugins/qmljstools/qmlconsoleview.cpp
@@ -41,7 +41,6 @@
 #include <QClipboard>
 #include <QAbstractProxyModel>
 #include <QFileInfo>
-#include <QUrl>
 #include <QScrollBar>
 #include <QStyleFactory>
 #include <QString>
diff --git a/src/plugins/qmljstools/qmljsbundleprovider.cpp b/src/plugins/qmljstools/qmljsbundleprovider.cpp
index 7ce93758aa0..77c0ee03b4b 100644
--- a/src/plugins/qmljstools/qmljsbundleprovider.cpp
+++ b/src/plugins/qmljstools/qmljsbundleprovider.cpp
@@ -30,25 +30,11 @@
 #include "qmljsbundleprovider.h"
 
 #include <coreplugin/icore.h>
-#include <extensionsystem/pluginmanager.h>
-#include <projectexplorer/kit.h>
-#include <projectexplorer/kitmanager.h>
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/target.h>
 #include <qmljs/qmljsbundle.h>
-#include <qmljs/qmljsdocument.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <QDir>
-#include <QFile>
-#include <QHash>
-#include <QHashIterator>
-#include <QList>
-#include <QMutex>
-#include <QMutexLocker>
-#include <QtAlgorithms>
 
 namespace QmlJSTools {
 
diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
index fa35cc30480..4375508ab36 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
+++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
@@ -32,7 +32,6 @@
 #include "qmljstoolsconstants.h"
 #include "qmljsindenter.h"
 #include <texteditor/simplecodestylepreferences.h>
-#include <texteditor/tabsettings.h>
 #include <texteditor/snippets/isnippetprovider.h>
 #include <extensionsystem/pluginmanager.h>
 #include <qmljseditor/qmljseditorconstants.h>
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
index 107cd7e644a..baf3b523d84 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
@@ -35,7 +35,6 @@
 #include "qmljsqtstylecodeformatter.h"
 
 #include <texteditor/snippets/isnippetprovider.h>
-#include <texteditor/fontsettings.h>
 #include <texteditor/tabsettings.h>
 #include <texteditor/simplecodestylepreferences.h>
 #include <texteditor/displaysettings.h>
diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
index 79f9cb6c35e..22c803bcecb 100644
--- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
+++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
@@ -30,20 +30,9 @@
 #include "qmljsfindexportedcpptypes.h"
 
 #include <qmljs/qmljsinterpreter.h>
-#include <cplusplus/AST.h>
-#include <cplusplus/TranslationUnit.h>
-#include <cplusplus/ASTVisitor.h>
-#include <cplusplus/ASTMatcher.h>
-#include <cplusplus/ASTPatternBuilder.h>
 #include <cplusplus/Overview.h>
 #include <cplusplus/TypeOfExpression.h>
-#include <cplusplus/Names.h>
-#include <cplusplus/Literals.h>
-#include <cplusplus/CoreTypes.h>
-#include <cplusplus/Symbols.h>
-#include <cplusplus/SimpleLexer.h>
 #include <cpptools/ModelManagerInterface.h>
-#include <utils/qtcassert.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
index c8e8273d174..3c500314c96 100644
--- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp
+++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
@@ -30,7 +30,6 @@
 #include "qmljsfunctionfilter.h"
 #include "qmljslocatordata.h"
 
-#include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 
 #include <QStringMatcher>
diff --git a/src/plugins/qmljstools/qmljsindenter.cpp b/src/plugins/qmljstools/qmljsindenter.cpp
index a88e2bbe189..fb28e46c09d 100644
--- a/src/plugins/qmljstools/qmljsindenter.cpp
+++ b/src/plugins/qmljstools/qmljsindenter.cpp
@@ -35,7 +35,6 @@
 #include <QChar>
 #include <QTextDocument>
 #include <QTextBlock>
-#include <QTextCursor>
 
 using namespace QmlJSEditor;
 using namespace Internal;
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index cd116abc654..fe7db26d505 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -35,28 +35,16 @@
 #include "qmljsbundleprovider.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <coreplugin/mimedatabase.h>
 #include <coreplugin/messagemanager.h>
 #include <cpptools/ModelManagerInterface.h>
-#include <cplusplus/CppDocument.h>
-#include <qmljs/qmljscontext.h>
 #include <qmljs/qmljsbind.h>
-#include <qmljs/qmljsbundle.h>
-#include <qmljs/parser/qmldirparser_p.h>
-#include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 #include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/kit.h>
-#include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/toolchain.h>
-#include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qmldumptool.h>
 #include <qtsupport/qtsupportconstants.h>
@@ -66,11 +54,8 @@
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QLibraryInfo>
-#include <QtConcurrentRun>
 #include <utils/runextensions.h>
 #include <QTextStream>
-#include <QCoreApplication>
 #include <QTimer>
 #include <QRegExp>
 
diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp
index fd901b8651d..0f7efa793e5 100644
--- a/src/plugins/qmljstools/qmljsplugindumper.cpp
+++ b/src/plugins/qmljstools/qmljsplugindumper.cpp
@@ -30,14 +30,12 @@
 #include "qmljsplugindumper.h"
 #include "qmljsmodelmanager.h"
 
-#include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsinterpreter.h>
 #include <projectexplorer/projectexplorer.h>
 #include <coreplugin/messagemanager.h>
 #include <utils/filesystemwatcher.h>
 #include <utils/fileutils.h>
 
-#include <QMetaType>
 #include <QDir>
 
 using namespace LanguageUtils;
diff --git a/src/plugins/qmljstools/qmljsrefactoringchanges.cpp b/src/plugins/qmljstools/qmljsrefactoringchanges.cpp
index 927000298cf..827a3fddde8 100644
--- a/src/plugins/qmljstools/qmljsrefactoringchanges.cpp
+++ b/src/plugins/qmljstools/qmljsrefactoringchanges.cpp
@@ -29,13 +29,10 @@
 
 #include "qmljsrefactoringchanges.h"
 #include "qmljsqtstylecodeformatter.h"
-#include "qmljstoolsconstants.h"
 #include "qmljsmodelmanager.h"
 #include "qmljsindenter.h"
 
 #include <qmljs/parser/qmljsast_p.h>
-#include <qmljs/qmljsmodelmanagerinterface.h>
-#include <texteditor/texteditorsettings.h>
 #include <texteditor/tabsettings.h>
 #include <projectexplorer/editorconfiguration.h>
 
diff --git a/src/plugins/qmljstools/qmljstools_test.cpp b/src/plugins/qmljstools/qmljstools_test.cpp
index d25cbdd1e38..b39749aff09 100644
--- a/src/plugins/qmljstools/qmljstools_test.cpp
+++ b/src/plugins/qmljstools/qmljstools_test.cpp
@@ -29,21 +29,10 @@
 
 #include "qmljstoolsplugin.h"
 
-#include <QScopedPointer>
 #include <QLatin1String>
-#include <QGraphicsObject>
-#include <QApplication>
-#include <QSettings>
-#include <QFileInfo>
 
 #include <coreplugin/icore.h>
-#include <qmljs/qmljsinterpreter.h>
-#include <qmljs/qmljsdocument.h>
-#include <qmljs/qmljsbind.h>
-#include <qmljs/qmljscontext.h>
 #include <qmljs/qmljslink.h>
-#include <qmljs/parser/qmljsast_p.h>
-#include <qmljstools/qmljsrefactoringchanges.h>
 #include <qmljstools/qmljsmodelmanager.h>
 
 #include <QtTest>
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp
index dc9ba4ec1bf..0d2889019c0 100644
--- a/src/plugins/qmljstools/qmljstoolsplugin.cpp
+++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp
@@ -37,20 +37,14 @@
 #include "qmlconsolemanager.h"
 #include "qmljsbundleprovider.h"
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
 #include <QtPlugin>
-#include <QFileInfo>
-#include <QDir>
 #include <QDebug>
-#include <QSettings>
 #include <QMenu>
 
 using namespace QmlJSTools;
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.h b/src/plugins/qmljstools/qmljstoolsplugin.h
index 5f5dcdaecf1..e36e08d6fe0 100644
--- a/src/plugins/qmljstools/qmljstoolsplugin.h
+++ b/src/plugins/qmljstools/qmljstoolsplugin.h
@@ -31,10 +31,6 @@
 #define QMLJSTOOLS_H
 
 #include <extensionsystem/iplugin.h>
-#include <projectexplorer/projectexplorer.h>
-
-#include <QTextDocument>
-#include <QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 class QFileInfo;