Commit 4b0bafd6 authored by Friedemann Kleint's avatar Friedemann Kleint Committed by Erik Verbruggen

Clean headers in CppTools.

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

Change-Id: Ic8464ea084ca1ab401e9f4a7d0183b92b4038902
Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@digia.com>
parent 7d163a07
......@@ -34,7 +34,6 @@
#include <utils/wizard.h>
#include <QStringList>
#include <QWizardPage>
namespace Utils {
......
......@@ -59,6 +59,7 @@
#include <cpptools/cpptoolssettings.h>
#include <cpptools/symbolfinder.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorer.h>
#include <texteditor/basetextdocument.h>
#include <texteditor/basetextdocumentlayout.h>
#include <texteditor/codeassist/basicproposalitem.h>
......
......@@ -37,6 +37,7 @@
#include <cplusplus/ASTfwd.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/LookupContext.h>
namespace CppTools {
class CppRefactoringFile;
......
......@@ -34,7 +34,6 @@
#include "cppprojectfile.h"
#include <cplusplus/CppDocument.h>
#include <languageutils/fakemetaobject.h>
#include <QObject>
#include <QHash>
......
......@@ -29,14 +29,8 @@
#include "TypeHierarchyBuilder.h"
#include <cplusplus/CoreTypes.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/DependencyTable.h>
#include <cplusplus/FindUsages.h>
#include <cplusplus/Literals.h>
#include <cplusplus/SymbolVisitor.h>
#include <cplusplus/Symbols.h>
#include <cplusplus/TranslationUnit.h>
using namespace CppTools;
......
......@@ -33,7 +33,6 @@
#include "cpptools_global.h"
#include "ModelManagerInterface.h"
#include <cplusplus/CppDocument.h>
#include <cplusplus/Overview.h>
#include <QList>
......
......@@ -29,19 +29,10 @@
#include "abstracteditorsupport.h"
#include "cpptoolsconstants.h"
#include "cppfilesettingspage.h"
#include "ModelManagerInterface.h"
#include <coreplugin/icore.h>
#include <cplusplus/CoreTypes.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/Names.h>
#include <cplusplus/Overview.h>
#include <cplusplus/Scope.h>
#include <cplusplus/Symbols.h>
#include <QDebug>
......
......@@ -4,7 +4,6 @@
#include "searchsymbols.h"
#include <coreplugin/icore.h>
#include <coreplugin/mimedatabase.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <utils/runextensions.h>
......
......@@ -35,10 +35,7 @@
#include <coreplugin/icore.h>
#include <texteditor/texteditorsettings.h>
#include <extensionsystem/pluginmanager.h>
#include <QTextStream>
#include <QCoreApplication>
using namespace CppTools;
using namespace CppTools::Internal;
......
......@@ -31,21 +31,9 @@
#include "cpplocalsymbols.h"
#include <cplusplus/AST.h>
#include <cplusplus/Literals.h>
#include <cplusplus/Names.h>
#include <cplusplus/Overview.h>
#include <cplusplus/Scope.h>
#include <cplusplus/SimpleLexer.h>
#include <cplusplus/SymbolVisitor.h>
#include <cplusplus/Symbols.h>
#include <cplusplus/TranslationUnit.h>
#include <utils/qtcassert.h>
#include <utils/runextensions.h>
#include <QCoreApplication>
#include <QThreadPool>
#include <QDebug>
// This is for experimeting highlighting ctors/dtors as functions (instead of types).
......
......@@ -33,11 +33,6 @@
#include "cpptools_global.h"
#include "cppsemanticinfo.h"
#include <texteditor/semantichighlighter.h>
#include <cplusplus/ASTVisitor.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/LookupContext.h>
#include <cplusplus/TypeOfExpression.h>
#include <QSet>
......
......@@ -29,12 +29,7 @@
#include "cppcodeformatter.h"
#include "cppcodestylesettingspage.h"
#include <texteditor/basetextdocumentlayout.h>
#include <texteditor/tabsettings.h>
#include <cplusplus/Token.h>
#include <cplusplus/Lexer.h>
#include <utils/qtcassert.h>
......@@ -42,7 +37,6 @@
#include <QDebug>
#include <QMetaEnum>
#include <QTextDocument>
#include <QTextCursor>
#include <QTextBlock>
using namespace CPlusPlus;
......
......@@ -38,11 +38,9 @@
#include <cplusplus/Token.h>
#include <cplusplus/SimpleLexer.h>
#include <QChar>
#include <QStack>
#include <QList>
#include <QVector>
#include <QPointer>
QT_BEGIN_NAMESPACE
class QTextDocument;
......
......@@ -28,25 +28,12 @@
****************************************************************************/
#include "insertionpointlocator.h"
#include "cpprefactoringchanges.h"
#include "cpptoolsplugin.h"
#include <cplusplus/AST.h>
#include <cplusplus/Bind.h>
#include <cplusplus/Control.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/DiagnosticClient.h>
#include <cplusplus/Literals.h>
#include <cplusplus/Scope.h>
#include <cplusplus/Symbols.h>
#include <cplusplus/TranslationUnit.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/fileutils.h>
#include <QtTest>
#include <QDebug>
#include <QTextDocument>
#include <QDir>
/*!
......
......@@ -29,7 +29,6 @@
#include "cppcodestylepreferencesfactory.h"
#include "cppcodestylesettings.h"
#include "cppcodestylesettingspage.h"
#include "cppcodestylepreferences.h"
#include "cpptoolsconstants.h"
......@@ -37,7 +36,6 @@
#include <cppeditor/cppeditorconstants.h>
#include <texteditor/snippets/isnippetprovider.h>
#include <texteditor/tabsettings.h>
#include <extensionsystem/pluginmanager.h>
......
......@@ -29,7 +29,6 @@
#include "cppcodestylesettings.h"
#include "cppcodestylepreferencesfactory.h"
#include "cppcodestylepreferences.h"
#include "cpptoolsconstants.h"
#include "cpptoolssettings.h"
......
......@@ -34,7 +34,6 @@
#include <cplusplus/Overview.h>
#include <QMetaType>
#include <QVariant>
QT_BEGIN_NAMESPACE
......
......@@ -40,12 +40,9 @@
#include <cppeditor/cppeditorconstants.h>
#include <texteditor/codestyleeditor.h>
#include <texteditor/displaysettings.h>
#include <texteditor/fontsettings.h>
#include <texteditor/snippets/isnippetprovider.h>
#include <texteditor/tabsettings.h>
#include <texteditor/texteditorsettings.h>
#include <cplusplus/Overview.h>
#include <cplusplus/pp.h>
#include <extensionsystem/pluginmanager.h>
......
......@@ -38,9 +38,6 @@
#include <QWidget>
#include <QPointer>
#include <QSharedPointer>
#include <QVariant>
#include <QStringList>
namespace TextEditor {
class FontSettings;
......
......@@ -30,23 +30,9 @@
#include "cpptoolsplugin.h"
#include "cppcompletionassist.h"
#include <texteditor/basetextdocument.h>
#include <texteditor/plaintexteditor.h>
#include <texteditor/codeassist/iassistproposal.h>
#include <texteditor/codeassist/iassistproposalmodel.h>
#include <texteditor/codeassist/basicproposalitemlistmodel.h>
#include <cplusplus/AST.h>
#include <cplusplus/Bind.h>
#include <cplusplus/Control.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/DiagnosticClient.h>
#include <cplusplus/Literals.h>
#include <cplusplus/Scope.h>
#include <cplusplus/Symbols.h>
#include <cplusplus/TranslationUnit.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/changeset.h>
#include <utils/fileutils.h>
......
......@@ -31,11 +31,8 @@
#include "cppmodelmanager.h"
#include "cppdoxygen.h"
#include "cpptoolsconstants.h"
#include <coreplugin/idocument.h>
#include <coreplugin/icore.h>
#include <coreplugin/mimedatabase.h>
#include <cppeditor/cppeditorconstants.h>
#include <texteditor/codeassist/basicproposalitem.h>
#include <texteditor/codeassist/genericproposal.h>
......@@ -48,24 +45,12 @@
#include <utils/qtcassert.h>
#include <cplusplus/AST.h>
#include <cplusplus/ASTVisitor.h>
#include <cplusplus/BackwardsScanner.h>
#include <cplusplus/Control.h>
#include <cplusplus/CoreTypes.h>
#include <cplusplus/CppRewriter.h>
#include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/Literals.h>
#include <cplusplus/LookupContext.h>
#include <cplusplus/MatchingText.h>
#include <cplusplus/NameVisitor.h>
#include <cplusplus/Names.h>
#include <cplusplus/Overview.h>
#include <cplusplus/ResolveExpression.h>
#include <cplusplus/Scope.h>
#include <cplusplus/SymbolVisitor.h>
#include <cplusplus/Symbols.h>
#include <cplusplus/TranslationUnit.h>
#include <QLatin1String>
#include <QTextCursor>
......
......@@ -32,18 +32,14 @@
#include "cppcompletionassistprovider.h"
#include <cplusplus/CppDocument.h>
#include <cplusplus/Icons.h>
#include <cplusplus/Overview.h>
#include <cplusplus/TypeOfExpression.h>
#if QT_VERSION >= 0x050000
// Qt 5 requires the types to be defined for Q_DECLARE_METATYPE
# include <cplusplus/Symbol.h>
#endif
#include <texteditor/codeassist/basicproposalitem.h>
#include <texteditor/codeassist/basicproposalitemlistmodel.h>
#include <texteditor/codeassist/completionassistprovider.h>
#include <texteditor/codeassist/defaultassistinterface.h>
#include <texteditor/codeassist/iassistprocessor.h>
#include <texteditor/snippets/snippetassistcollector.h>
......
......@@ -31,10 +31,6 @@
#include "cppmodelmanager.h"
#include <coreplugin/editormanager/editormanager.h>
#include <cplusplus/CppDocument.h>
#include <QStringMatcher>
using namespace CppTools::Internal;
......
......@@ -37,9 +37,7 @@
#include <coreplugin/mimedatabase.h>
#include <cppeditor/cppeditorconstants.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
#include <QSettings>
#include <QDebug>
......@@ -51,7 +49,6 @@
#include <QTextCodec>
#include <QTextStream>
#include <QFileDialog>
#include <QMessageBox>
static const char headerSuffixKeyC[] = "HeaderSuffix";
static const char sourceSuffixKeyC[] = "SourceSuffix";
......
......@@ -32,40 +32,19 @@
#include "cpptoolsconstants.h"
#include "ModelManagerInterface.h"
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/infobar.h>
#include <coreplugin/progressmanager/futureprogress.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <find/searchresultwindow.h>
#include <texteditor/basefilefind.h>
#include <texteditor/basetexteditor.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/filesearch.h>
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
#include <utils/runextensions.h>
#include <utils/textfileformat.h>
#include <cplusplus/AST.h>
#include <cplusplus/ASTVisitor.h>
#include <cplusplus/Control.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/FindUsages.h>
#include <cplusplus/Literals.h>
#include <cplusplus/Names.h>
#include <cplusplus/Overview.h>
#include <cplusplus/Scope.h>
#include <cplusplus/Symbols.h>
#include <cplusplus/TranslationUnit.h>
#include <QTime>
#include <QTimer>
#include <QtConcurrentRun>
#include <QtConcurrentMap>
#include <QDir>
#include <QApplication>
#include <functional>
......
......@@ -30,9 +30,6 @@
#ifndef CPPFINDREFERENCES_H
#define CPPFINDREFERENCES_H
#include <utils/filesearch.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/DependencyTable.h>
#include <cplusplus/FindUsages.h>
......@@ -41,7 +38,6 @@
#include <QPointer>
#include <QFuture>
#include <QFutureWatcher>
#include <QMetaType>
QT_FORWARD_DECLARE_CLASS(QTimer)
......
......@@ -34,9 +34,7 @@
#include <texteditor/itexteditor.h>
#include <cplusplus/LookupContext.h>
#include <cplusplus/SimpleLexer.h>
#include <cplusplus/Token.h>
using namespace CPlusPlus;
using namespace CppTools;
......
......@@ -32,10 +32,6 @@
#include "cpphighlightingsupport.h"
#include <texteditor/semantichighlighter.h>
#include <cplusplus/CppDocument.h>
#include <QFuture>
namespace CppTools {
......
......@@ -31,15 +31,6 @@
#include "cppsemanticinfo.h"
#include <cplusplus/AST.h>
#include <cplusplus/ASTVisitor.h>
#include <cplusplus/CoreTypes.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/Literals.h>
#include <cplusplus/Names.h>
#include <cplusplus/Scope.h>
#include <cplusplus/Symbols.h>
using namespace CPlusPlus;
using namespace CppTools;
......
......@@ -33,9 +33,6 @@
#include "cpptools_global.h"
#include "cppsemanticinfo.h"
#include <cplusplus/CppDocument.h>
#include <cplusplus/ASTfwd.h>
namespace CppTools {
class CPPTOOLS_EXPORT LocalSymbols
......
......@@ -30,9 +30,6 @@
#include "cpplocatorfilter.h"
#include "cppmodelmanager.h"
#include <texteditor/itexteditor.h>
#include <texteditor/basetexteditor.h>
#include <utils/fileutils.h>
#include <QStringMatcher>
......
......@@ -35,52 +35,23 @@
#include "cpphighlightingsupportinternal.h"
#include "cppindexingsupport.h"
#include "abstracteditorsupport.h"
#include "cpptoolsconstants.h"
#include "cpptoolseditorsupport.h"
#include "cppfindreferences.h"
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/mimedatabase.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/session.h>
#include <texteditor/basetexteditor.h>
#include <texteditor/itexteditor.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/runextensions.h>
#include <cplusplus/AST.h>
#include <cplusplus/ASTVisitor.h>
#include <cplusplus/Control.h>
#include <cplusplus/CoreTypes.h>
#include <cplusplus/Lexer.h>
#include <cplusplus/Literals.h>
#include <cplusplus/NameVisitor.h>
#include <cplusplus/Names.h>
#include <cplusplus/Overview.h>
#include <cplusplus/Parser.h>
#include <cplusplus/Scope.h>
#include <cplusplus/Symbols.h>
#include <cplusplus/Token.h>
#include <cplusplus/TranslationUnit.h>
#include <cplusplus/TypeVisitor.h>
#include <cplusplus/pp.h>
#include <QCoreApplication>
#include <QDebug>
#include <QMutexLocker>
#include <QTime>
#include <QTimer>
#include <QtConcurrentMap>
#include <QTextBlock>
#include <QtConcurrentRun>
#include <QFutureSynchronizer>
#include <functional>
#include <iostream>
......
......@@ -37,14 +37,10 @@
#include <projectexplorer/project.h>
#include <texteditor/basetexteditor.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/PreprocessorClient.h>
#include <cplusplus/PreprocessorEnvironment.h>
#include <cplusplus/pp-engine.h>
#include <QHash>
#include <QFutureInterface>
#include <QFutureSynchronizer>
#include <QMutex>
#include <QTimer>
#include <QTextEdit> // for QTextEdit::ExtraSelection
......
......@@ -32,8 +32,6 @@
#include "cppmodelmanager.h"
#include "modelmanagertesthelper.h"
#include <cplusplus/CppDocument.h>
#include <QtTest>
#include <QDebug>
......
......@@ -30,9 +30,6 @@
#include "cpppointerdeclarationformatter.h"
#include <cplusplus/AST.h>
#include <QtGlobal>
#include <QTextCursor>
#define DEBUG_OUTPUT 0
......
......@@ -33,12 +33,7 @@
#include "cpptools_global.h"
#include "cpprefactoringchanges.h"
#include <cplusplus/AST.h>
#include <cplusplus/ASTVisitor.h>
#include <cplusplus/Overview.h>
#include <cplusplus/Symbols.h>
#include <utils/changeset.h>
namespace CppTools {
......
......@@ -29,18 +29,12 @@
#include "cpptoolsplugin.h"
#include "cpppointerdeclarationformatter.h"
#include "cpprefactoringchanges.h"
#include "cpptoolsplugin.h"
#include <texteditor/plaintexteditor.h>
#include <utils/changeset.h>
#include <utils/fileutils.h>
#include <cplusplus/AST.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/Symbols.h>
#include <cplusplus/TranslationUnit.h>
#include <cplusplus/pp.h>
#include <QDebug>
......
......@@ -35,7 +35,6 @@
#include <coreplugin/mimedatabase.h>
#include <QString>
#include <QMap>
namespace CppTools {
......
......@@ -32,10 +32,6 @@
#include "cppcodeformatter.h"
#include "cpptoolssettings.h"
#include "cppcodestylepreferences.h"
#include "cpptoolsconstants.h"
#include <texteditor/tabsettings.h>
#include <texteditor/texteditorsettings.h>
#include <QChar>
#include <QTextDocument>
......
......@@ -29,24 +29,13 @@
#include "cpprefactoringchanges.h"
#include "cppcodestylepreferences.h"
#include "cppqtstyleindenter.h"
#include "cppcodeformatter.h"
#include "cppmodelmanager.h"
#include "cpptoolssettings.h"
#include "cpptoolsconstants.h"
#include <texteditor/texteditorsettings.h>
#include <texteditor/tabsettings.h>
#include <projectexplorer/editorconfiguration.h>
#include <cplusplus/TranslationUnit.h>
#include <cplusplus/AST.h>
#include <utils/qtcassert.h>
#include <QTextBlock>
using namespace CPlusPlus;
using namespace CppTools;
using namespace Utils;
......
......@@ -35,8 +35,6 @@
#include <texteditor/refactoringchanges.h>
#include <cplusplus/ASTfwd.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/LookupContext.h>
namespace CppTools {
......
......@@ -35,7 +35,6 @@
#include <texteditor/semantichighlighter.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/LookupContext.h>
#include <QHash>
......
......@@ -29,18 +29,8 @@
#include "cpptoolseditorsupport.h"
#include "cppcompletionsupport.h"
#include "cpphighlightingsupport.h"
#include "cppmodelmanager.h"
#include <coreplugin/idocument.h>
#include <texteditor/itexteditor.h>
#include <texteditor/basetexteditor.h>
#include <cplusplus/AST.h>
#include <cplusplus/ASTVisitor.h>
#include <cplusplus/TranslationUnit.h>
#include <QTimer>
using namespace CppTools;
......
......@@ -30,14 +30,9 @@
#ifndef CPPTOOLSEDITORSUPPORT_H
#define CPPTOOLSEDITORSUPPORT_H
#include <cplusplus/CppDocument.h>
#include <QObject>
#include <QPointer>
#include <QFuture>
#include <QScopedPointer>
#include <QSharedPointer>
#include <QTextCursor>
QT_BEGIN_NAMESPACE
class QTimer;
......
......@@ -29,14 +29,12 @@
#include "cpptoolsplugin.h"
#include "completionsettingspage.h"
#include "cppfilesettingspage.h"
#include "cppcodestylesettingspage.h"