From b95c86db232d3dc7c5c431c94762e590bca7dc2b Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Mon, 11 Jan 2010 09:45:20 +0100
Subject: [PATCH] Remove duplicate inclusions of headers

Reviewed-by: thorbjorn
---
 src/libs/extensionsystem/pluginspec.cpp                        | 2 +-
 src/libs/utils/fancymainwindow.cpp                             | 1 -
 src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp        | 1 -
 src/plugins/coreplugin/dialogs/saveitemsdialog.cpp             | 2 --
 src/plugins/coreplugin/editormanager/editorview.h              | 1 -
 src/plugins/coreplugin/mainwindow.cpp                          | 1 -
 src/plugins/cppeditor/cppeditor.cpp                            | 2 --
 src/plugins/debugger/gdb/trkgdbadapter.h                       | 1 -
 src/plugins/debugger/script/scriptengine.cpp                   | 1 -
 src/plugins/designer/formeditorw.cpp                           | 1 -
 src/plugins/git/gitclient.cpp                                  | 1 -
 src/plugins/projectexplorer/filewatcher.h                      | 1 -
 src/plugins/projectexplorer/outputwindow.cpp                   | 2 --
 src/plugins/projectexplorer/projectexplorer.cpp                | 2 --
 src/plugins/qmlprojectmanager/qmlproject.cpp                   | 1 -
 .../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp     | 1 -
 .../qt-s60/s60devicerunconfigurationwidget.cpp                 | 1 -
 src/plugins/qt4projectmanager/qt4buildconfiguration.h          | 1 -
 src/plugins/texteditor/basetexteditor.cpp                      | 3 ---
 src/plugins/texteditor/fontsettingspage.cpp                    | 1 -
 src/plugins/texteditor/texteditorsettings.cpp                  | 1 -
 src/plugins/vcsbase/vcsbaseeditor.cpp                          | 1 -
 src/shared/designerintegrationv2/formresizer.cpp               | 1 -
 23 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index e60dece3500..0dd8aadc9d1 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -28,7 +28,7 @@
 **************************************************************************/
 
 #include "pluginspec.h"
-#include "pluginspec.h"
+
 #include "pluginspec_p.h"
 #include "iplugin.h"
 #include "iplugin_p.h"
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index 09d05833669..078414c7fcd 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -30,7 +30,6 @@
 #include "fancymainwindow.h"
 
 #include <QtGui/QAction>
-#include <QtCore/QSettings>
 #include <QtGui/QDockWidget>
 #include <QtCore/QSettings>
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 0dcce6ed265..229547503c2 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -30,7 +30,6 @@
 #include "cmakeprojectmanager.h"
 #include "cmakeprojectconstants.h"
 #include "cmakeproject.h"
-#include "cmakeprojectconstants.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
index f543380a4cd..9e1b6a67772 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
@@ -35,12 +35,10 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#include <QtCore/QDir>
 #include <QtGui/QPushButton>
 #include <QtGui/QTreeWidget>
 #include <QtGui/QHeaderView>
 #include <QtGui/QCheckBox>
-#include <QtGui/QPushButton>
 
 Q_DECLARE_METATYPE(Core::IFile*);
 
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index b309a70135e..746a126d645 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -43,7 +43,6 @@
 #include <coreplugin/icontext.h>
 #include <coreplugin/ifile.h>
 
-#include <QtCore/QMap>
 #include <QtGui/QSortFilterProxyModel>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index e982d703ffe..4ab4bdaf56d 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -85,7 +85,6 @@
 #include <QtGui/QShortcut>
 #include <QtGui/QStatusBar>
 #include <QtGui/QWizard>
-#include <QtGui/QPrinter>
 #include <QtGui/QToolButton>
 #include <QtGui/QMessageBox>
 
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 1daf077adf7..fe5b5cafa2d 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -40,7 +40,6 @@
 #include <Scope.h>
 #include <Symbols.h>
 #include <Names.h>
-#include <Control.h>
 #include <CoreTypes.h>
 #include <Literals.h>
 #include <Semantic.h>
@@ -54,7 +53,6 @@
 #include <cplusplus/OverviewModel.h>
 #include <cplusplus/SimpleLexer.h>
 #include <cplusplus/TokenUnderCursor.h>
-#include <cplusplus/TypeOfExpression.h>
 #include <cplusplus/MatchingText.h>
 #include <cplusplus/BackwardsScanner.h>
 #include <cplusplus/FastPreprocessor.h>
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.h b/src/plugins/debugger/gdb/trkgdbadapter.h
index d886ad4f33c..f3100ba2de4 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.h
+++ b/src/plugins/debugger/gdb/trkgdbadapter.h
@@ -43,7 +43,6 @@
 #include <QtCore/QQueue>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QSharedPointer>
 
 #include <QtNetwork/QTcpServer>
 #include <QtNetwork/QTcpSocket>
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index bcb397ca749..84fe6cacbbd 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -38,7 +38,6 @@
 #include "stackhandler.h"
 #include "watchhandler.h"
 #include "watchutils.h"
-#include "moduleshandler.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 5761513bdda..b00497cd19d 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -54,7 +54,6 @@
 
 #include <QtDesigner/QDesignerWidgetBoxInterface>
 #include <QtDesigner/abstractobjectinspector.h>
-#include <QtDesigner/QDesignerComponents>
 #include <QtDesigner/QDesignerPropertyEditorInterface>
 #include <QtDesigner/QDesignerActionEditorInterface>
 
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 04d5b473c4c..aad68a5ee02 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -44,7 +44,6 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/filemanager.h>
-#include <coreplugin/filemanager.h>
 #include <coreplugin/iversioncontrol.h>
 
 #include <texteditor/itexteditor.h>
diff --git a/src/plugins/projectexplorer/filewatcher.h b/src/plugins/projectexplorer/filewatcher.h
index 1b518e34c6f..fc278edb5cd 100644
--- a/src/plugins/projectexplorer/filewatcher.h
+++ b/src/plugins/projectexplorer/filewatcher.h
@@ -36,7 +36,6 @@
 #include <QtCore/QHash>
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QtCore/QDateTime>
 #include <QtCore/QMap>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp
index 875594e68a5..8f9ba4607f0 100644
--- a/src/plugins/projectexplorer/outputwindow.cpp
+++ b/src/plugins/projectexplorer/outputwindow.cpp
@@ -49,8 +49,6 @@
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QTabWidget>
 
-#include <QtGui/QApplication>
-
 using namespace ProjectExplorer::Internal;
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index ff419e65be7..292c6b2f28f 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -78,10 +78,8 @@
 #include <coreplugin/editormanager/iexternaleditor.h>
 #include <coreplugin/findplaceholder.h>
 #include <coreplugin/basefilewizard.h>
-#include <coreplugin/mainwindow.h>
 #include <coreplugin/vcsmanager.h>
 #include <coreplugin/iversioncontrol.h>
-#include <coreplugin/vcsmanager.h>
 #include <welcome/welcomemode.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/consoleprocess.h>
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 2643fdccaaa..325038829ee 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -44,7 +44,6 @@
 #include <qmleditor/qmlmodelmanagerinterface.h>
 
 #include <utils/synchronousprocess.h>
-#include <utils/pathchooser.h>
 
 #include <QtCore/QtDebug>
 #include <QtCore/QDir>
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index a7ce8a4b4b5..8e2d711656b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -48,7 +48,6 @@
 #include <projectexplorer/persistentsettings.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/persistentsettings.h>
 
 #include <debugger/debuggermanager.h>
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
index ac5820c4b86..d43048111e7 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
@@ -34,7 +34,6 @@
 #include "s60manager.h"
 #include "launcher.h"
 #include "bluetoothlistener.h"
-#include "bluetoothlistener_gui.h"
 #include "serialdevicelister.h"
 
 #include <utils/detailswidget.h>
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index ea913fe308f..57246663a22 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -34,7 +34,6 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/toolchain.h>
-#include "qtversionmanager.h"
 
 namespace Qt4ProjectManager {
 
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 531e25f7a7c..c83a0e60be4 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -69,10 +69,8 @@
 #include <QtGui/QPainter>
 #include <QtGui/QPrinter>
 #include <QtGui/QPrintDialog>
-#include <QtGui/QPainter>
 #include <QtGui/QScrollBar>
 #include <QtGui/QShortcut>
-#include <QtGui/QScrollBar>
 #include <QtGui/QStyle>
 #include <QtGui/QSyntaxHighlighter>
 #include <QtGui/QTextCursor>
@@ -82,7 +80,6 @@
 #include <QtGui/QToolTip>
 #include <QtGui/QInputDialog>
 #include <QtGui/QMenu>
-#include <QtGui/QKeyEvent>
 
 using namespace TextEditor;
 using namespace TextEditor::Internal;
diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp
index 450267ac250..c02aeb1f76a 100644
--- a/src/plugins/texteditor/fontsettingspage.cpp
+++ b/src/plugins/texteditor/fontsettingspage.cpp
@@ -49,7 +49,6 @@
 #include <QtGui/QListWidget>
 #include <QtGui/QMessageBox>
 #include <QtGui/QPalette>
-#include <QtGui/QPalette>
 #include <QtGui/QTextCharFormat>
 #include <QtGui/QTextEdit>
 #include <QtGui/QToolButton>
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index dd74c184325..076448f603b 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -38,7 +38,6 @@
 #include "fontsettingspage.h"
 #include "storagesettings.h"
 #include "tabsettings.h"
-#include "texteditorconstants.h"
 #include "texteditorplugin.h"
 
 #include <extensionsystem/pluginmanager.h>
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index fd3f38dcf62..3d8ecfb7358 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -35,7 +35,6 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/ifile.h>
 #include <coreplugin/iversioncontrol.h>
 #include <extensionsystem/pluginmanager.h>
diff --git a/src/shared/designerintegrationv2/formresizer.cpp b/src/shared/designerintegrationv2/formresizer.cpp
index f794e5b45da..09d1b893e4b 100644
--- a/src/shared/designerintegrationv2/formresizer.cpp
+++ b/src/shared/designerintegrationv2/formresizer.cpp
@@ -39,7 +39,6 @@
 #include <QtGui/QPalette>
 #include <QtGui/QLayout>
 #include <QtGui/QFrame>
-#include <QtGui/QResizeEvent>
 
 enum { debugFormResizer = 0 };
 
-- 
GitLab