Fix some include statements.

In several places, it says '#include "..."' for headers
from different libraries/plugins.

Change-Id: I96cd74fef9b30163adefe3e1720e0847bed9553a
Reviewed-by: hjk <hjk121@nokiamail.com>

32 files changed, 61 insertions, 44 deletions

diff --git a/src/libs/qtcomponents/styleitem/qtmenu.cpp b/src/libs/qtcomponents/styleitem/qtmenu.cpp
index d7ddb363f5..872d581a5f 100644
--- a/src/libs/qtcomponents/styleitem/qtmenu.cpp
+++ b/src/libs/qtcomponents/styleitem/qtmenu.cpp
@@ -28,8 +28,9 @@
 ****************************************************************************/
 
 #include "qtmenu.h"
-#include "qdebug.h"
-#include <qapplication.h>
+
+#include <QApplication>
+#include <QtDebug>
 
 QtMenu::QtMenu(QObject *parent)
     : QObject(parent)
diff --git a/src/plugins/cpaster/pasteview.h b/src/plugins/cpaster/pasteview.h
index acb2c2fae1..1b027dc83b 100644
--- a/src/plugins/cpaster/pasteview.h
+++ b/src/plugins/cpaster/pasteview.h
@@ -31,7 +31,8 @@
 #define PASTEVIEW_H
 
 #include "ui_pasteview.h"
-#include "splitter.h"
+
+#include <splitter.h>
 
 #include <QDialog>
 
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 88df5dae22..df1b121116 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -40,7 +40,7 @@
 #include <utils/qtcassert.h>
 
 #if USE_BREAK_MODEL_TEST
-#include "modeltest.h"
+#include <modeltest.h>
 #endif
 
 #include <QTimerEvent>
diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp
index 8f050b4ed9..2d1dd15c12 100644
--- a/src/plugins/debugger/breakpoint.cpp
+++ b/src/plugins/debugger/breakpoint.cpp
@@ -29,7 +29,7 @@
 
 #include "breakpoint.h"
 
-#include "utils/qtcassert.h"
+#include <utils/qtcassert.h>
 
 #include <QDebug>
 #include <QFileInfo>
diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index 27d7998a8f..c33435fbfa 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -31,7 +31,7 @@
 #include "watchdelegatewidgets.h"
 
 #if USE_REGISTER_MODEL_TEST
-#include "modeltest.h"
+#include <modeltest.h>
 #endif
 
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp
index 9e00b42c99..d7edfa3220 100644
--- a/src/plugins/debugger/registerpostmortemaction.cpp
+++ b/src/plugins/debugger/registerpostmortemaction.cpp
@@ -33,7 +33,7 @@
 
 #include "registerpostmortemaction.h"
 
-#include "registryaccess.h"
+#include <registryaccess.h>
 
 #include <QCoreApplication>
 #include <QDir>
diff --git a/src/plugins/debugger/registerpostmortemaction.h b/src/plugins/debugger/registerpostmortemaction.h
index 8fd374aa20..ac06ec8b7e 100644
--- a/src/plugins/debugger/registerpostmortemaction.h
+++ b/src/plugins/debugger/registerpostmortemaction.h
@@ -30,7 +30,7 @@
 #ifndef REGISTERPOSTMORTEMACTION_H
 #define REGISTERPOSTMORTEMACTION_H
 
-#include "utils/savedaction.h"
+#include <utils/savedaction.h>
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/shared/symbolpathsdialog.cpp b/src/plugins/debugger/shared/symbolpathsdialog.cpp
index 8d42050962..8510568996 100644
--- a/src/plugins/debugger/shared/symbolpathsdialog.cpp
+++ b/src/plugins/debugger/shared/symbolpathsdialog.cpp
@@ -29,7 +29,8 @@
 
 #include "symbolpathsdialog.h"
 #include "ui_symbolpathsdialog.h"
-#include "QMessageBox"
+
+#include <QMessageBox>
 
 using namespace Debugger;
 using namespace Internal;
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 3643e382c0..3f1f7d116d 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -55,7 +55,7 @@
 //#define USE_EXPENSIVE_CHECKS 0
 
 #if USE_WATCH_MODEL_TEST
-#include "modeltest.h"
+#include <modeltest.h>
 #endif
 
 namespace Debugger {
diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 0ef1e9c517..12b57600d9 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -32,7 +32,7 @@
 
 #include "gitsettings.h"
 
-#include "vcsbase/vcsbaseplugin.h"
+#include <vcsbase/vcsbaseplugin.h>
 
 #include <QStringList>
 #include <QPointer>
diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp
index 43dea44778..c5fbe52abf 100644
--- a/src/plugins/help/centralwidget.cpp
+++ b/src/plugins/help/centralwidget.cpp
@@ -31,7 +31,8 @@
 
 #include "helpviewer.h"
 #include "localhelpmanager.h"
-#include "topicchooser.h"
+
+#include <topicchooser.h>
 
 #include <QEvent>
 #include <QTimer>
diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp
index 0a028bb561..f97cdfa879 100644
--- a/src/plugins/help/filtersettingspage.cpp
+++ b/src/plugins/help/filtersettingspage.cpp
@@ -29,13 +29,13 @@
 
 #include "filtersettingspage.h"
 
-#include "filternamedialog.h"
 #include "helpconstants.h"
 
+#include <filternamedialog.h>
+
 #include <coreplugin/helpmanager.h>
 
 #include <QCoreApplication>
-
 #include <QFileDialog>
 #include <QMessageBox>
 
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index 1fbee2fce5..43ac9b1aed 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -29,13 +29,14 @@
 
 #include "generalsettingspage.h"
 
-#include "bookmarkmanager.h"
 #include "centralwidget.h"
 #include "helpconstants.h"
 #include "helpviewer.h"
 #include "localhelpmanager.h"
 #include "xbelsupport.h"
 
+#include <bookmarkmanager.h>
+
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/helpmanager.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp
index 934c1b8c5e..5e65e84e32 100644
--- a/src/plugins/help/helpindexfilter.cpp
+++ b/src/plugins/help/helpindexfilter.cpp
@@ -30,7 +30,8 @@
 #include "helpindexfilter.h"
 
 #include "centralwidget.h"
-#include "topicchooser.h"
+
+#include <topicchooser.h>
 
 #include <extensionsystem/pluginmanager.h>
 #include <coreplugin/icore.h>
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 2c9647a17b..33113f689e 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -29,9 +29,7 @@
 
 #include "helpplugin.h"
 
-#include "bookmarkmanager.h"
 #include "centralwidget.h"
-#include "contentwindow.h"
 #include "docsettingspage.h"
 #include "externalhelpwindow.h"
 #include "filtersettingspage.h"
@@ -41,13 +39,16 @@
 #include "helpindexfilter.h"
 #include "helpmode.h"
 #include "helpviewer.h"
-#include "indexwindow.h"
 #include "localhelpmanager.h"
 #include "openpagesmanager.h"
 #include "openpagesmodel.h"
 #include "remotehelpfilter.h"
 #include "searchwidget.h"
 
+#include <bookmarkmanager.h>
+#include <contentwindow.h>
+#include <indexwindow.h>
+
 #include <app/app_version.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
index 4d909b8287..a225d77125 100644
--- a/src/plugins/help/localhelpmanager.cpp
+++ b/src/plugins/help/localhelpmanager.cpp
@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include "localhelpmanager.h"
-#include "bookmarkmanager.h"
+
+#include <bookmarkmanager.h>
 
 #include <app/app_version.h>
 #include <coreplugin/helpmanager.h>
diff --git a/src/plugins/help/xbelsupport.cpp b/src/plugins/help/xbelsupport.cpp
index 5913286d3c..1850629fb9 100644
--- a/src/plugins/help/xbelsupport.cpp
+++ b/src/plugins/help/xbelsupport.cpp
@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include "xbelsupport.h"
-#include "bookmarkmanager.h"
+
+#include <bookmarkmanager.h>
 
 #include <QCoreApplication>
 
diff --git a/src/plugins/imageviewer/imagevieweractionhandler.h b/src/plugins/imageviewer/imagevieweractionhandler.h
index 375ebbfb95..505ab6d64e 100644
--- a/src/plugins/imageviewer/imagevieweractionhandler.h
+++ b/src/plugins/imageviewer/imagevieweractionhandler.h
@@ -31,7 +31,7 @@
 #ifndef IMAGEVIEWERACTIONHANDLER_H
 #define IMAGEVIEWERACTIONHANDLER_H
 
-#include "coreplugin/id.h"
+#include <coreplugin/id.h>
 
 #include <QObject>
 
diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.h b/src/plugins/qmldesigner/components/formeditor/toolbox.h
index 129f0acf50..b58cd0dd80 100644
--- a/src/plugins/qmldesigner/components/formeditor/toolbox.h
+++ b/src/plugins/qmldesigner/components/formeditor/toolbox.h
@@ -30,7 +30,7 @@
 #ifndef TOOLBOX_H
 #define TOOLBOX_H
 
-#include "utils/styledbar.h"
+#include <utils/styledbar.h>
 
 QT_BEGIN_NAMESPACE
 class QToolBar;
diff --git a/src/plugins/qmljseditor/qmljsquickfix.cpp b/src/plugins/qmljseditor/qmljsquickfix.cpp
index 12828c7325..c05a090d6e 100644
--- a/src/plugins/qmljseditor/qmljsquickfix.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfix.cpp
@@ -30,13 +30,13 @@
 #include "qmljsquickfix.h"
 #include "qmljscomponentfromobjectdef.h"
 #include "qmljseditor.h"
-#include "qmljs/parser/qmljsast_p.h"
 #include "qmljsquickfixassist.h"
 
 #include <extensionsystem/iplugin.h>
 #include <extensionsystem/pluginmanager.h>
 
 #include <qmljs/qmljsmodelmanagerinterface.h>
+#include <qmljs/parser/qmljsast_p.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h
index 43e2c46844..f814ec432c 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h
@@ -30,11 +30,13 @@
 #ifndef QMLPROFILERMODELMANAGER_H
 #define QMLPROFILERMODELMANAGER_H
 
-#include <QObject>
 #include "qmlprofiler_global.h"
-#include "qmldebug/qmlprofilereventlocation.h"
+
+#include <qmldebug/qmlprofilereventlocation.h>
 #include <utils/fileinprojectfinder.h>
 
+#include <QObject>
+
 namespace QmlProfiler {
 class QmlProfilerSimpleModel;
 class QmlProfilerModelManager;
diff --git a/src/plugins/qmlprofiler/qmlprofilersimplemodel.cpp b/src/plugins/qmlprofiler/qmlprofilersimplemodel.cpp
index 99e353d59e..0ab64ae572 100644
--- a/src/plugins/qmlprofiler/qmlprofilersimplemodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilersimplemodel.cpp
@@ -28,11 +28,14 @@
 ****************************************************************************/
 
 #include "qmlprofilersimplemodel.h"
+
 #include "qmlprofilermodelmanager.h"
+
+#include <qmldebug/qmlprofilereventtypes.h>
+
 #include <QStringList>
 #include <QVector>
 #include <QDebug>
-#include "qmldebug/qmlprofilereventtypes.h"
 
 namespace QmlProfiler {
 
diff --git a/src/plugins/qmlprofiler/qmlprofilersimplemodel.h b/src/plugins/qmlprofiler/qmlprofilersimplemodel.h
index 30b0de124c..4551cec283 100644
--- a/src/plugins/qmlprofiler/qmlprofilersimplemodel.h
+++ b/src/plugins/qmlprofiler/qmlprofilersimplemodel.h
@@ -31,10 +31,12 @@
 #define QMLPROFILERSIMPLEMODEL_H
 
 #include "qmlprofiler_global.h"
+
+#include <qmldebug/qmlprofilereventlocation.h>
+
 #include <QObject>
 #include <QVector>
 #include <QStringList>
-#include "qmldebug/qmlprofilereventlocation.h"
 
 namespace QmlProfiler {
 
diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp
index 734e00d09f..3f34055248 100644
--- a/src/plugins/qnx/blackberrydeployconfiguration.cpp
+++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp
@@ -35,8 +35,6 @@
 #include "blackberrydeployconfigurationwidget.h"
 #include "blackberrydeployinformation.h"
 
-#include "utils/checkablemessagebox.h"
-
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/projectexplorer.h>
@@ -46,6 +44,7 @@
 #include <qtsupport/qtkitinformation.h>
 #include <coreplugin/icore.h>
 #include <ssh/sshconnection.h>
+#include <utils/checkablemessagebox.h>
 
 #include <QMessageBox>
 
diff --git a/src/plugins/qtsupport/profilereader.h b/src/plugins/qtsupport/profilereader.h
index 3bd8a914b8..d2d5367a16 100644
--- a/src/plugins/qtsupport/profilereader.h
+++ b/src/plugins/qtsupport/profilereader.h
@@ -31,9 +31,9 @@
 #define PROFILEREADER_H
 
 #include "qtsupport_global.h"
-#include "proparser/profileevaluator.h"
 
 #include <coreplugin/messagemanager.h>
+#include <proparser/profileevaluator.h>
 
 #include <QObject>
 #include <QMap>
diff --git a/src/plugins/resourceeditor/qrceditor/test/main.cpp b/src/plugins/resourceeditor/qrceditor/test/main.cpp
index 09706a0305..0e68ad6adb 100644
--- a/src/plugins/resourceeditor/qrceditor/test/main.cpp
+++ b/src/plugins/resourceeditor/qrceditor/test/main.cpp
@@ -27,9 +27,10 @@
 **
 ****************************************************************************/
 
-#include "qrceditor.h"
 #include "mainwindow.h"
 
+#include <resourceeditor/qrceditor/qrceditor.h>
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
diff --git a/src/plugins/resourceeditor/qrceditor/test/mainwindow.cpp b/src/plugins/resourceeditor/qrceditor/test/mainwindow.cpp
index ceb9e25efa..3bec292e92 100644
--- a/src/plugins/resourceeditor/qrceditor/test/mainwindow.cpp
+++ b/src/plugins/resourceeditor/qrceditor/test/mainwindow.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "mainwindow.h"
-#include "qrceditor.h"
+#include <resourceeditor/qrceditor/qrceditor.h>
 
 #include <QAction>
 #include <QDebug>
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index ad9b266046..4e43a2ddd0 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -29,7 +29,7 @@
 
 #include "bookmarkmanager.h"
 
-#include "localhelpmanager.h"
+#include <localhelpmanager.h>
 
 #include <utils/filterlineedit.h>
 #include <utils/styledbar.h>
diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp
index 8df99b3676..768c818af8 100644
--- a/src/shared/help/contentwindow.cpp
+++ b/src/shared/help/contentwindow.cpp
@@ -29,10 +29,10 @@
 
 #include "contentwindow.h"
 
-#include "centralwidget.h"
-#include "helpviewer.h"
-#include "localhelpmanager.h"
-#include "openpagesmanager.h"
+#include <centralwidget.h>
+#include <helpviewer.h>
+#include <localhelpmanager.h>
+#include <openpagesmanager.h>
 
 #include <QLayout>
 #include <QFocusEvent>
diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index bbe713f899..34a6721c77 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -28,13 +28,14 @@
 ****************************************************************************/
 
 #include "indexwindow.h"
-#include "centralwidget.h"
 
-#include "helpviewer.h"
-#include "localhelpmanager.h"
-#include "openpagesmanager.h"
 #include "topicchooser.h"
 
+#include <centralwidget.h>
+#include <helpviewer.h>
+#include <localhelpmanager.h>
+#include <openpagesmanager.h>
+
 #include <utils/filterlineedit.h>
 #include <utils/hostosinfo.h>
 #include <utils/styledbar.h>
diff --git a/src/shared/qtsingleapplication/qtlocalpeer.h b/src/shared/qtsingleapplication/qtlocalpeer.h
index afff3929dc..ba20243057 100644
--- a/src/shared/qtsingleapplication/qtlocalpeer.h
+++ b/src/shared/qtsingleapplication/qtlocalpeer.h
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "qtlockedfile.h"
+#include <qtlockedfile.h>
 
 #include <QLocalServer>
 #include <QLocalSocket>
diff --git a/src/tools/sdktool/operation.cpp b/src/tools/sdktool/operation.cpp
index 26813b82d0..51c7dde895 100644
--- a/src/tools/sdktool/operation.cpp
+++ b/src/tools/sdktool/operation.cpp
@@ -31,7 +31,7 @@
 
 #include "settings.h"
 
-#include "utils/persistentsettings.h"
+#include <utils/persistentsettings.h>
 
 #include <QDir>
 #include <QFile>