From d18bf468ad9d68f90ed52cdf6e086cc8907a0cb8 Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Thu, 19 Jul 2012 15:31:22 +0400
Subject: [PATCH] Changed return type of :ICore::mainWindow() to QWidget*

Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/app/main.cpp                                            | 1 -
 src/plugins/analyzerbase/analyzermanager.cpp                | 1 -
 src/plugins/analyzerbase/analyzerplugin.cpp                 | 1 -
 src/plugins/bineditor/bineditorplugin.cpp                   | 1 -
 src/plugins/cmakeprojectmanager/cmakeproject.cpp            | 1 -
 src/plugins/coreplugin/actionmanager/command.cpp            | 1 -
 src/plugins/coreplugin/basefilewizard.cpp                   | 1 -
 src/plugins/coreplugin/editormanager/editormanager.cpp      | 1 -
 src/plugins/coreplugin/generalsettings.cpp                  | 1 -
 src/plugins/coreplugin/icore.cpp                            | 2 +-
 src/plugins/coreplugin/icore.h                              | 4 ++--
 src/plugins/coreplugin/manhattanstyle.cpp                   | 1 -
 src/plugins/cpaster/cpasterplugin.cpp                       | 1 -
 src/plugins/cpaster/protocol.cpp                            | 1 -
 src/plugins/cppeditor/cppeditor.cpp                         | 1 -
 src/plugins/debugger/debuggertooltipmanager.cpp             | 1 -
 src/plugins/debugger/gdb/gdbengine.cpp                      | 1 -
 src/plugins/debugger/memoryagent.cpp                        | 1 -
 src/plugins/debugger/qml/qmlcppengine.cpp                   | 1 -
 src/plugins/debugger/qml/qmlengine.cpp                      | 1 -
 src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp     | 1 -
 src/plugins/designer/formeditorw.cpp                        | 1 -
 src/plugins/designer/formwindowfile.cpp                     | 1 -
 src/plugins/find/findtoolwindow.cpp                         | 1 -
 src/plugins/genericprojectmanager/genericproject.cpp        | 1 -
 src/plugins/genericprojectmanager/genericprojectplugin.cpp  | 1 -
 src/plugins/git/gerrit/gerritplugin.cpp                     | 1 -
 src/plugins/git/gitclient.cpp                               | 1 -
 src/plugins/git/gitplugin.cpp                               | 1 -
 src/plugins/glsleditor/glsleditor.cpp                       | 1 -
 src/plugins/glsleditor/glsleditoractionhandler.cpp          | 1 -
 src/plugins/glsleditor/glsleditorfactory.cpp                | 1 -
 src/plugins/help/helpviewer.cpp                             | 1 -
 src/plugins/macros/macromanager.cpp                         | 3 +--
 src/plugins/mercurial/mercurialplugin.cpp                   | 1 -
 src/plugins/projectexplorer/buildmanager.cpp                | 1 -
 src/plugins/projectexplorer/buildstepspage.cpp              | 1 -
 src/plugins/projectexplorer/devicesupport/devicemanager.cpp | 1 -
 src/plugins/projectexplorer/miniprojecttargetselector.cpp   | 1 -
 src/plugins/projectexplorer/pluginfilefactory.cpp           | 1 -
 src/plugins/projectexplorer/profilemanager.cpp              | 1 -
 src/plugins/projectexplorer/projectexplorer.cpp             | 1 -
 src/plugins/projectexplorer/runconfiguration.cpp            | 1 -
 src/plugins/projectexplorer/session.cpp                     | 1 -
 src/plugins/projectexplorer/settingsaccessor.cpp            | 1 -
 src/plugins/projectexplorer/toolchainmanager.cpp            | 1 -
 src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp     | 1 -
 src/plugins/qmljseditor/qmljseditor.cpp                     | 1 -
 src/plugins/qmljseditor/qmljseditoractionhandler.cpp        | 1 -
 src/plugins/qmljseditor/qmljseditorfactory.cpp              | 1 -
 src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp     | 1 -
 src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp      | 1 -
 src/plugins/qt4projectmanager/qt-s60/s60manager.cpp         | 2 --
 src/plugins/qt4projectmanager/qt4nodes.cpp                  | 1 -
 src/plugins/qtsupport/customexecutablerunconfiguration.cpp  | 1 -
 src/plugins/qtsupport/gettingstartedwelcomepage.cpp         | 1 -
 src/plugins/qtsupport/qtoptionspage.cpp                     | 1 -
 src/plugins/qtsupport/qtversionmanager.cpp                  | 1 -
 src/plugins/remotelinux/deploymentsettingsassistant.cpp     | 1 -
 src/plugins/remotelinux/publickeydeploymentdialog.cpp       | 1 -
 src/plugins/resourceeditor/resourceeditorw.cpp              | 1 -
 src/plugins/subversion/subversionplugin.cpp                 | 1 -
 src/plugins/tasklist/taskfilefactory.cpp                    | 1 -
 src/plugins/texteditor/basefilefind.cpp                     | 1 -
 src/plugins/texteditor/basetextdocument.cpp                 | 1 -
 src/plugins/texteditor/fontsettings.cpp                     | 1 -
 src/plugins/texteditor/fontsettingspage.cpp                 | 1 -
 src/plugins/texteditor/refactoringchanges.cpp               | 1 -
 src/plugins/texteditor/snippets/snippetssettingspage.cpp    | 1 -
 src/plugins/texteditor/texteditorplugin.cpp                 | 1 -
 src/plugins/vcsbase/vcsbaseplugin.cpp                       | 3 +--
 src/plugins/vcsbase/vcsbasesubmiteditor.cpp                 | 1 -
 72 files changed, 5 insertions(+), 76 deletions(-)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 9d3842fe12b..526ca15477f 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -52,7 +52,6 @@
 
 #include <QApplication>
 #include <QDesktopServices>
-#include <QMainWindow>
 #include <QMessageBox>
 
 #ifdef ENABLE_QT_BREAKPAD
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index 49be027161a..4f2feffe6b1 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -90,7 +90,6 @@
 #include <QLabel>
 #include <QCheckBox>
 #include <QDialogButtonBox>
-#include <QMainWindow>
 #include <QPushButton>
 
 using namespace Core;
diff --git a/src/plugins/analyzerbase/analyzerplugin.cpp b/src/plugins/analyzerbase/analyzerplugin.cpp
index 2362661ddbe..a8608f94e31 100644
--- a/src/plugins/analyzerbase/analyzerplugin.cpp
+++ b/src/plugins/analyzerbase/analyzerplugin.cpp
@@ -47,7 +47,6 @@
 
 #include <QtPlugin>
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QApplication>
 
 using namespace Analyzer;
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index c9f9b0d0e3b..c67c19574f9 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -44,7 +44,6 @@
 
 #include <QMenu>
 #include <QAction>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QHBoxLayout>
 #include <QLineEdit>
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 16ef4f6c227..0b148969ee9 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -63,7 +63,6 @@
 #include <QDateTime>
 #include <QProcess>
 #include <QFormLayout>
-#include <QMainWindow>
 #include <QInputDialog>
 #include <QFileSystemWatcher>
 
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index 6647b24936f..b320e43dced 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -39,7 +39,6 @@
 
 #include <QAction>
 #include <QShortcut>
-#include <QMainWindow>
 
 /*!
     \class Core::Command
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
index fc3806b62a3..d7a8eaaf1aa 100644
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -54,7 +54,6 @@
 
 #include <QMessageBox>
 #include <QWizard>
-#include <QMainWindow>
 #include <QIcon>
 
 enum { debugWizard = 0 };
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index bd49704cfa8..54762d9bc5a 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -78,7 +78,6 @@
 #include <QApplication>
 #include <QFileDialog>
 #include <QLayout>
-#include <QMainWindow>
 #include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index a11e08c6ccc..a6ab371b2b3 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -38,7 +38,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 
-#include <QMainWindow>
 #include <QMessageBox>
 
 #include <QCoreApplication>
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index bd1a39f640e..b9ad7f93015 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -513,7 +513,7 @@ IContext *ICore::currentContextObject()
 }
 
 
-QMainWindow *ICore::mainWindow()
+QWidget *ICore::mainWindow()
 {
     return m_mainwindow;
 }
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index cc8eba960a9..a954b6f76a1 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -37,9 +37,9 @@
 #include <QSettings>
 
 QT_BEGIN_NAMESPACE
-class QMainWindow;
 class QPrinter;
 class QStatusBar;
+class QWidget;
 template <class T> class QList;
 QT_END_NAMESPACE
 
@@ -112,7 +112,7 @@ public:
     static QString resourcePath();
     static QString userResourcePath();
 
-    static QMainWindow *mainWindow();
+    static QWidget *mainWindow();
     static QStatusBar *statusBar();
 
     static IContext *currentContextObject();
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index e06de770059..fd32959e97c 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -47,7 +47,6 @@
 #include <QDockWidget>
 #include <QLabel>
 #include <QLineEdit>
-#include <QMainWindow>
 #include <QMenuBar>
 #include <QPainter>
 #include <QPixmap>
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 65a01b58b6e..54efe98e7fa 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -64,7 +64,6 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QMenu>
-#include <QMainWindow>
 #include <QInputDialog>
 #include <QUrl>
 
diff --git a/src/plugins/cpaster/protocol.cpp b/src/plugins/cpaster/protocol.cpp
index 306665142e1..49a3fa2a087 100644
--- a/src/plugins/cpaster/protocol.cpp
+++ b/src/plugins/cpaster/protocol.cpp
@@ -48,7 +48,6 @@
 
 #include <QMessageBox>
 #include <QApplication>
-#include <QMainWindow>
 #include <QPushButton>
 
 namespace CodePaster {
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 17b17894ef6..7f98f0842f1 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -112,7 +112,6 @@
 #include <QToolBar>
 #include <QTreeView>
 #include <QSortFilterProxyModel>
-#include <QMainWindow>
 
 #include <sstream>
 
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index 34719e67d40..fcdf0882c81 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -56,7 +56,6 @@
 #include <QStyle>
 #include <QIcon>
 #include <QApplication>
-#include <QMainWindow>
 #include <QMoveEvent>
 #include <QDesktopWidget>
 #include <QScrollBar>
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index c986d2ea8ff..4bcecc8c462 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -95,7 +95,6 @@
 #include <QAction>
 #include <QDialogButtonBox>
 #include <QLabel>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QPushButton>
 
diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp
index 0043c18612b..0b55844bae1 100644
--- a/src/plugins/debugger/memoryagent.cpp
+++ b/src/plugins/debugger/memoryagent.cpp
@@ -47,7 +47,6 @@
 #include <extensionsystem/invoker.h>
 
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QVBoxLayout>
 
 #include <cstring>
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 72433ed264b..cba83a2e439 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -44,7 +44,6 @@
 #include <cppeditor/cppeditorconstants.h>
 
 #include <QTimer>
-#include <QMainWindow>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 6ab15d7f286..8c68ecc8050 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -76,7 +76,6 @@
 
 #include <QAction>
 #include <QApplication>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QPlainTextEdit>
 #include <QToolTip>
diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
index df48e545174..badcf37c119 100644
--- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
+++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp
@@ -43,7 +43,6 @@
 #include <QVBoxLayout>
 #include <QFormLayout>
 #include <QMessageBox>
-#include <QMainWindow>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 1be3ca705dc..57aa038ce2d 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -85,7 +85,6 @@
 #include <QCursor>
 #include <QDockWidget>
 #include <QMenu>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QKeySequence>
 #include <QPrintDialog>
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index ecaf5ccdaef..478de27409a 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -44,7 +44,6 @@
 #endif
 
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QUndoStack>
 
 #include <QFile>
diff --git a/src/plugins/find/findtoolwindow.cpp b/src/plugins/find/findtoolwindow.cpp
index e78eef309d7..60e2f9e8dac 100644
--- a/src/plugins/find/findtoolwindow.cpp
+++ b/src/plugins/find/findtoolwindow.cpp
@@ -34,7 +34,6 @@
 #include <coreplugin/icore.h>
 
 #include <QSettings>
-#include <QMainWindow>
 #include <QStringListModel>
 #include <QCompleter>
 #include <QKeyEvent>
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 9ec185c5cc5..caeead1f8ad 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -54,7 +54,6 @@
 #include <QDir>
 #include <QProcessEnvironment>
 
-#include <QMainWindow>
 #include <QComboBox>
 
 using namespace GenericProjectManager;
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
index 9b991befc09..0c3e5c94aec 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
@@ -54,7 +54,6 @@
 #include <QDebug>
 
 #include <QTreeView>
-#include <QMainWindow>
 
 using namespace GenericProjectManager;
 using namespace GenericProjectManager::Internal;
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp
index 39df21ad9b7..8105e4528c2 100644
--- a/src/plugins/git/gerrit/gerritplugin.cpp
+++ b/src/plugins/git/gerrit/gerritplugin.cpp
@@ -59,7 +59,6 @@
 #include <QDebug>
 #include <QProcess>
 #include <QRegExp>
-#include <QMainWindow>
 #include <QAction>
 #include <QFileDialog>
 #include <QTemporaryFile>
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 84d8f66aa5b..ca785e34486 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -71,7 +71,6 @@
 #include <QSignalMapper>
 
 #include <QComboBox>
-#include <QMainWindow> // for msg box parent
 #include <QMessageBox>
 #include <QToolButton>
 #include <QTextCodec>
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index a4a239199fc..53797b5ad94 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -79,7 +79,6 @@
 
 #include <QAction>
 #include <QFileDialog>
-#include <QMainWindow>
 #include <QMenu>
 #include <QMessageBox>
 
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index c7e1ea22811..fc2b0669ef9 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -72,7 +72,6 @@
 #include <QComboBox>
 #include <QHeaderView>
 #include <QInputDialog>
-#include <QMainWindow>
 #include <QToolBar>
 #include <QTreeView>
 
diff --git a/src/plugins/glsleditor/glsleditoractionhandler.cpp b/src/plugins/glsleditor/glsleditoractionhandler.cpp
index 56c2f0b4b19..80edcf0e7cf 100644
--- a/src/plugins/glsleditor/glsleditoractionhandler.cpp
+++ b/src/plugins/glsleditor/glsleditoractionhandler.cpp
@@ -37,7 +37,6 @@
 
 #include <QDebug>
 #include <QAction>
-#include <QMainWindow>
 #include <QMessageBox>
 
 namespace GLSLEditor {
diff --git a/src/plugins/glsleditor/glsleditorfactory.cpp b/src/plugins/glsleditor/glsleditorfactory.cpp
index 6c4d9174dfe..048fcbc2d85 100644
--- a/src/plugins/glsleditor/glsleditorfactory.cpp
+++ b/src/plugins/glsleditor/glsleditorfactory.cpp
@@ -47,7 +47,6 @@
 #include <QSettings>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QMainWindow>
 
 using namespace GLSLEditor::Internal;
 using namespace GLSLEditor::Constants;
diff --git a/src/plugins/help/helpviewer.cpp b/src/plugins/help/helpviewer.cpp
index 1e89faffcc6..2abffba55c5 100644
--- a/src/plugins/help/helpviewer.cpp
+++ b/src/plugins/help/helpviewer.cpp
@@ -43,7 +43,6 @@
 
 #include <QApplication>
 #include <QDesktopServices>
-#include <QMainWindow>
 #include <QMouseEvent>
 
 #include <QHelpEngine>
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index 6cf09f54c9c..dcc19369d77 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -59,7 +59,6 @@
 #include <QList>
 
 #include <QShortcut>
-#include <QMainWindow>
 #include <QAction>
 #include <QFileDialog>
 #include <QMessageBox>
@@ -228,7 +227,7 @@ bool MacroManager::MacroManagerPrivate::executeMacro(Macro *macro)
 
 void MacroManager::MacroManagerPrivate::showSaveDialog()
 {
-    QMainWindow *mainWindow = Core::ICore::mainWindow();
+    QWidget *mainWindow = Core::ICore::mainWindow();
     SaveDialog dialog(mainWindow);
     if (dialog.exec()) {
         if (dialog.name().isEmpty())
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index b99026871eb..5eda4132c34 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -63,7 +63,6 @@
 #include <QtPlugin>
 #include <QAction>
 #include <QMenu>
-#include <QMainWindow>
 #include <QtDebug>
 #include <QtGlobal>
 #include <QDir>
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 1971773460b..0b88954d24d 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -59,7 +59,6 @@
 #include <utils/QtConcurrentTools>
 
 #include <QApplication>
-#include <QMainWindow>
 
 static inline QString msgProgress(int progress, int total)
 {
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 28dfbc4cc83..e450f58981a 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -50,7 +50,6 @@
 #include <QHBoxLayout>
 #include <QToolButton>
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QGraphicsOpacityEffect>
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index da5ad0f0efe..d9efc0bf1dc 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -40,7 +40,6 @@
 #include <QFileInfo>
 #include <QHash>
 #include <QList>
-#include <QMainWindow>
 #include <QSettings>
 #include <QString>
 #include <QVariantHash>
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 6f7a5599247..cb50d71a609 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -58,7 +58,6 @@
 #include <QPainter>
 #include <QAction>
 #include <QItemDelegate>
-#include <QMainWindow>
 #include <QApplication>
 
 static QIcon createCenteredIcon(const QIcon &icon, const QIcon &overlay)
diff --git a/src/plugins/projectexplorer/pluginfilefactory.cpp b/src/plugins/projectexplorer/pluginfilefactory.cpp
index 815cb6ae22c..99bca766a7b 100644
--- a/src/plugins/projectexplorer/pluginfilefactory.cpp
+++ b/src/plugins/projectexplorer/pluginfilefactory.cpp
@@ -43,7 +43,6 @@
 
 #include <QDebug>
 #include <QMessageBox>
-#include <QMainWindow>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
diff --git a/src/plugins/projectexplorer/profilemanager.cpp b/src/plugins/projectexplorer/profilemanager.cpp
index c93a6b292cd..dcfe0e9bfc2 100644
--- a/src/plugins/projectexplorer/profilemanager.cpp
+++ b/src/plugins/projectexplorer/profilemanager.cpp
@@ -49,7 +49,6 @@
 
 #include <QFormLayout>
 #include <QLabel>
-#include <QMainWindow>
 
 static const char PROFILE_DATA_KEY[] = "Profile.";
 static const char PROFILE_COUNT_KEY[] = "Profile.Count";
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 69aa361003f..9bb2f22ceda 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -130,7 +130,6 @@
 #include <QFileDialog>
 #include <QMenu>
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QWizard>
 
 /*!
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 3ff4d599cde..87ae827ddf5 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -47,7 +47,6 @@
 
 #include <QTimer>
 #include <QSettings>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QPushButton>
 
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index 88891fd817e..c59de13b2d9 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -59,7 +59,6 @@
 #include <QTimer>
 
 #include <QApplication>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QTextCodec>
diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp
index 858efbe08c0..d6a3bb4ace6 100644
--- a/src/plugins/projectexplorer/settingsaccessor.cpp
+++ b/src/plugins/projectexplorer/settingsaccessor.cpp
@@ -50,7 +50,6 @@
 #include <QApplication>
 #include <QDebug>
 #include <QFile>
-#include <QMainWindow>
 #include <QMessageBox>
 
 namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index fde724465ce..2b86f2f0510 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -43,7 +43,6 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <QSettings>
-#include <QMainWindow>
 
 static const char TOOLCHAIN_DATA_KEY[] = "ToolChain.";
 static const char TOOLCHAIN_COUNT_KEY[] = "ToolChain.Count";
diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
index 59211da793f..e28e6f68193 100644
--- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
+++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
@@ -45,7 +45,6 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
-#include <QMainWindow>
 #include <QMessageBox>
 
 using namespace QmlJS::AST;
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index bbe5d9d8f03..628d97d4bb5 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -85,7 +85,6 @@
 #include <QComboBox>
 #include <QHeaderView>
 #include <QInputDialog>
-#include <QMainWindow>
 #include <QToolBar>
 #include <QTreeView>
 
diff --git a/src/plugins/qmljseditor/qmljseditoractionhandler.cpp b/src/plugins/qmljseditor/qmljseditoractionhandler.cpp
index 9938a28f55c..09fae4e7b71 100644
--- a/src/plugins/qmljseditor/qmljseditoractionhandler.cpp
+++ b/src/plugins/qmljseditor/qmljseditoractionhandler.cpp
@@ -37,7 +37,6 @@
 
 #include <QDebug>
 #include <QAction>
-#include <QMainWindow>
 #include <QMessageBox>
 
 namespace QmlJSEditor {
diff --git a/src/plugins/qmljseditor/qmljseditorfactory.cpp b/src/plugins/qmljseditor/qmljseditorfactory.cpp
index 412546c968a..9454420660c 100644
--- a/src/plugins/qmljseditor/qmljseditorfactory.cpp
+++ b/src/plugins/qmljseditor/qmljseditorfactory.cpp
@@ -50,7 +50,6 @@
 #include <QSettings>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QMainWindow>
 
 using namespace QmlJSEditor;
 using namespace QmlJSEditor::Internal;
diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
index d99b6fa2a68..469d947de8a 100644
--- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
@@ -52,7 +52,6 @@
 #include <QTimer>
 
 #include <QMessageBox>
-#include <QMainWindow>
 
 #include <QTcpSocket>
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
index f254ad8199b..71b41259524 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
@@ -50,7 +50,6 @@
 #include <utils/qtcassert.h>
 
 #include <QMessageBox>
-#include <QMainWindow>
 
 #include <QTimer>
 #include <QDateTime>
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
index ec727066534..18a065a4205 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
@@ -56,8 +56,6 @@
 #include <debugger/debuggerconstants.h>
 #include <utils/qtcassert.h>
 
-#include <QMainWindow>
-
 #include <QDir>
 
 namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 6ee827d6224..2959f928d49 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -72,7 +72,6 @@
 #include <QXmlStreamReader>
 
 #include <QPainter>
-#include <QMainWindow>
 #include <QMessageBox>
 #include <QPushButton>
 #include <utils/QtConcurrentTools>
diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp
index bcb5354ebc9..efb3a7a0b1c 100644
--- a/src/plugins/qtsupport/customexecutablerunconfiguration.cpp
+++ b/src/plugins/qtsupport/customexecutablerunconfiguration.cpp
@@ -46,7 +46,6 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QLabel>
-#include <QMainWindow>
 #include <QVBoxLayout>
 
 #include <QDir>
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
index a22d7abbb85..34f1c821b48 100644
--- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
+++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp
@@ -67,7 +67,6 @@
 #include <QPushButton>
 #include <QMessageBox>
 #include <QApplication>
-#include <QMainWindow>
 #include <QDeclarativeImageProvider>
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index d4d2b3ca95b..803de478cb6 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -55,7 +55,6 @@
 #include <QToolTip>
 #include <QMessageBox>
 #include <QFileDialog>
-#include <QMainWindow>
 #include <QTextBrowser>
 #include <QDesktopServices>
 
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 6a14bead215..94bcd5b91a3 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -58,7 +58,6 @@
 #include <QDebug>
 #include <QDir>
 #include <QFile>
-#include <QMainWindow>
 #include <QSettings>
 #include <QTextStream>
 #include <QTimer>
diff --git a/src/plugins/remotelinux/deploymentsettingsassistant.cpp b/src/plugins/remotelinux/deploymentsettingsassistant.cpp
index 76b50d7924f..d8518cd3769 100644
--- a/src/plugins/remotelinux/deploymentsettingsassistant.cpp
+++ b/src/plugins/remotelinux/deploymentsettingsassistant.cpp
@@ -45,7 +45,6 @@
 #include <QDir>
 #include <QHash>
 #include <QString>
-#include <QMainWindow>
 
 using namespace Qt4ProjectManager;
 
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index 0818278feda..26ab6af0ecd 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -36,7 +36,6 @@
 
 #include <QTimer>
 #include <QFileDialog>
-#include <QMainWindow>
 
 namespace RemoteLinux {
 namespace Internal {
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index 8e310cfc8f1..b5941722971 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -49,7 +49,6 @@
 #include <QDir>
 #include <qdebug.h>
 #include <QHBoxLayout>
-#include <QMainWindow>
 #include <QMenu>
 #include <QToolBar>
 #include <QInputDialog>
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index b792a042ab7..942ad7fb14b 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -73,7 +73,6 @@
 #include <QXmlStreamReader>
 #include <QAction>
 #include <QFileDialog>
-#include <QMainWindow>
 #include <QMenu>
 #include <QMessageBox>
 #include <QInputDialog>
diff --git a/src/plugins/tasklist/taskfilefactory.cpp b/src/plugins/tasklist/taskfilefactory.cpp
index 473976b0226..d83f0de2ed3 100644
--- a/src/plugins/tasklist/taskfilefactory.cpp
+++ b/src/plugins/tasklist/taskfilefactory.cpp
@@ -37,7 +37,6 @@
 #include <coreplugin/id.h>
 #include <coreplugin/documentmanager.h>
 
-#include <QMainWindow>
 #include <QMessageBox>
 
 using namespace TaskList::Internal;
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index ef522ad1a9d..129e71887a4 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -56,7 +56,6 @@
 #include <QComboBox>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QMainWindow>
 #include <QPushButton>
 #include <QTextBlock>
 
diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp
index 1fd9f00066a..923b9a88946 100644
--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -46,7 +46,6 @@
 #include <QTextStream>
 #include <QTextCodec>
 #include <QFutureInterface>
-#include <QMainWindow>
 #include <QSyntaxHighlighter>
 #include <QApplication>
 
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index 8795fd81d8a..219fab2a8be 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -40,7 +40,6 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QFont>
-#include <QMainWindow>
 #include <QSettings>
 #include <QTextCharFormat>
 
diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp
index 6ec4a4187cf..7d0240abb40 100644
--- a/src/plugins/texteditor/fontsettingspage.cpp
+++ b/src/plugins/texteditor/fontsettingspage.cpp
@@ -49,7 +49,6 @@
 #include <QInputDialog>
 #include <QListWidget>
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QPalette>
 #include <QTextCharFormat>
 #include <QTextEdit>
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index bd2346ae008..9acd0e16cbc 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -39,7 +39,6 @@
 
 #include <QFile>
 #include <QSet>
-#include <QMainWindow>
 #include <QTextBlock>
 #include <QTextCursor>
 #include <QTextDocument>
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
index 5ab13f349e0..41015a4af15 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -49,7 +49,6 @@
 #include <QTextStream>
 #include <QHash>
 #include <QMessageBox>
-#include <QMainWindow>
 
 namespace TextEditor {
 namespace Internal {
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 1525e8edbd0..de59f2688b6 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -61,7 +61,6 @@
 #include <utils/qtcassert.h>
 
 #include <QtPlugin>
-#include <QMainWindow>
 #include <QShortcut>
 #include <QDir>
 #include <QTemporaryFile>
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index b6008ae5c7f..3c3e6902f44 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -60,7 +60,6 @@
 #include <QAction>
 #include <QMessageBox>
 #include <QFileDialog>
-#include <QMainWindow>
 
 using namespace Utils;
 
@@ -643,7 +642,7 @@ void VcsBasePlugin::createRepository()
     if (const ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectExplorerPlugin::currentProject())
         directory = QFileInfo(currentProject->document()->fileName()).absolutePath();
     // Prompt for a directory that is not under version control yet
-    QMainWindow *mw = Core::ICore::mainWindow();
+    QWidget *mw = Core::ICore::mainWindow();
     do {
         directory = QFileDialog::getExistingDirectory(mw, tr("Choose Repository Directory"), directory);
         if (directory.isEmpty())
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index e30cb35eeac..b11c734807d 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -78,7 +78,6 @@
 #include <QAction>
 #include <QApplication>
 #include <QMessageBox>
-#include <QMainWindow>
 #include <QCompleter>
 #include <QLineEdit>
 #include <QTextEdit>