summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-04-05 12:00:01 +0200
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2013-04-05 15:10:02 +0200
commit9393335c1d9f357873e4c69df82b4d0eb67f2048 (patch)
tree718bcec18336ba653a3b0f11f483a1a05a93012b
parentffb2f2ccf62078763c19a18e5dc5ed6d7faf564e (diff)
downloadqt-creator-9393335c1d9f357873e4c69df82b4d0eb67f2048.tar.gz
Clean headers in Git.
Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: Ib2afbc530760684db96888b927c5153b29fe24aa Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/plugins/git/branchdialog.cpp2
-rw-r--r--src/plugins/git/branchdialog.h1
-rw-r--r--src/plugins/git/branchmodel.cpp2
-rw-r--r--src/plugins/git/branchmodel.h1
-rw-r--r--src/plugins/git/changeselectiondialog.cpp2
-rw-r--r--src/plugins/git/clonewizardpage.cpp3
-rw-r--r--src/plugins/git/commitdata.cpp1
-rw-r--r--src/plugins/git/gerrit/gerritdialog.cpp5
-rw-r--r--src/plugins/git/gerrit/gerritmodel.cpp3
-rw-r--r--src/plugins/git/gerrit/gerritmodel.h2
-rw-r--r--src/plugins/git/gerrit/gerritoptionspage.cpp1
-rw-r--r--src/plugins/git/gerrit/gerritpushdialog.cpp2
-rw-r--r--src/plugins/git/gitclient.cpp8
-rw-r--r--src/plugins/git/giteditor.cpp7
-rw-r--r--src/plugins/git/gitorious/gitorious.cpp1
-rw-r--r--src/plugins/git/gitorious/gitoriousprojectwidget.cpp2
-rw-r--r--src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp2
-rw-r--r--src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp2
-rw-r--r--src/plugins/git/gitplugin.cpp5
-rw-r--r--src/plugins/git/gitplugin.h6
-rw-r--r--src/plugins/git/gitsettings.h2
-rw-r--r--src/plugins/git/gitsubmiteditor.cpp1
-rw-r--r--src/plugins/git/gitsubmiteditorwidget.cpp2
-rw-r--r--src/plugins/git/gitutils.cpp1
-rw-r--r--src/plugins/git/gitversioncontrol.cpp2
-rw-r--r--src/plugins/git/logchangedialog.cpp1
-rw-r--r--src/plugins/git/mergetool.cpp1
-rw-r--r--src/plugins/git/remotedialog.cpp2
-rw-r--r--src/plugins/git/settingspage.cpp4
-rw-r--r--src/plugins/git/settingspage.h1
-rw-r--r--src/plugins/git/stashdialog.cpp2
31 files changed, 1 insertions, 76 deletions
diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp
index 781520e327..e902223734 100644
--- a/src/plugins/git/branchdialog.cpp
+++ b/src/plugins/git/branchdialog.cpp
@@ -37,12 +37,10 @@
#include "ui_branchdialog.h"
#include "stashdialog.h" // Label helpers
-#include <utils/checkablemessagebox.h>
#include <utils/qtcassert.h>
#include <vcsbase/vcsbaseoutputwindow.h>
#include <QItemSelectionModel>
-#include <QPushButton>
#include <QMessageBox>
#include <QList>
diff --git a/src/plugins/git/branchdialog.h b/src/plugins/git/branchdialog.h
index b5a673ec04..0725d00dfc 100644
--- a/src/plugins/git/branchdialog.h
+++ b/src/plugins/git/branchdialog.h
@@ -31,7 +31,6 @@
#define BRANCHDIALOG_H
#include <QDialog>
-#include <QItemSelection>
QT_BEGIN_NAMESPACE
class QPushButton;
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp
index 5807783179..4cb59ae8af 100644
--- a/src/plugins/git/branchmodel.cpp
+++ b/src/plugins/git/branchmodel.cpp
@@ -34,8 +34,6 @@
#include <vcsbase/vcsbaseoutputwindow.h>
#include <QFont>
-#include <QRegExp>
-#include <QTimer>
namespace Git {
namespace Internal {
diff --git a/src/plugins/git/branchmodel.h b/src/plugins/git/branchmodel.h
index 109262a48f..2383478a78 100644
--- a/src/plugins/git/branchmodel.h
+++ b/src/plugins/git/branchmodel.h
@@ -31,7 +31,6 @@
#define BRANCHMODEL_H
#include <QAbstractListModel>
-#include <QList>
#include <QVariant>
namespace Git {
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index edf49194ab..e344096772 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -33,8 +33,6 @@
#include <QProcess>
#include <QFormLayout>
-#include <QSpacerItem>
-#include <QFormLayout>
#include <QHBoxLayout>
#include <QPushButton>
#include <QLabel>
diff --git a/src/plugins/git/clonewizardpage.cpp b/src/plugins/git/clonewizardpage.cpp
index 30e3f380d3..1ea045141e 100644
--- a/src/plugins/git/clonewizardpage.cpp
+++ b/src/plugins/git/clonewizardpage.cpp
@@ -32,9 +32,6 @@
#include "gitclient.h"
#include <vcsbase/checkoutjobs.h>
-#include <utils/qtcassert.h>
-
-#include <QCheckBox>
namespace Git {
diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp
index cc7c91b1fa..77b296a07f 100644
--- a/src/plugins/git/commitdata.cpp
+++ b/src/plugins/git/commitdata.cpp
@@ -32,7 +32,6 @@
#include <QCoreApplication>
#include <QDebug>
-#include <QRegExp>
namespace Git {
namespace Internal {
diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp
index da6e5da977..7b1f55e8cf 100644
--- a/src/plugins/git/gerrit/gerritdialog.cpp
+++ b/src/plugins/git/gerrit/gerritdialog.cpp
@@ -31,7 +31,6 @@
#include "gerritmodel.h"
#include "gerritparameters.h"
-#include <utils/filterlineedit.h>
#include <utils/qtcassert.h>
#include <coreplugin/icore.h>
@@ -42,16 +41,12 @@
#include <QLabel>
#include <QTextBrowser>
#include <QTreeView>
-#include <QHeaderView>
#include <QDialogButtonBox>
#include <QPushButton>
#include <QDesktopServices>
#include <QSortFilterProxyModel>
#include <QGroupBox>
#include <QUrl>
-#include <QClipboard>
-#include <QApplication>
-#include <QProcess>
#include <QStringListModel>
#include <QCompleter>
diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp
index b964509266..6c637bbb3a 100644
--- a/src/plugins/git/gerrit/gerritmodel.cpp
+++ b/src/plugins/git/gerrit/gerritmodel.cpp
@@ -30,7 +30,6 @@
#include "gerritmodel.h"
#include "gerritparameters.h"
-#include <coreplugin/vcsmanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/progressmanager/futureprogress.h>
@@ -40,9 +39,7 @@
#include <QStringList>
#include <QProcess>
#include <QVariant>
-#include <QUrl>
#include <QTextStream>
-#include <QDesktopServices>
#include <QMessageBox>
#include <QPushButton>
#include <QDebug>
diff --git a/src/plugins/git/gerrit/gerritmodel.h b/src/plugins/git/gerrit/gerritmodel.h
index 610cc682b7..f78d68f3c7 100644
--- a/src/plugins/git/gerrit/gerritmodel.h
+++ b/src/plugins/git/gerrit/gerritmodel.h
@@ -32,8 +32,6 @@
#include <QStandardItemModel>
#include <QSharedPointer>
-#include <QMetaType>
-#include <QPair>
#include <QDateTime>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/git/gerrit/gerritoptionspage.cpp b/src/plugins/git/gerrit/gerritoptionspage.cpp
index c0d887eb3c..9523a1cbe3 100644
--- a/src/plugins/git/gerrit/gerritoptionspage.cpp
+++ b/src/plugins/git/gerrit/gerritoptionspage.cpp
@@ -37,7 +37,6 @@
#include <QSpinBox>
#include <QCheckBox>
#include <QFormLayout>
-#include <QVBoxLayout>
namespace Gerrit {
namespace Internal {
diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp
index 6f595c743c..85a2c4cc4a 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.cpp
+++ b/src/plugins/git/gerrit/gerritpushdialog.cpp
@@ -32,10 +32,8 @@
#include "../gitplugin.h"
#include "../gitclient.h"
-#include <coreplugin/icore.h>
#include <QDir>
-#include <QMessageBox>
namespace Gerrit {
namespace Internal {
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index c33282cda1..acc6c5e10f 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -39,23 +39,16 @@
#include <vcsbase/submitfilemodel.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
-#include <coreplugin/messagemanager.h>
-#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/vcsmanager.h>
#include <coreplugin/id.h>
-#include <coreplugin/documentmanager.h>
#include <coreplugin/iversioncontrol.h>
-#include <texteditor/itexteditor.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/synchronousprocess.h>
-#include <utils/environment.h>
#include <utils/fileutils.h>
#include <vcsbase/command.h>
#include <vcsbase/vcsbaseeditor.h>
@@ -71,7 +64,6 @@
#include <QSignalMapper>
#include <QTime>
-#include <QComboBox>
#include <QMessageBox>
#include <QPushButton>
#include <QToolButton>
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index d5c9c2ac45..2e37f4e463 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -30,25 +30,18 @@
#include "giteditor.h"
#include "annotationhighlighter.h"
-#include "gitconstants.h"
#include "gitplugin.h"
#include "gitclient.h"
#include "gitsettings.h"
-#include <QTextCodec>
-#include <coreplugin/editormanager/editormanager.h>
#include <utils/qtcassert.h>
-#include <vcsbase/diffhighlighter.h>
#include <vcsbase/vcsbaseoutputwindow.h>
#include <QDebug>
-#include <QDir>
#include <QFileInfo>
#include <QRegExp>
#include <QSet>
-#include <QTextStream>
#include <QTextCursor>
-#include <QTextEdit>
#include <QTextBlock>
#define CHANGE_PATTERN "[a-f0-9]{7,40}"
diff --git a/src/plugins/git/gitorious/gitorious.cpp b/src/plugins/git/gitorious/gitorious.cpp
index 0d86e26ae3..f76f15a437 100644
--- a/src/plugins/git/gitorious/gitorious.cpp
+++ b/src/plugins/git/gitorious/gitorious.cpp
@@ -30,7 +30,6 @@
#include "gitorious.h"
#include <QDebug>
-#include <QCoreApplication>
#include <QXmlStreamReader>
#include <QSettings>
diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
index 523399493a..b374910f0e 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
+++ b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp
@@ -28,7 +28,6 @@
****************************************************************************/
#include "gitoriousprojectwidget.h"
-#include "gitorioushostwizardpage.h"
#include "gitorious.h"
#include "ui_gitoriousprojectwidget.h"
@@ -42,7 +41,6 @@
#include <QStandardItem>
#include <QItemSelectionModel>
#include <QDesktopServices>
-#include <QIcon>
#include <QStyle>
enum {
diff --git a/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp b/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
index 2a6c25816d..d7de4cdd52 100644
--- a/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
+++ b/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
@@ -32,8 +32,6 @@
#include "gitorioushostwizardpage.h"
#include "gitorious.h"
-#include <utils/qtcassert.h>
-
#include <QStackedWidget>
#include <QVBoxLayout>
diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
index 33e58c9bb3..da6ecd25ea 100644
--- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
+++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
@@ -33,8 +33,6 @@
#include "gitorious.h"
#include "ui_gitoriousrepositorywizardpage.h"
-#include <utils/qtcassert.h>
-
#include <QDebug>
#include <QStandardItemModel>
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index e02081db6c..22498c69d0 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -51,7 +51,6 @@
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/documentmanager.h>
-#include <coreplugin/messagemanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
@@ -62,7 +61,6 @@
#include <utils/qtcassert.h>
#include <utils/parameteraction.h>
-#include <utils/fileutils.h>
#include <vcsbase/basevcseditorfactory.h>
#include <vcsbase/submitfilemodel.h>
@@ -79,7 +77,6 @@
#include <QAction>
#include <QFileDialog>
-#include <QMenu>
#include <QMessageBox>
static const unsigned minimumRequiredVersion = 0x010702;
@@ -1284,8 +1281,6 @@ GitClient *GitPlugin::gitClient() const
#ifdef WITH_TESTS
#include <QTest>
-#include <QTextBlock>
-#include <QTextDocument>
Q_DECLARE_METATYPE(FileStates)
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 00a032603a..d52e75a54c 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -34,11 +34,6 @@
#include "vcsbase/vcsbaseplugin.h"
-#include <coreplugin/editormanager/ieditorfactory.h>
-#include <extensionsystem/iplugin.h>
-
-#include <QObject>
-#include <QProcess>
#include <QStringList>
#include <QPointer>
#include <QPair>
@@ -51,6 +46,7 @@ class QFileInfo;
QT_END_NAMESPACE
namespace Core {
+class IEditor;
class IEditorFactory;
class Command;
class Context;
diff --git a/src/plugins/git/gitsettings.h b/src/plugins/git/gitsettings.h
index 4f500ca630..99f74cb200 100644
--- a/src/plugins/git/gitsettings.h
+++ b/src/plugins/git/gitsettings.h
@@ -32,8 +32,6 @@
#include <vcsbase/vcsbaseclientsettings.h>
-#include <QStringList>
-
namespace Git {
namespace Internal {
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index b994529000..f479f6b446 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -30,7 +30,6 @@
#include "gitsubmiteditor.h"
#include "commitdata.h"
#include "gitclient.h"
-#include "gitconstants.h"
#include "gitplugin.h"
#include "gitsubmiteditorwidget.h"
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index 319b6f81ff..8c76d2fdc2 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -32,10 +32,8 @@
#include <texteditor/texteditorsettings.h>
#include <texteditor/fontsettings.h>
-#include <texteditor/texteditorconstants.h>
#include <utils/qtcassert.h>
-#include <QLineEdit>
#include <QRegExpValidator>
#include <QSyntaxHighlighter>
#include <QTextEdit>
diff --git a/src/plugins/git/gitutils.cpp b/src/plugins/git/gitutils.cpp
index d318d97ee7..7dab04257f 100644
--- a/src/plugins/git/gitutils.cpp
+++ b/src/plugins/git/gitutils.cpp
@@ -30,7 +30,6 @@
#include "gitutils.h"
#include <QDebug>
-#include <QStringList>
#include <QInputDialog>
#include <QLineEdit>
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp
index ecf823aaf9..605fb8c3e7 100644
--- a/src/plugins/git/gitversioncontrol.cpp
+++ b/src/plugins/git/gitversioncontrol.cpp
@@ -29,10 +29,8 @@
#include "gitversioncontrol.h"
#include "gitclient.h"
-#include "gitplugin.h"
#include "gitutils.h"
-#include <utils/qtcassert.h>
#include <vcsbase/vcsbaseconstants.h>
#include <QFileInfo>
diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp
index b38298531e..28a3e44d8f 100644
--- a/src/plugins/git/logchangedialog.cpp
+++ b/src/plugins/git/logchangedialog.cpp
@@ -39,7 +39,6 @@
#include <QItemSelectionModel>
#include <QVBoxLayout>
#include <QComboBox>
-#include <QDir>
namespace Git {
namespace Internal {
diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index 862ca6d9b1..0bf3cfc676 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -33,7 +33,6 @@
#include <vcsbase/vcsbaseoutputwindow.h>
-#include <QFile>
#include <QMessageBox>
#include <QProcess>
#include <QPushButton>
diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp
index 05006dbb15..4488719f73 100644
--- a/src/plugins/git/remotedialog.cpp
+++ b/src/plugins/git/remotedialog.cpp
@@ -38,8 +38,6 @@
#include <vcsbase/vcsbaseoutputwindow.h>
-#include <QItemSelectionModel>
-#include <QPushButton>
#include <QMessageBox>
namespace Git {
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp
index b017d5b748..d2bf45d9ce 100644
--- a/src/plugins/git/settingspage.cpp
+++ b/src/plugins/git/settingspage.cpp
@@ -34,14 +34,10 @@
#include <vcsbase/vcsbaseconstants.h>
#include <utils/hostosinfo.h>
-#include <utils/pathchooser.h>
-#include <QCoreApplication>
#include <QDir>
-#include <QFileInfo>
#include <QDebug>
#include <QTextStream>
-#include <QProcessEnvironment>
#include <QMessageBox>
namespace Git {
diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h
index e936eaf772..18e70f473b 100644
--- a/src/plugins/git/settingspage.h
+++ b/src/plugins/git/settingspage.h
@@ -31,7 +31,6 @@
#define SETTINGSPAGE_H
#include <QWidget>
-#include <QPointer>
#include <vcsbase/vcsbaseoptionspage.h>
diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp
index dcbe06dc7e..1447230d39 100644
--- a/src/plugins/git/stashdialog.cpp
+++ b/src/plugins/git/stashdialog.cpp
@@ -34,7 +34,6 @@
#include "ui_stashdialog.h"
#include <utils/qtcassert.h>
-#include <vcsbase/vcsbaseoutputwindow.h>
#include <QDebug>
#include <QDir>
@@ -42,7 +41,6 @@
#include <QDateTime>
#include <QStandardItemModel>
#include <QSortFilterProxyModel>
-#include <QItemSelectionModel>
#include <QMessageBox>
#include <QPushButton>