From edb48935475afa5753226593b5883a0d4c62d05c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 24 Jan 2011 12:29:48 +0100 Subject: Header cleanup in src, specify module name. --- src/libs/cplusplus/OverviewModel.cpp | 4 +- src/libs/qmleditorwidgets/colorbox.cpp | 4 +- src/libs/qmleditorwidgets/colorbutton.cpp | 2 +- .../contextpanewidgetrectangle.cpp | 2 +- src/libs/qmleditorwidgets/customcolordialog.cpp | 18 ++-- .../easingpane/easingcontextpane.cpp | 8 +- .../easingpane/easingcontextpane.h | 5 +- .../qmleditorwidgets/easingpane/easinggraph.cpp | 103 ++++++++++----------- src/libs/qmleditorwidgets/easingpane/easinggraph.h | 7 +- src/libs/qmleditorwidgets/fontsizespinbox.cpp | 4 +- src/libs/qmleditorwidgets/gradientline.cpp | 4 +- src/libs/qmleditorwidgets/huecontrol.cpp | 4 +- src/libs/qmljs/parser/qmljsengine_p.cpp | 2 +- src/libs/qmljs/parser/qmljsparser.cpp | 12 +-- src/libs/qmljs/qmljsscanner.cpp | 2 +- src/libs/qmljsdebugclient/qpacketprotocol.cpp | 2 +- src/libs/utils/buildablehelperlibrary.cpp | 2 +- src/libs/utils/crumblepath.h | 2 +- src/libs/utils/fileinprojectfinder.cpp | 2 +- src/libs/utils/historycompleter.cpp | 19 ++-- src/libs/utils/qtcprocess.h | 2 +- src/plugins/coreplugin/fancytabwidget.cpp | 2 +- src/plugins/coreplugin/flowlayout.cpp | 4 +- src/plugins/coreplugin/settingsdatabase.cpp | 2 +- src/plugins/cpptools/cppdoxygen.cpp | 3 +- src/plugins/cpptools/cppdoxygen.h | 2 + src/plugins/cpptools/cppmodelmanager.cpp | 6 +- .../debugger/gdb/abstractplaingdbadapter.cpp | 6 +- src/plugins/debugger/lldb/guest/main.cpp | 11 ++- src/plugins/debugger/lldb/ipcengineguest.cpp | 12 ++- src/plugins/debugger/lldb/ipcenginehost.cpp | 10 +- src/plugins/debugger/moduleswindow.h | 2 +- src/plugins/designer/formeditorstack.cpp | 8 +- src/plugins/find/searchresulttreeitemdelegate.cpp | 13 +-- .../genericprojectmanager/genericprojectnodes.cpp | 2 +- .../genericprojectmanager/pkgconfigtool.cpp | 6 +- src/plugins/macros/macro.cpp | 1 + src/plugins/macros/macro.h | 12 +-- src/plugins/macros/macromanager.cpp | 1 + src/plugins/macros/macrooptionswidget.cpp | 1 + src/plugins/macros/macrosettings.h | 1 - src/plugins/macros/texteditormacrohandler.cpp | 8 +- src/plugins/mercurial/commiteditor.cpp | 2 +- .../editorsettingspropertiespage.cpp | 3 +- .../qmljseditor/qmlexpressionundercursor.cpp | 2 +- src/plugins/qmljseditor/qmlexpressionundercursor.h | 2 +- src/plugins/qmljseditor/qmljspreviewrunner.cpp | 2 +- src/plugins/qmljseditor/qmljspreviewrunner.h | 2 +- src/plugins/qmljseditor/qmloutlinemodel.h | 2 +- src/plugins/qmljseditor/qmltaskmanager.cpp | 2 +- src/plugins/qmljseditor/quicktoolbar.cpp | 3 +- src/plugins/qmljseditor/quicktoolbar.h | 10 -- src/plugins/qmljsinspector/qmlinspectortoolbar.cpp | 12 +-- src/plugins/qmljsinspector/qmlinspectortoolbar.h | 4 +- src/plugins/qmljsinspector/qmljsclientproxy.cpp | 6 +- .../qmljsinspector/qmljscontextcrumblepath.cpp | 4 +- .../qmljsinspector/qmljscontextcrumblepath.h | 2 +- .../qmljsinspector/qmljsinspectorsettings.h | 2 +- .../qmljsinspector/qmljslivetextpreview.cpp | 2 +- src/plugins/qmljsinspector/qmljslivetextpreview.h | 4 +- src/plugins/qmljsinspector/qmljsobserverclient.cpp | 2 +- .../qmljsinspector/qmljspropertyinspector.cpp | 6 +- .../qmljsinspector/qmljspropertyinspector.h | 5 +- .../qmljsinspector/qmljstoolbarcolorbox.cpp | 24 ++--- src/plugins/qmljsinspector/qmljstoolbarcolorbox.h | 6 +- src/plugins/qmljstools/qmljsmodelmanager.cpp | 18 ++-- .../fileformat/filefilteritems.cpp | 4 +- .../qmlprojectmanager/fileformat/filefilteritems.h | 15 +-- .../fileformat/qmlprojectitem.cpp | 4 +- .../qmlprojectmanager/fileformat/qmlprojectitem.h | 6 +- src/plugins/qmlprojectmanager/qmlproject.cpp | 6 +- src/plugins/qmlprojectmanager/qmlprojectnodes.cpp | 8 +- src/plugins/qmlprojectmanager/qmlprojectnodes.h | 4 +- .../qmlprojectrunconfigurationwidget.h | 2 +- .../qmlprojectmanager/qmlprojectruncontrol.cpp | 11 ++- src/plugins/qt4projectmanager/addlibrarywizard.cpp | 4 +- src/plugins/qt4projectmanager/d110121_1729.patch | 12 +++ .../qt4projectmanager/debugginghelperbuildtask.cpp | 3 +- .../qt4projectmanager/debugginghelperbuildtask.h | 2 +- .../qt4projectmanager/profilecompletion.cpp | 2 +- src/plugins/qt4projectmanager/qmakeparser.cpp | 3 +- src/plugins/qt4projectmanager/qmldumptool.cpp | 10 +- src/plugins/qt4projectmanager/qmlobservertool.cpp | 8 +- .../qt-s60/certificatepathchooser.cpp | 5 +- .../qt-s60/s60certificatedetailsdialog.cpp | 2 +- .../qt-s60/s60certificatedetailsdialog.h | 2 +- .../qt-s60/s60certificateinfo.cpp | 15 ++- .../qt-s60/s60createpackageparser.cpp | 3 +- .../qt-s60/s60createpackagestep.cpp | 4 +- .../qt-s60/s60createpackagestep.h | 4 +- .../qt-s60/s60symbiancertificate.cpp | 2 + .../qt-s60/s60symbiancertificate.h | 5 +- .../generichighlighter/highlightdefinition.cpp | 2 +- .../highlightdefinitionhandler.cpp | 2 +- .../generichighlighter/specificrules.cpp | 2 +- src/plugins/texteditor/outlinefactory.cpp | 12 ++- src/plugins/texteditor/plaintexteditor.cpp | 2 +- src/plugins/texteditor/plaintexteditorfactory.cpp | 2 +- src/plugins/texteditor/storagesettings.cpp | 4 +- src/plugins/texteditor/texteditoroptionspage.cpp | 2 +- src/plugins/texteditor/textfilewizard.cpp | 2 +- src/plugins/vcsbase/vcsbaseoptionspage.cpp | 2 +- src/shared/cpaster/cgi.cpp | 5 +- src/shared/cpaster/cgi.h | 2 +- src/shared/cpaster/splitter.cpp | 2 +- src/shared/cpaster/splitter.h | 6 +- src/shared/proparser/ioutils.cpp | 4 +- src/shared/proparser/ioutils.h | 2 +- src/shared/proparser/prowriter.h | 2 +- 109 files changed, 329 insertions(+), 322 deletions(-) create mode 100644 src/plugins/qt4projectmanager/d110121_1729.patch (limited to 'src') diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp index ee2c072cc9e..a547c815bb4 100644 --- a/src/libs/cplusplus/OverviewModel.cpp +++ b/src/libs/cplusplus/OverviewModel.cpp @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include using namespace CPlusPlus; diff --git a/src/libs/qmleditorwidgets/colorbox.cpp b/src/libs/qmleditorwidgets/colorbox.cpp index 0188ba90d88..f5f649569c4 100644 --- a/src/libs/qmleditorwidgets/colorbox.cpp +++ b/src/libs/qmleditorwidgets/colorbox.cpp @@ -32,8 +32,8 @@ **************************************************************************/ #include "colorbox.h" -#include -#include +#include +#include static inline QString properName(const QColor &color) { diff --git a/src/libs/qmleditorwidgets/colorbutton.cpp b/src/libs/qmleditorwidgets/colorbutton.cpp index 729373990aa..63716f55abb 100644 --- a/src/libs/qmleditorwidgets/colorbutton.cpp +++ b/src/libs/qmleditorwidgets/colorbutton.cpp @@ -32,7 +32,7 @@ **************************************************************************/ #include "colorbutton.h" -#include +#include static inline QPixmap tilePixMap(int size) { diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp index 21bcc0d0f59..3f19f0a4d36 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/customcolordialog.cpp b/src/libs/qmleditorwidgets/customcolordialog.cpp index c632af1aba8..82f96a83818 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.cpp +++ b/src/libs/qmleditorwidgets/customcolordialog.cpp @@ -32,18 +32,18 @@ **************************************************************************/ #include "customcolordialog.h" - -#include -#include -#include -#include -#include -#include -#include -#include #include "huecontrol.h" #include "colorbox.h" +#include +#include +#include +#include +#include +#include +#include +#include + namespace QmlEditorWidgets { CustomColorDialog::CustomColorDialog(QWidget *parent) : QFrame(parent ) diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp index 5ca2362226f..1be2ec10b11 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp @@ -35,10 +35,10 @@ #include "ui_easingcontextpane.h" #include -#include -#include -#include -#include +#include +#include +#include +#include namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h index 934d85cea38..b81382b82b8 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h @@ -34,13 +34,12 @@ #ifndef EASINGCONTEXTPANE_H #define EASINGCONTEXTPANE_H -#include -#include - #include "easinggraph.h" +#include QT_BEGIN_NAMESPACE +class QVariant; namespace Ui { class EasingContextPane; } diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp index 69b1e6f16f5..c086ab918c0 100644 --- a/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp +++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.cpp @@ -33,69 +33,66 @@ #include "easinggraph.h" -#include -#include +#include +#include #include QT_BEGIN_NAMESPACE -EasingGraph::EasingGraph(QWidget *parent):QWidget(parent) +EasingGraph::EasingGraph(QWidget *parent):QWidget(parent), + m_color(Qt::magenta), m_zeroColor(Qt::gray),m_duration(0), + m_easingExtremes(QLatin1String("In")) { // setFlag(QGraphicsItem::ItemHasNoContents, false); // populate the hash - m_availableNames["Linear"]=QEasingCurve::Linear; - m_availableNames["InQuad"]=QEasingCurve::InQuad; - m_availableNames["OutQuad"]=QEasingCurve::OutQuad; - m_availableNames["InOutQuad"]=QEasingCurve::InOutQuad; - m_availableNames["OutInQuad"]=QEasingCurve::OutInQuad; - m_availableNames["InCubic"]=QEasingCurve::InCubic; - m_availableNames["OutCubic"]=QEasingCurve::OutCubic; - m_availableNames["InOutCubic"]=QEasingCurve::InOutCubic; - m_availableNames["OutInCubic"]=QEasingCurve::OutInCubic; - m_availableNames["InQuart"]=QEasingCurve::InQuart; - m_availableNames["OutQuart"]=QEasingCurve::OutQuart; - m_availableNames["InOutQuart"]=QEasingCurve::InOutQuart; - m_availableNames["OutInQuart"]=QEasingCurve::OutInQuart; - m_availableNames["InQuint"]=QEasingCurve::InQuint; - m_availableNames["OutQuint"]=QEasingCurve::OutQuint; - m_availableNames["InOutQuint"]=QEasingCurve::InOutQuint; - m_availableNames["OutInQuint"]=QEasingCurve::OutInQuint; - m_availableNames["InSine"]=QEasingCurve::InSine; - m_availableNames["OutSine"]=QEasingCurve::OutSine; - m_availableNames["InOutSine"]=QEasingCurve::InOutSine; - m_availableNames["OutInSine"]=QEasingCurve::OutInSine; - m_availableNames["InExpo"]=QEasingCurve::InExpo; - m_availableNames["OutExpo"]=QEasingCurve::OutExpo; - m_availableNames["InOutExpo"]=QEasingCurve::InOutExpo; - m_availableNames["OutInExpo"]=QEasingCurve::OutInExpo; - m_availableNames["InCirc"]=QEasingCurve::InCirc; - m_availableNames["OutCirc"]=QEasingCurve::OutCirc; - m_availableNames["InOutCirc"]=QEasingCurve::InOutCirc; - m_availableNames["OutInCirc"]=QEasingCurve::OutInCirc; - m_availableNames["InElastic"]=QEasingCurve::InElastic; - m_availableNames["OutElastic"]=QEasingCurve::OutElastic; - m_availableNames["InOutElastic"]=QEasingCurve::InOutElastic; - m_availableNames["OutInElastic"]=QEasingCurve::OutInElastic; - m_availableNames["InBack"]=QEasingCurve::InBack; - m_availableNames["OutBack"]=QEasingCurve::OutBack; - m_availableNames["InOutBack"]=QEasingCurve::InOutBack; - m_availableNames["OutInBack"]=QEasingCurve::OutInBack; - m_availableNames["InBounce"]=QEasingCurve::InBounce; - m_availableNames["OutBounce"]=QEasingCurve::OutBounce; - m_availableNames["InOutBounce"]=QEasingCurve::InOutBounce; - m_availableNames["OutInBounce"]=QEasingCurve::OutInBounce; - m_availableNames["InCurve"]=QEasingCurve::InCurve; - m_availableNames["OutCurve"]=QEasingCurve::OutCurve; - m_availableNames["SineCurve"]=QEasingCurve::SineCurve; - m_availableNames["CosineCurve"]=QEasingCurve::CosineCurve; - - m_color = Qt::magenta; - m_zeroColor = Qt::gray; - m_easingExtremes = "In"; + m_availableNames.insert(QLatin1String("Linear"), QEasingCurve::Linear); + m_availableNames.insert(QLatin1String("InQuad"), QEasingCurve::InQuad); + m_availableNames.insert(QLatin1String("OutQuad"), QEasingCurve::OutQuad); + m_availableNames.insert(QLatin1String("InOutQuad"), QEasingCurve::InOutQuad); + m_availableNames.insert(QLatin1String("OutInQuad"), QEasingCurve::OutInQuad); + m_availableNames.insert(QLatin1String("InCubic"), QEasingCurve::InCubic); + m_availableNames.insert(QLatin1String("OutCubic"), QEasingCurve::OutCubic); + m_availableNames.insert(QLatin1String("InOutCubic"), QEasingCurve::InOutCubic); + m_availableNames.insert(QLatin1String("OutInCubic"), QEasingCurve::OutInCubic); + m_availableNames.insert(QLatin1String("InQuart"), QEasingCurve::InQuart); + m_availableNames.insert(QLatin1String("OutQuart"), QEasingCurve::OutQuart); + m_availableNames.insert(QLatin1String("InOutQuart"), QEasingCurve::InOutQuart); + m_availableNames.insert(QLatin1String("OutInQuart"), QEasingCurve::OutInQuart); + m_availableNames.insert(QLatin1String("InQuint"), QEasingCurve::InQuint); + m_availableNames.insert(QLatin1String("OutQuint"), QEasingCurve::OutQuint); + m_availableNames.insert(QLatin1String("InOutQuint"), QEasingCurve::InOutQuint); + m_availableNames.insert(QLatin1String("OutInQuint"), QEasingCurve::OutInQuint); + m_availableNames.insert(QLatin1String("InSine"), QEasingCurve::InSine); + m_availableNames.insert(QLatin1String("OutSine"), QEasingCurve::OutSine); + m_availableNames.insert(QLatin1String("InOutSine"), QEasingCurve::InOutSine); + m_availableNames.insert(QLatin1String("OutInSine"), QEasingCurve::OutInSine); + m_availableNames.insert(QLatin1String("InExpo"), QEasingCurve::InExpo); + m_availableNames.insert(QLatin1String("OutExpo"), QEasingCurve::OutExpo); + m_availableNames.insert(QLatin1String("InOutExpo"), QEasingCurve::InOutExpo); + m_availableNames.insert(QLatin1String("OutInExpo"), QEasingCurve::OutInExpo); + m_availableNames.insert(QLatin1String("InCirc"), QEasingCurve::InCirc); + m_availableNames.insert(QLatin1String("OutCirc"), QEasingCurve::OutCirc); + m_availableNames.insert(QLatin1String("InOutCirc"), QEasingCurve::InOutCirc); + m_availableNames.insert(QLatin1String("OutInCirc"), QEasingCurve::OutInCirc); + m_availableNames.insert(QLatin1String("InElastic"), QEasingCurve::InElastic); + m_availableNames.insert(QLatin1String("OutElastic"), QEasingCurve::OutElastic); + m_availableNames.insert(QLatin1String("InOutElastic"), QEasingCurve::InOutElastic); + m_availableNames.insert(QLatin1String("OutInElastic"), QEasingCurve::OutInElastic); + m_availableNames.insert(QLatin1String("InBack"), QEasingCurve::InBack); + m_availableNames.insert(QLatin1String("OutBack"), QEasingCurve::OutBack); + m_availableNames.insert(QLatin1String("InOutBack"), QEasingCurve::InOutBack); + m_availableNames.insert(QLatin1String("OutInBack"), QEasingCurve::OutInBack); + m_availableNames.insert(QLatin1String("InBounce"), QEasingCurve::InBounce); + m_availableNames.insert(QLatin1String("OutBounce"), QEasingCurve::OutBounce); + m_availableNames.insert(QLatin1String("InOutBounce"), QEasingCurve::InOutBounce); + m_availableNames.insert(QLatin1String("OutInBounce"), QEasingCurve::OutInBounce); + m_availableNames.insert(QLatin1String("InCurve"), QEasingCurve::InCurve); + m_availableNames.insert(QLatin1String("OutCurve"), QEasingCurve::OutCurve); + m_availableNames.insert(QLatin1String("SineCurve"), QEasingCurve::SineCurve); + m_availableNames.insert(QLatin1String("CosineCurve"), QEasingCurve::CosineCurve); } - EasingGraph::~EasingGraph() { } diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.h b/src/libs/qmleditorwidgets/easingpane/easinggraph.h index e04a1f31b64..0a994b05944 100644 --- a/src/libs/qmleditorwidgets/easingpane/easinggraph.h +++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.h @@ -34,10 +34,9 @@ #ifndef EASINGGRAPH_H #define EASINGGRAPH_H -//#include -#include -#include -#include +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/libs/qmleditorwidgets/fontsizespinbox.cpp b/src/libs/qmleditorwidgets/fontsizespinbox.cpp index e39fc97c84d..d41159ab5df 100644 --- a/src/libs/qmleditorwidgets/fontsizespinbox.cpp +++ b/src/libs/qmleditorwidgets/fontsizespinbox.cpp @@ -33,8 +33,8 @@ #include "fontsizespinbox.h" -#include -#include +#include +#include namespace QmlEditorWidgets { diff --git a/src/libs/qmleditorwidgets/gradientline.cpp b/src/libs/qmleditorwidgets/gradientline.cpp index 4718bfc6827..2992ab951b2 100644 --- a/src/libs/qmleditorwidgets/gradientline.cpp +++ b/src/libs/qmleditorwidgets/gradientline.cpp @@ -32,8 +32,8 @@ **************************************************************************/ #include "gradientline.h" -#include -#include +#include +#include static inline QPixmap tilePixMap(int size) { diff --git a/src/libs/qmleditorwidgets/huecontrol.cpp b/src/libs/qmleditorwidgets/huecontrol.cpp index 84ff27091bd..b5f6cbf1eb4 100644 --- a/src/libs/qmleditorwidgets/huecontrol.cpp +++ b/src/libs/qmleditorwidgets/huecontrol.cpp @@ -32,8 +32,8 @@ **************************************************************************/ #include "huecontrol.h" -#include -#include +#include +#include static inline int clamp(int x, int lower, int upper) { diff --git a/src/libs/qmljs/parser/qmljsengine_p.cpp b/src/libs/qmljs/parser/qmljsengine_p.cpp index 5c633145e91..4dd581cd0fb 100644 --- a/src/libs/qmljs/parser/qmljsengine_p.cpp +++ b/src/libs/qmljs/parser/qmljsengine_p.cpp @@ -45,7 +45,7 @@ #include "qmljsnodepool_p.h" #include -#include +#include QT_QML_BEGIN_NAMESPACE diff --git a/src/libs/qmljs/parser/qmljsparser.cpp b/src/libs/qmljs/parser/qmljsparser.cpp index 403c50fc5ca..d93d921248e 100644 --- a/src/libs/qmljs/parser/qmljsparser.cpp +++ b/src/libs/qmljs/parser/qmljsparser.cpp @@ -39,20 +39,18 @@ ** ****************************************************************************/ -#include -#include - -#include +#include "qmljsparser_p.h" #include "qmljsengine_p.h" #include "qmljslexer_p.h" #include "qmljsast_p.h" #include "qmljsnodepool_p.h" +#include +#include +#include - -#include "qmljsparser_p.h" -#include +#include // // This file is automatically generated from qmljs.g. diff --git a/src/libs/qmljs/qmljsscanner.cpp b/src/libs/qmljs/qmljsscanner.cpp index e75c1871adb..a03816e0a15 100644 --- a/src/libs/qmljs/qmljsscanner.cpp +++ b/src/libs/qmljs/qmljsscanner.cpp @@ -33,7 +33,7 @@ #include -#include +#include using namespace QmlJS; diff --git a/src/libs/qmljsdebugclient/qpacketprotocol.cpp b/src/libs/qmljsdebugclient/qpacketprotocol.cpp index b63f4171f06..4cea366548a 100644 --- a/src/libs/qmljsdebugclient/qpacketprotocol.cpp +++ b/src/libs/qmljsdebugclient/qpacketprotocol.cpp @@ -41,7 +41,7 @@ #include "qpacketprotocol_p.h" -#include +#include namespace QmlJsDebugClient { diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index 890a0e12ddf..7f14df30133 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include namespace Utils { diff --git a/src/libs/utils/crumblepath.h b/src/libs/utils/crumblepath.h index 62efb158d02..46b9652e6c2 100644 --- a/src/libs/utils/crumblepath.h +++ b/src/libs/utils/crumblepath.h @@ -37,7 +37,7 @@ #include "utils_global.h" #include -#include +#include QT_FORWARD_DECLARE_CLASS(QResizeEvent) diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp index 08680a9da94..a6936edd30b 100644 --- a/src/libs/utils/fileinprojectfinder.cpp +++ b/src/libs/utils/fileinprojectfinder.cpp @@ -34,7 +34,7 @@ #include "fileinprojectfinder.h" #include -#include +#include namespace Utils { diff --git a/src/libs/utils/historycompleter.cpp b/src/libs/utils/historycompleter.cpp index 16a2619359b..aacf0d889b1 100644 --- a/src/libs/utils/historycompleter.cpp +++ b/src/libs/utils/historycompleter.cpp @@ -32,15 +32,16 @@ **************************************************************************/ #include "historycompleter.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include +#include +#include +#include namespace Utils { diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 44d933f1518..8fdc74c6021 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -34,7 +34,7 @@ #ifndef QTCPROCESS_H #define QTCPROCESS_H -#include +#include #include "utils_global.h" diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index a2a18f67e08..aae34c735b9 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/coreplugin/flowlayout.cpp b/src/plugins/coreplugin/flowlayout.cpp index eef62833d58..e3488f75c2e 100644 --- a/src/plugins/coreplugin/flowlayout.cpp +++ b/src/plugins/coreplugin/flowlayout.cpp @@ -33,8 +33,8 @@ #include "flowlayout.h" -#include -#include +#include +#include using namespace Core::Internal; diff --git a/src/plugins/coreplugin/settingsdatabase.cpp b/src/plugins/coreplugin/settingsdatabase.cpp index e75b60cc4d7..429c7b659d7 100644 --- a/src/plugins/coreplugin/settingsdatabase.cpp +++ b/src/plugins/coreplugin/settingsdatabase.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include /*! \class Core::SettingsDatabase diff --git a/src/plugins/cpptools/cppdoxygen.cpp b/src/plugins/cpptools/cppdoxygen.cpp index e38f6a4b4f1..9f61f01c70f 100644 --- a/src/plugins/cpptools/cppdoxygen.cpp +++ b/src/plugins/cpptools/cppdoxygen.cpp @@ -31,9 +31,10 @@ ** **************************************************************************/ -#include #include "cppdoxygen.h" +#include + using namespace CppTools; /* diff --git a/src/plugins/cpptools/cppdoxygen.h b/src/plugins/cpptools/cppdoxygen.h index d91471f63ff..7f968357d97 100644 --- a/src/plugins/cpptools/cppdoxygen.h +++ b/src/plugins/cpptools/cppdoxygen.h @@ -33,6 +33,8 @@ #include "cpptools_global.h" +QT_FORWARD_DECLARE_CLASS(QChar) + namespace CppTools { enum DoxygenReservedWord { diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index ac57069bdcd..48a47335691 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -43,9 +43,9 @@ #endif #include -#include +#include #ifndef ICHECK_BUILD -# include +# include # include # include # include @@ -59,7 +59,7 @@ # include # include #else -# include +# include #endif #include diff --git a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp index 6b1575819ba..62530a3908b 100644 --- a/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp +++ b/src/plugins/debugger/gdb/abstractplaingdbadapter.cpp @@ -39,9 +39,9 @@ #include "debuggercore.h" #include "debuggerstringutils.h" -#include -#include -#include +#include +#include +#include #include diff --git a/src/plugins/debugger/lldb/guest/main.cpp b/src/plugins/debugger/lldb/guest/main.cpp index 084ed016fa7..317d00d0a9b 100644 --- a/src/plugins/debugger/lldb/guest/main.cpp +++ b/src/plugins/debugger/lldb/guest/main.cpp @@ -1,10 +1,11 @@ -#include -#include #include "lldbengineguest.h" -#include -#include -#include +#include +#include +#include +#include + +#include // #define DO_STDIO_DEBUG 1 #ifdef DO_STDIO_DEBUG diff --git a/src/plugins/debugger/lldb/ipcengineguest.cpp b/src/plugins/debugger/lldb/ipcengineguest.cpp index 071619150a6..4586a60fc92 100644 --- a/src/plugins/debugger/lldb/ipcengineguest.cpp +++ b/src/plugins/debugger/lldb/ipcengineguest.cpp @@ -38,12 +38,14 @@ #include "threaddata.h" #include "debuggerstreamops.h" -#include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN #define SET_NATIVE_BYTE_ORDER(x) x.setByteOrder(QDataStream::LittleEndian) diff --git a/src/plugins/debugger/lldb/ipcenginehost.cpp b/src/plugins/debugger/lldb/ipcenginehost.cpp index fe5966ac0fa..0667c590b2d 100644 --- a/src/plugins/debugger/lldb/ipcenginehost.cpp +++ b/src/plugins/debugger/lldb/ipcenginehost.cpp @@ -51,11 +51,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN #define SET_NATIVE_BYTE_ORDER(x) x.setByteOrder(QDataStream::LittleEndian) diff --git a/src/plugins/debugger/moduleswindow.h b/src/plugins/debugger/moduleswindow.h index e49f1773d79..9fa1284caf0 100644 --- a/src/plugins/debugger/moduleswindow.h +++ b/src/plugins/debugger/moduleswindow.h @@ -34,7 +34,7 @@ #ifndef DEBUGGER_MODULESWINDOW_H #define DEBUGGER_MODULESWINDOW_H -#include +#include namespace Debugger { namespace Internal { diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp index 7242c46d6ea..98c44d03650 100644 --- a/src/plugins/designer/formeditorstack.cpp +++ b/src/plugins/designer/formeditorstack.cpp @@ -44,10 +44,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/plugins/find/searchresulttreeitemdelegate.cpp b/src/plugins/find/searchresulttreeitemdelegate.cpp index 99af6e3d31f..4b0a328b3d5 100644 --- a/src/plugins/find/searchresulttreeitemdelegate.cpp +++ b/src/plugins/find/searchresulttreeitemdelegate.cpp @@ -34,12 +34,13 @@ #include "searchresulttreeitemdelegate.h" #include "searchresulttreeitemroles.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include #include diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp index 022df7b7e11..56504d56ec6 100644 --- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp +++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include using namespace GenericProjectManager; using namespace GenericProjectManager::Internal; diff --git a/src/plugins/genericprojectmanager/pkgconfigtool.cpp b/src/plugins/genericprojectmanager/pkgconfigtool.cpp index ae768d4913a..883dccd114b 100644 --- a/src/plugins/genericprojectmanager/pkgconfigtool.cpp +++ b/src/plugins/genericprojectmanager/pkgconfigtool.cpp @@ -33,9 +33,9 @@ #include "pkgconfigtool.h" -#include -#include -#include +#include +#include +#include using namespace GenericProjectManager::Internal; diff --git a/src/plugins/macros/macro.cpp b/src/plugins/macros/macro.cpp index 622d6580ce4..e3423439974 100644 --- a/src/plugins/macros/macro.cpp +++ b/src/plugins/macros/macro.cpp @@ -32,6 +32,7 @@ **************************************************************************/ #include "macro.h" +#include "macroevent.h" #include diff --git a/src/plugins/macros/macro.h b/src/plugins/macros/macro.h index 8e85a97b530..0cfe425cda9 100644 --- a/src/plugins/macros/macro.h +++ b/src/plugins/macros/macro.h @@ -34,21 +34,15 @@ #ifndef MACROSPLUGIN_MACRO_H #define MACROSPLUGIN_MACRO_H -#include - -#include -#include -#include - -#include "macroevent.h" #include "macros_global.h" -#include "macroevent.h" #include #include namespace Macros { +class MacroEvent; + class MACROS_EXPORT Macro { public: @@ -57,7 +51,7 @@ public: ~Macro(); Macro& operator=(const Macro& other); - void load(QString fileName = QString::null); + void load(QString fileName = QString()); void loadHeader(const QString &fileName); void save(const QString &fileName); diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 147220e5db9..ae2ca7597d3 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -34,6 +34,7 @@ #include "macromanager.h" #include "macrosconstants.h" +#include "macroevent.h" #include "macro.h" #include "macrosettings.h" #include "imacrohandler.h" diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp index 3f08cbf1569..e2c2db854a5 100644 --- a/src/plugins/macros/macrooptionswidget.cpp +++ b/src/plugins/macros/macrooptionswidget.cpp @@ -47,6 +47,7 @@ #include #include +#include #include #include #include diff --git a/src/plugins/macros/macrosettings.h b/src/plugins/macros/macrosettings.h index 43c7a2b60c2..e72b4c69407 100644 --- a/src/plugins/macros/macrosettings.h +++ b/src/plugins/macros/macrosettings.h @@ -34,7 +34,6 @@ #ifndef MACROSPLUGIN_MACROSETTINGS_H #define MACROSPLUGIN_MACROSETTINGS_H -#include #include #include #include diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp index a2633f541d4..ad8d4ace826 100644 --- a/src/plugins/macros/texteditormacrohandler.cpp +++ b/src/plugins/macros/texteditormacrohandler.cpp @@ -45,10 +45,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace Macros; using namespace Macros::Internal; diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp index 1fed5543b4d..be7627e9fb7 100644 --- a/src/plugins/mercurial/commiteditor.cpp +++ b/src/plugins/mercurial/commiteditor.cpp @@ -38,7 +38,7 @@ #include -#include //TODO REMOVE WHEN BASE FILE CHANGES ARE PULLED +#include //TODO REMOVE WHEN BASE FILE CHANGES ARE PULLED using namespace Mercurial::Internal; diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp index 3fdffa3064f..f98bd8f7b0b 100644 --- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp @@ -36,8 +36,7 @@ #include "project.h" #include - -#include +#include using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; diff --git a/src/plugins/qmljseditor/qmlexpressionundercursor.cpp b/src/plugins/qmljseditor/qmlexpressionundercursor.cpp index 9ef27162ed6..0d7a04ba736 100644 --- a/src/plugins/qmljseditor/qmlexpressionundercursor.cpp +++ b/src/plugins/qmljseditor/qmlexpressionundercursor.cpp @@ -38,7 +38,7 @@ #include -#include +#include using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmljseditor/qmlexpressionundercursor.h b/src/plugins/qmljseditor/qmlexpressionundercursor.h index f7797b22d3a..65e91530320 100644 --- a/src/plugins/qmljseditor/qmlexpressionundercursor.h +++ b/src/plugins/qmljseditor/qmlexpressionundercursor.h @@ -37,7 +37,7 @@ #include #include -#include +#include namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.cpp b/src/plugins/qmljseditor/qmljspreviewrunner.cpp index 4445b6c5fb0..2e99f3ef7ce 100644 --- a/src/plugins/qmljseditor/qmljspreviewrunner.cpp +++ b/src/plugins/qmljseditor/qmljspreviewrunner.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.h b/src/plugins/qmljseditor/qmljspreviewrunner.h index 2a97018f07c..abc738d27e7 100644 --- a/src/plugins/qmljseditor/qmljspreviewrunner.h +++ b/src/plugins/qmljseditor/qmljspreviewrunner.h @@ -34,7 +34,7 @@ #ifndef QMLJSPREVIEWRUNNER_H #define QMLJSPREVIEWRUNNER_H -#include +#include #include diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h index 88273adc1cb..75eeedea631 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.h +++ b/src/plugins/qmljseditor/qmloutlinemodel.h @@ -7,7 +7,7 @@ #include #include -#include +#include namespace QmlJS { namespace Interpreter { diff --git a/src/plugins/qmljseditor/qmltaskmanager.cpp b/src/plugins/qmljseditor/qmltaskmanager.cpp index da60ca8831b..04f087a0741 100644 --- a/src/plugins/qmljseditor/qmltaskmanager.cpp +++ b/src/plugins/qmljseditor/qmltaskmanager.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include namespace QmlJSEditor { namespace Internal { diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index b53344a75ce..0f38baf8f92 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -17,7 +17,8 @@ #include #include #include -#include + +#include using namespace QmlJS; using namespace AST; diff --git a/src/plugins/qmljseditor/quicktoolbar.h b/src/plugins/qmljseditor/quicktoolbar.h index 7d8750359b8..31a938a2d58 100644 --- a/src/plugins/qmljseditor/quicktoolbar.h +++ b/src/plugins/qmljseditor/quicktoolbar.h @@ -1,16 +1,6 @@ #ifndef QUICKTOOLBAR_H #define QUICKTOOLBAR_H -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include namespace TextEditor { diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp index 9006f0f09e1..6d684a270e9 100644 --- a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp +++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp @@ -44,12 +44,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.h b/src/plugins/qmljsinspector/qmlinspectortoolbar.h index 6cc78e9b272..6575886fa5b 100644 --- a/src/plugins/qmljsinspector/qmlinspectortoolbar.h +++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.h @@ -34,8 +34,8 @@ #ifndef QMLINSPECTORTOOLBAR_H #define QMLINSPECTORTOOLBAR_H -#include -#include +#include +#include QT_FORWARD_DECLARE_CLASS(QAction) QT_FORWARD_DECLARE_CLASS(QColor) diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp index 29c5b07817f..4cc1c4e608d 100644 --- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp +++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp @@ -44,9 +44,9 @@ #include #include -#include -#include -#include +#include +#include +#include enum { debug = false diff --git a/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp b/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp index 8ea623cb3a1..6ebefda8820 100644 --- a/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp +++ b/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp @@ -32,8 +32,8 @@ **************************************************************************/ #include "qmljscontextcrumblepath.h" -#include -#include +#include +#include namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljscontextcrumblepath.h b/src/plugins/qmljsinspector/qmljscontextcrumblepath.h index 2349cb4f97b..dee2bb2347c 100644 --- a/src/plugins/qmljsinspector/qmljscontextcrumblepath.h +++ b/src/plugins/qmljsinspector/qmljscontextcrumblepath.h @@ -34,7 +34,7 @@ #define QMLJSCONTEXTCRUMBLEPATH_H #include -#include +#include namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljsinspectorsettings.h b/src/plugins/qmljsinspector/qmljsinspectorsettings.h index 9dfb35b71a8..e97a477adcf 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorsettings.h +++ b/src/plugins/qmljsinspector/qmljsinspectorsettings.h @@ -34,7 +34,7 @@ #ifndef INSPECTORSETTINGS_H #define INSPECTORSETTINGS_H -#include +#include QT_FORWARD_DECLARE_CLASS(QSettings) diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp index 70493b56df2..bc37ebcba99 100644 --- a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp +++ b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp @@ -54,7 +54,7 @@ #include -#include +#include using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.h b/src/plugins/qmljsinspector/qmljslivetextpreview.h index e2f84cc54fe..cedecd617b3 100644 --- a/src/plugins/qmljsinspector/qmljslivetextpreview.h +++ b/src/plugins/qmljsinspector/qmljslivetextpreview.h @@ -34,8 +34,8 @@ #ifndef SCRIPTBINDINGREWRITER_H #define SCRIPTBINDINGREWRITER_H -#include -#include +#include +#include #include #include diff --git a/src/plugins/qmljsinspector/qmljsobserverclient.cpp b/src/plugins/qmljsinspector/qmljsobserverclient.cpp index fe02447b06f..58636ad5186 100644 --- a/src/plugins/qmljsinspector/qmljsobserverclient.cpp +++ b/src/plugins/qmljsinspector/qmljsobserverclient.cpp @@ -43,7 +43,7 @@ #include "qmljsclientproxy.h" #include "qmljsinspectorconstants.h" -#include +#include namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljspropertyinspector.cpp b/src/plugins/qmljsinspector/qmljspropertyinspector.cpp index 920daf40efd..68379cf39a9 100644 --- a/src/plugins/qmljsinspector/qmljspropertyinspector.cpp +++ b/src/plugins/qmljsinspector/qmljspropertyinspector.cpp @@ -34,9 +34,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljspropertyinspector.h b/src/plugins/qmljsinspector/qmljspropertyinspector.h index 34bcde580b6..1f245011bb6 100644 --- a/src/plugins/qmljsinspector/qmljspropertyinspector.h +++ b/src/plugins/qmljsinspector/qmljspropertyinspector.h @@ -35,9 +35,8 @@ #include #include -#include -#include - +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp index bab11470ce6..6c152185e4f 100644 --- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp +++ b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp @@ -32,18 +32,18 @@ **************************************************************************/ #include "qmljstoolbarcolorbox.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include namespace QmlJSInspector { diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h index f90f06656a6..ac4d209ac20 100644 --- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h +++ b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h @@ -33,9 +33,9 @@ #ifndef TOOLBARCOLORBOX_H #define TOOLBARCOLORBOX_H -#include -#include -#include +#include +#include +#include QT_FORWARD_DECLARE_CLASS(QContextMenuEvent) QT_FORWARD_DECLARE_CLASS(QAction) diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index e8a3e8845f4..f8a0ba251ae 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -52,17 +52,17 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include -#include +#include using namespace QmlJS; using namespace QmlJSTools; diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp index f5e9c78afd4..f7f96593253 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp @@ -1,5 +1,7 @@ #include "filefilteritems.h" -#include + +#include +#include #include namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h index ac007d1f380..7ea75e43c11 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h @@ -1,16 +1,17 @@ #ifndef FILEFILTERITEMS_H #define FILEFILTERITEMS_H -#include -#include -#include -#include -#include -#include - #include "qmlprojectitem.h" #include "filesystemwatcher.h" +#include +#include +#include + +#include + +QT_FORWARD_DECLARE_CLASS(QDir) + namespace QmlProjectManager { class FileFilterBaseItem : public QmlProjectContentItem { diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp index a0a7b275bb9..581b00400a3 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp @@ -1,6 +1,8 @@ #include "qmlprojectitem.h" #include "filefilteritems.h" -#include + +#include +#include namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h index 5b921697923..5c7648cd3e0 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h @@ -1,9 +1,9 @@ #ifndef QMLPROJECTITEM_H #define QMLPROJECTITEM_H -#include -#include -#include +#include +#include +#include namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index a104b026196..c2b9a4d62cb 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -46,9 +46,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace QmlProjectManager { diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp index 7eb79d5cd05..2ab2548cc2d 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp @@ -39,10 +39,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace QmlProjectManager { namespace Internal { diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.h b/src/plugins/qmlprojectmanager/qmlprojectnodes.h index b371e0683e0..32e306a88a7 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.h +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.h @@ -36,8 +36,8 @@ #include -#include -#include +#include +#include namespace Core { class IFile; diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h index 18a401139eb..d57620e002e 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h @@ -34,7 +34,7 @@ #ifndef QMLPROJECTRUNCONFIGURATIONWIDGET_H #define QMLPROJECTRUNCONFIGURATIONWIDGET_H -#include +#include QT_FORWARD_DECLARE_CLASS(QComboBox) QT_FORWARD_DECLARE_CLASS(QStandardItemModel) diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp index 97e5282ee4f..7681f2c03f5 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp @@ -53,11 +53,12 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include using namespace ProjectExplorer; diff --git a/src/plugins/qt4projectmanager/addlibrarywizard.cpp b/src/plugins/qt4projectmanager/addlibrarywizard.cpp index 9f60e2aafd5..26443107501 100644 --- a/src/plugins/qt4projectmanager/addlibrarywizard.cpp +++ b/src/plugins/qt4projectmanager/addlibrarywizard.cpp @@ -5,9 +5,9 @@ #include #include #include -#include -#include +#include +#include using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/d110121_1729.patch b/src/plugins/qt4projectmanager/d110121_1729.patch new file mode 100644 index 00000000000..7b24af9d36b --- /dev/null +++ b/src/plugins/qt4projectmanager/d110121_1729.patch @@ -0,0 +1,12 @@ +diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro +index 317544c..f9ba1d1 100644 +--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro ++++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro +@@ -144,7 +144,6 @@ FORMS += makestep.ui \ + wizards/mobileappwizardmaemooptionspage.ui \ + librarydetailswidget.ui \ + qtversioninfo.ui \ +- debugginghelper.ui \ + debugginghelper.ui + RESOURCES += qt4projectmanager.qrc \ + wizards/wizards.qrc diff --git a/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp b/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp index 41cfe1ca170..af169bd97d3 100644 --- a/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp +++ b/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp @@ -35,7 +35,8 @@ #include "qmldumptool.h" #include "qmlobservertool.h" #include -#include + +#include using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/debugginghelperbuildtask.h b/src/plugins/qt4projectmanager/debugginghelperbuildtask.h index 2210a7b96aa..87fb59a69e0 100644 --- a/src/plugins/qt4projectmanager/debugginghelperbuildtask.h +++ b/src/plugins/qt4projectmanager/debugginghelperbuildtask.h @@ -36,7 +36,7 @@ #include "qtversionmanager.h" #include -#include +#include namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/profilecompletion.cpp b/src/plugins/qt4projectmanager/profilecompletion.cpp index 9d3f706d8a3..9cf593a9fbb 100644 --- a/src/plugins/qt4projectmanager/profilecompletion.cpp +++ b/src/plugins/qt4projectmanager/profilecompletion.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qmakeparser.cpp b/src/plugins/qt4projectmanager/qmakeparser.cpp index cdbf5e1bfe7..107d7baaf6c 100644 --- a/src/plugins/qt4projectmanager/qmakeparser.cpp +++ b/src/plugins/qt4projectmanager/qmakeparser.cpp @@ -37,7 +37,8 @@ #include #include #include -#include + +#include using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qmldumptool.cpp b/src/plugins/qt4projectmanager/qmldumptool.cpp index f1f87ad5e26..9c2fc0d7b53 100644 --- a/src/plugins/qt4projectmanager/qmldumptool.cpp +++ b/src/plugins/qt4projectmanager/qmldumptool.cpp @@ -45,11 +45,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace { diff --git a/src/plugins/qt4projectmanager/qmlobservertool.cpp b/src/plugins/qt4projectmanager/qmlobservertool.cpp index 6f1ce1a1968..c15df93c3cf 100644 --- a/src/plugins/qt4projectmanager/qmlobservertool.cpp +++ b/src/plugins/qt4projectmanager/qmlobservertool.cpp @@ -39,10 +39,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace Qt4ProjectManager { diff --git a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp index e06362d6cd6..3ecbec17209 100644 --- a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.cpp @@ -32,11 +32,10 @@ **************************************************************************/ #include "certificatepathchooser.h" - -#include - #include "s60certificateinfo.h" +#include + using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp index 96280deea87..88230fa8f57 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.cpp @@ -39,7 +39,7 @@ using namespace Qt4ProjectManager::Internal; struct S60CertificateDetailsDialogPrivate { - S60CertificateDetailsDialogPrivate(){}; + S60CertificateDetailsDialogPrivate(){} Ui::S60CertificateDetailsDialog m_ui; }; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h index f9d68860a9b..5806a73ead5 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificatedetailsdialog.h @@ -34,7 +34,7 @@ #ifndef S60CERTIFICATEDETAILSDIALOG_H #define S60CERTIFICATEDETAILSDIALOG_H -#include +#include struct S60CertificateDetailsDialogPrivate; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp index 204d5ae39e6..ce769fa0898 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60certificateinfo.cpp @@ -32,16 +32,15 @@ **************************************************************************/ #include "s60certificateinfo.h" - -#include -#include -#include -#include -#include -#include - #include "s60symbiancertificate.h" +#include +#include +#include +#include +#include +#include + using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp index 71c08182e27..e2b9dffd895 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp @@ -36,8 +36,7 @@ #include #include - -#include +#include using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp index f31fe46e94d..7017e670b48 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp @@ -60,8 +60,8 @@ #include #include -#include -#include +#include +#include using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h index 0430fc62b54..41e8ec38862 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.h @@ -39,8 +39,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp index 79e5d1f6798..26f0e23f47a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp @@ -51,6 +51,8 @@ #include #include +#include + using namespace Botan; using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h index e7148aa352c..38e200bf4a4 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.h @@ -34,8 +34,9 @@ #ifndef S60SYMBIANCERTIFICATE_H #define S60SYMBIANCERTIFICATE_H -#include -#include +#include + +QT_FORWARD_DECLARE_CLASS(QDateTime) class S60SymbianCertificatePrivate; diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp index e0adb7c201d..9fe7bee819f 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp @@ -38,7 +38,7 @@ #include "itemdata.h" #include "reuse.h" -#include +#include using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp index 48bb01a355d..522eab16c30 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp @@ -41,7 +41,7 @@ #include "manager.h" #include "highlighterexception.h" -#include +#include using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/specificrules.cpp b/src/plugins/texteditor/generichighlighter/specificrules.cpp index 4dab1e33c41..255bf02cad3 100644 --- a/src/plugins/texteditor/generichighlighter/specificrules.cpp +++ b/src/plugins/texteditor/generichighlighter/specificrules.cpp @@ -37,7 +37,7 @@ #include "progressdata.h" #include "reuse.h" -#include +#include using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp index 5f3add6a231..c596ea572c0 100644 --- a/src/plugins/texteditor/outlinefactory.cpp +++ b/src/plugins/texteditor/outlinefactory.cpp @@ -3,11 +3,13 @@ #include #include #include -#include -#include -#include -#include -#include + +#include +#include +#include +#include + +#include namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp index 8725d922435..e20de6b1ea9 100644 --- a/src/plugins/texteditor/plaintexteditor.cpp +++ b/src/plugins/texteditor/plaintexteditor.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp index 2aeb89e0bf4..496d99bdfae 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.cpp +++ b/src/plugins/texteditor/plaintexteditorfactory.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/storagesettings.cpp b/src/plugins/texteditor/storagesettings.cpp index e7ff0d636e3..841ab8bf64b 100644 --- a/src/plugins/texteditor/storagesettings.cpp +++ b/src/plugins/texteditor/storagesettings.cpp @@ -33,8 +33,8 @@ #include "storagesettings.h" -#include -#include +#include +#include namespace TextEditor { diff --git a/src/plugins/texteditor/texteditoroptionspage.cpp b/src/plugins/texteditor/texteditoroptionspage.cpp index e12c79e3d50..d7867d2f640 100644 --- a/src/plugins/texteditor/texteditoroptionspage.cpp +++ b/src/plugins/texteditor/texteditoroptionspage.cpp @@ -35,7 +35,7 @@ #include "texteditorconstants.h" -#include +#include using namespace TextEditor; diff --git a/src/plugins/texteditor/textfilewizard.cpp b/src/plugins/texteditor/textfilewizard.cpp index 4459af854da..afd6f6b09c6 100644 --- a/src/plugins/texteditor/textfilewizard.cpp +++ b/src/plugins/texteditor/textfilewizard.cpp @@ -34,7 +34,7 @@ #include "textfilewizard.h" #include "basetexteditor.h" #include "texteditorconstants.h" -#include +#include using namespace TextEditor; diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.cpp b/src/plugins/vcsbase/vcsbaseoptionspage.cpp index 9fba98d867a..416930ae5a9 100644 --- a/src/plugins/vcsbase/vcsbaseoptionspage.cpp +++ b/src/plugins/vcsbase/vcsbaseoptionspage.cpp @@ -35,7 +35,7 @@ #include "vcsbaseconstants.h" -#include +#include namespace VCSBase { diff --git a/src/shared/cpaster/cgi.cpp b/src/shared/cpaster/cgi.cpp index f79ba3943f7..acc1e04682f 100644 --- a/src/shared/cpaster/cgi.cpp +++ b/src/shared/cpaster/cgi.cpp @@ -33,10 +33,9 @@ #include "cgi.h" -#include +#include - -const char *cgi_chars = "0123456789abcdef"; // RFC 1738 suggests lower-case to be optimal +const char cgi_chars[] = "0123456789abcdef"; // RFC 1738 suggests lower-case to be optimal QString CGI::encodeURL(const QString &rawText) { diff --git a/src/shared/cpaster/cgi.h b/src/shared/cpaster/cgi.h index 2034470de76..5c9bf5edfe3 100644 --- a/src/shared/cpaster/cgi.h +++ b/src/shared/cpaster/cgi.h @@ -34,7 +34,7 @@ #ifndef CGI_H #define CGI_H -#include +#include class CGI { diff --git a/src/shared/cpaster/splitter.cpp b/src/shared/cpaster/splitter.cpp index 711248d3dfb..cb04c38acb9 100644 --- a/src/shared/cpaster/splitter.cpp +++ b/src/shared/cpaster/splitter.cpp @@ -33,7 +33,7 @@ #include "splitter.h" -#include +#include FileDataList splitDiffToFiles(const QByteArray &data) { diff --git a/src/shared/cpaster/splitter.h b/src/shared/cpaster/splitter.h index bb456eb34d6..2d195e5f93b 100644 --- a/src/shared/cpaster/splitter.h +++ b/src/shared/cpaster/splitter.h @@ -34,9 +34,9 @@ #ifndef SPLITTER_H #define SPLITTER_H -#include -#include -#include +#include +#include +#include struct FileData { diff --git a/src/shared/proparser/ioutils.cpp b/src/shared/proparser/ioutils.cpp index bdab06844e2..e523669854e 100644 --- a/src/shared/proparser/ioutils.cpp +++ b/src/shared/proparser/ioutils.cpp @@ -33,8 +33,8 @@ #include "ioutils.h" -#include -#include +#include +#include #ifdef Q_OS_WIN # include diff --git a/src/shared/proparser/ioutils.h b/src/shared/proparser/ioutils.h index 5ef2569761a..0c6b9e1dddb 100644 --- a/src/shared/proparser/ioutils.h +++ b/src/shared/proparser/ioutils.h @@ -34,7 +34,7 @@ #ifndef IOUTILS_H #define IOUTILS_H -#include +#include namespace ProFileEvaluatorInternal { diff --git a/src/shared/proparser/prowriter.h b/src/shared/proparser/prowriter.h index b4615e1a063..5aacf6a16c4 100644 --- a/src/shared/proparser/prowriter.h +++ b/src/shared/proparser/prowriter.h @@ -36,7 +36,7 @@ #include "namespace_global.h" -#include +#include QT_BEGIN_NAMESPACE class QDir; -- cgit v1.2.3