feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Removed module names from #include directives.

Browse Source 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Erik Verbruggen
2012-02-15 10:42:41 +01:00
parent 9a9ba12028
commit 3fa55b7ab9
2353 changed files with 7872 additions and 7873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/api/examples/exampleplugin/example_global.h
View File

@@ -1,7 +1,7 @@
#ifndef EXAMPLE_GLOBAL_H #ifndef EXAMPLE_GLOBAL_H
#define EXAMPLE_GLOBAL_H #define EXAMPLE_GLOBAL_H
#include <QtCore/QtGlobal> #include <QtGlobal>
#if defined(EXAMPLE_LIBRARY) #if defined(EXAMPLE_LIBRARY)
# define EXAMPLESHARED_EXPORT Q_DECL_EXPORT # define EXAMPLESHARED_EXPORT Q_DECL_EXPORT

10
doc/api/examples/exampleplugin/exampleplugin.cpp
View File

@@ -8,12 +8,12 @@
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <QtGui/QAction> #include <QAction>
#include <QtGui/QMessageBox> #include <QMessageBox>
#include <QtGui/QMainWindow> #include <QMainWindow>
#include <QtGui/QMenu> #include <QMenu>
#include <QtCore/QtPlugin> #include <QtPlugin>
using namespace Example::Internal; using namespace Example::Internal;

10
doc/api/examples/webpagewizard/webpagewizard.cpp
View File

@@ -4,12 +4,12 @@
#include <utils/filewizarddialog.h> #include <utils/filewizarddialog.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QtCore/QXmlStreamWriter> #include <QXmlStreamWriter>
#include <QtGui/QGridLayout> #include <QGridLayout>
#include <QtGui/QLabel> #include <QLabel>
#include <QtGui/QLineEdit> #include <QLineEdit>
#include <QtGui/QPlainTextEdit> #include <QPlainTextEdit>
namespace MyPlugin { namespace MyPlugin {
namespace Internal { namespace Internal {

2
doc/api/examples/webpagewizard/webpagewizard.h
View File

@@ -6,7 +6,7 @@
#include "basefilewizard.h" #include "basefilewizard.h"
#include "utils/filewizarddialog.h" #include "utils/filewizarddialog.h"
#include <QtGui/QWizardPage> #include <QWizardPage>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QLineEdit; class QLineEdit;

2
doc/examples/batterystatus/main.cpp
View File

@@ -36,7 +36,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui/QApplication> #include <QApplication>
#include "qmlapplicationviewer.h" #include "qmlapplicationviewer.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])

2
doc/examples/textfinder/main.cpp
View File

@@ -38,7 +38,7 @@
#include "textfinder.h" #include "textfinder.h"
#include <QtGui/QApplication> #include <QApplication>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

6
doc/examples/textfinder/textfinder.cpp
View File

@@ -39,10 +39,10 @@
#include "textfinder.h" #include "textfinder.h"
//! [1] //! [1]
#include <QtCore/QFile> #include <QFile>
#include <QtCore/QTextStream> #include <QTextStream>
//! [1] //! [1]
#include <QtGui/QMessageBox> #include <QMessageBox>
//! [3] //! [3]
TextFinder::TextFinder(QWidget *parent) TextFinder::TextFinder(QWidget *parent)

2
doc/examples/textfinder/textfinder.h
View File

@@ -41,7 +41,7 @@
#include "ui_textfinder.h" #include "ui_textfinder.h"
#include <QtGui/QWidget> #include <QWidget>
namespace Ui namespace Ui
{ {

2
doc/examples/transitions/main.cpp
View File

@@ -1,4 +1,4 @@
#include <QtGui/QApplication> #include <QApplication>
#include "qmlapplicationviewer.h" #include "qmlapplicationviewer.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])

2
share/qtcreator/dumper/dumper.cpp
View File

@@ -30,7 +30,7 @@
** **
**************************************************************************/ **************************************************************************/
#include <QtCore/qglobal.h> #include <qglobal.h>
#if USE_QT_CORE #if USE_QT_CORE
#include <QDateTime> #include <QDateTime>

4
share/qtcreator/dumper/dumper_p.h
View File

@@ -33,8 +33,8 @@
#ifndef GDBMACROS_P_H #ifndef GDBMACROS_P_H
#define GDBMACROS_P_H #define GDBMACROS_P_H
#include <QtCore/QObject> #include <QObject>
#include <QtCore/QPointer> #include <QPointer>
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED

20
share/qtcreator/dumper/test/main.cpp
View File

@@ -30,16 +30,16 @@
** **
**************************************************************************/ **************************************************************************/
#include <QtCore/QStringList> #include <QStringList>
#include <QtCore/QLinkedList> #include <QLinkedList>
#include <QtCore/QVector> #include <QVector>
#include <QtCore/QSharedPointer> #include <QSharedPointer>
#include <QtCore/QTimer> #include <QTimer>
#include <QtCore/QMap> #include <QMap>
#include <QtCore/QSet> #include <QSet>
#include <QtCore/QVariant> #include <QVariant>
#include <QtCore/QFileInfo> #include <QFileInfo>
#include <QtCore/QCoreApplication> #include <QCoreApplication>
#include <QAction> #include <QAction>
#include <string> #include <string>

24
share/qtcreator/qml/qmldump/main.cpp
View File

@@ -33,26 +33,26 @@
// WARNING: This code is shared with the qmlplugindump tool code in Qt. // WARNING: This code is shared with the qmlplugindump tool code in Qt.
// Modifications to this file need to be applied there. // Modifications to this file need to be applied there.
#include <QtDeclarative/QtDeclarative> #include <QtDeclarative>
#include <QtDeclarative/private/qdeclarativemetatype_p.h> #include <private/qdeclarativemetatype_p.h>
#include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h> #include <private/qdeclarativeopenmetaobject_p.h>
#include <QtDeclarative/QDeclarativeView> #include <QDeclarativeView>
#include <QtGui/QApplication> #include <QApplication>
#include <QtCore/QSet> #include <QSet>
#include <QtCore/QMetaObject> #include <QMetaObject>
#include <QtCore/QMetaProperty> #include <QMetaProperty>
#include <QtCore/QDebug> #include <QDebug>
#include <QtCore/private/qobject_p.h> #include <private/qobject_p.h>
#include <QtCore/private/qmetaobject_p.h> #include <private/qmetaobject_p.h>
#include <iostream> #include <iostream>
#include "qmlstreamwriter.h" #include "qmlstreamwriter.h"
#ifdef QT_SIMULATOR #ifdef QT_SIMULATOR
#include <QtGui/private/qsimulatorconnection_p.h> #include <private/qsimulatorconnection_p.h>
#endif #endif
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX

4
share/qtcreator/qml/qmldump/qmlstreamwriter.cpp
View File

@@ -35,8 +35,8 @@
#include "qmlstreamwriter.h" #include "qmlstreamwriter.h"
#include <QtCore/QBuffer> #include <QBuffer>
#include <QtCore/QStringList> #include <QStringList>
QmlStreamWriter::QmlStreamWriter(QByteArray *array) QmlStreamWriter::QmlStreamWriter(QByteArray *array)
: m_indentDepth(0) : m_indentDepth(0)

10
share/qtcreator/qml/qmldump/qmlstreamwriter.h
View File

@@ -36,11 +36,11 @@
#ifndef QMLSTREAMWRITER_H #ifndef QMLSTREAMWRITER_H
#define QMLSTREAMWRITER_H #define QMLSTREAMWRITER_H
#include <QtCore/QIODevice> #include <QIODevice>
#include <QtCore/QList> #include <QList>
#include <QtCore/QString> #include <QString>
#include <QtCore/QScopedPointer> #include <QScopedPointer>
#include <QtCore/QPair> #include <QPair>
class QmlStreamWriter class QmlStreamWriter
{ {

4
share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h
View File

@@ -33,8 +33,8 @@
#ifndef ABSTRACTLIVEEDITTOOL_H #ifndef ABSTRACTLIVEEDITTOOL_H
#define ABSTRACTLIVEEDITTOOL_H #define ABSTRACTLIVEEDITTOOL_H
#include <QtCore/QList> #include <QList>
#include <QtCore/QObject> #include <QObject>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QMouseEvent; class QMouseEvent;

8
share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp
View File

@@ -34,11 +34,11 @@
#include "qdeclarativeviewinspector.h" #include "qdeclarativeviewinspector.h"
#include "qmlinspectorconstants.h" #include "qmlinspectorconstants.h"
#include <QtGui/QGraphicsPolygonItem> #include <QGraphicsPolygonItem>
#include <QtCore/QTimer> #include <QTimer>
#include <QtCore/QObject> #include <QObject>
#include <QtCore/QDebug> #include <QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

4
share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h
View File

@@ -35,8 +35,8 @@
#include "livelayeritem.h" #include "livelayeritem.h"
#include <QtCore/QObject> #include <QObject>
#include <QtCore/QWeakPointer> #include <QWeakPointer>
QT_FORWARD_DECLARE_CLASS(QGraphicsItem) QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
QT_FORWARD_DECLARE_CLASS(QPainter) QT_FORWARD_DECLARE_CLASS(QPainter)

14
share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp
View File

@@ -33,13 +33,13 @@
#include "colorpickertool.h" #include "colorpickertool.h"
#include "qdeclarativeviewinspector.h" #include "qdeclarativeviewinspector.h"
#include <QtGui/QMouseEvent> #include <QMouseEvent>
#include <QtGui/QKeyEvent> #include <QKeyEvent>
#include <QtCore/QRectF> #include <QRectF>
#include <QtGui/QRgb> #include <QRgb>
#include <QtGui/QImage> #include <QImage>
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QPalette> #include <QPalette>
namespace QmlJSDebugger { namespace QmlJSDebugger {

2
share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h
View File

@@ -35,7 +35,7 @@
#include "abstractliveedittool.h" #include "abstractliveedittool.h"
#include <QtGui/QColor> #include <QColor>
QT_FORWARD_DECLARE_CLASS(QPoint) QT_FORWARD_DECLARE_CLASS(QPoint)

2
share/qtcreator/qml/qmljsdebugger/editor/livelayeritem.h
View File

@@ -33,7 +33,7 @@
#ifndef LIVELAYERITEM_H #ifndef LIVELAYERITEM_H
#define LIVELAYERITEM_H #define LIVELAYERITEM_H
#include <QtGui/QGraphicsObject> #include <QGraphicsObject>
namespace QmlJSDebugger { namespace QmlJSDebugger {

4
share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp
View File

@@ -33,9 +33,9 @@
#include "liverubberbandselectionmanipulator.h" #include "liverubberbandselectionmanipulator.h"
#include "../qdeclarativeviewinspector_p.h" #include "../qdeclarativeviewinspector_p.h"
#include <QtGui/QGraphicsItem> #include <QGraphicsItem>
#include <QtCore/QDebug> #include <QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

2
share/qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h
View File

@@ -36,7 +36,7 @@
#include "liveselectionrectangle.h" #include "liveselectionrectangle.h"
#include <QtCore/QPointF> #include <QPointF>
QT_FORWARD_DECLARE_CLASS(QGraphicsItem) QT_FORWARD_DECLARE_CLASS(QGraphicsItem)

8
share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp
View File

@@ -34,10 +34,10 @@
#include "../qdeclarativeviewinspector_p.h" #include "../qdeclarativeviewinspector_p.h"
#include "qmlinspectorconstants.h" #include "qmlinspectorconstants.h"
#include <QtGui/QGraphicsRectItem> #include <QGraphicsRectItem>
#include <QtGui/QGraphicsObject> #include <QGraphicsObject>
#include <QtGui/QGraphicsScene> #include <QGraphicsScene>
#include <QtGui/QPen> #include <QPen>
namespace QmlJSDebugger { namespace QmlJSDebugger {

4
share/qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h
View File

@@ -33,8 +33,8 @@
#ifndef LIVESELECTIONINDICATOR_H #ifndef LIVESELECTIONINDICATOR_H
#define LIVESELECTIONINDICATOR_H #define LIVESELECTIONINDICATOR_H
#include <QtCore/QWeakPointer> #include <QWeakPointer>
#include <QtCore/QHash> #include <QHash>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QGraphicsObject; class QGraphicsObject;

10
share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp
View File

@@ -33,12 +33,12 @@
#include "liveselectionrectangle.h" #include "liveselectionrectangle.h"
#include "qmlinspectorconstants.h" #include "qmlinspectorconstants.h"
#include <QtGui/QPen> #include <QPen>
#include <QtGui/QGraphicsRectItem> #include <QGraphicsRectItem>
#include <QtGui/QGraphicsObject> #include <QGraphicsObject>
#include <QtGui/QGraphicsScene> #include <QGraphicsScene>
#include <QtCore/QtDebug> #include <QtDebug>
#include <cmath> #include <cmath>

2
share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.h
View File

@@ -33,7 +33,7 @@
#ifndef LIVESELECTIONRECTANGLE_H #ifndef LIVESELECTIONRECTANGLE_H
#define LIVESELECTIONRECTANGLE_H #define LIVESELECTIONRECTANGLE_H
#include <QtCore/QWeakPointer> #include <QWeakPointer>
QT_FORWARD_DECLARE_CLASS(QGraphicsObject) QT_FORWARD_DECLARE_CLASS(QGraphicsObject)
QT_FORWARD_DECLARE_CLASS(QGraphicsRectItem) QT_FORWARD_DECLARE_CLASS(QGraphicsRectItem)

20
share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp
View File

@@ -35,18 +35,18 @@
#include "../qdeclarativeviewinspector_p.h" #include "../qdeclarativeviewinspector_p.h"
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QWheelEvent> #include <QWheelEvent>
#include <QtGui/QMouseEvent> #include <QMouseEvent>
#include <QtGui/QClipboard> #include <QClipboard>
#include <QtGui/QMenu> #include <QMenu>
#include <QtGui/QAction> #include <QAction>
#include <QtGui/QGraphicsObject> #include <QGraphicsObject>
#include <QtDeclarative/QDeclarativeItem> #include <QDeclarativeItem>
#include <QtDeclarative/QDeclarativeEngine> #include <QDeclarativeEngine>
#include <QtCore/QDebug> #include <QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

4
share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h
View File

@@ -39,8 +39,8 @@
#include "livesingleselectionmanipulator.h" #include "livesingleselectionmanipulator.h"
#include "liveselectionindicator.h" #include "liveselectionindicator.h"
#include <QtCore/QList> #include <QList>
#include <QtCore/QTime> #include <QTime>
QT_FORWARD_DECLARE_CLASS(QGraphicsItem) QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
QT_FORWARD_DECLARE_CLASS(QMouseEvent) QT_FORWARD_DECLARE_CLASS(QMouseEvent)

4
share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h
View File

@@ -33,8 +33,8 @@
#ifndef LIVESINGLESELECTIONMANIPULATOR_H #ifndef LIVESINGLESELECTIONMANIPULATOR_H
#define LIVESINGLESELECTIONMANIPULATOR_H #define LIVESINGLESELECTIONMANIPULATOR_H
#include <QtCore/QPointF> #include <QPointF>
#include <QtCore/QList> #include <QList>
QT_FORWARD_DECLARE_CLASS(QGraphicsItem); QT_FORWARD_DECLARE_CLASS(QGraphicsItem);

2
share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
View File

@@ -33,7 +33,7 @@
#include "subcomponentmasklayeritem.h" #include "subcomponentmasklayeritem.h"
#include "qmlinspectorconstants.h" #include "qmlinspectorconstants.h"
#include "qdeclarativeviewinspector.h" #include "qdeclarativeviewinspector.h"
#include <QtGui/QPolygonF> #include <QPolygonF>
namespace QmlJSDebugger { namespace QmlJSDebugger {

2
share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h
View File

@@ -33,7 +33,7 @@
#ifndef SUBCOMPONENTMASKLAYERITEM_H #ifndef SUBCOMPONENTMASKLAYERITEM_H
#define SUBCOMPONENTMASKLAYERITEM_H #define SUBCOMPONENTMASKLAYERITEM_H
#include <QtGui/QGraphicsPolygonItem> #include <QGraphicsPolygonItem>
namespace QmlJSDebugger { namespace QmlJSDebugger {

14
share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp
View File

@@ -33,14 +33,14 @@
#include "zoomtool.h" #include "zoomtool.h"
#include "../qdeclarativeviewinspector_p.h" #include "../qdeclarativeviewinspector_p.h"
#include <QtGui/QMouseEvent> #include <QMouseEvent>
#include <QtGui/QWheelEvent> #include <QWheelEvent>
#include <QtGui/QKeyEvent> #include <QKeyEvent>
#include <QtGui/QMenu> #include <QMenu>
#include <QtGui/QAction> #include <QAction>
#include <QtCore/QRectF> #include <QRectF>
#include <QtCore/QDebug> #include <QDebug>
namespace QmlJSDebugger { namespace QmlJSDebugger {

2
share/qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h
View File

@@ -43,7 +43,7 @@
// We mean it. // We mean it.
// //
#include <QtScript/qscriptengineagent.h> #include <qscriptengineagent.h>
#include "qt_private/qdeclarativedebugservice_p.h" #include "qt_private/qdeclarativedebugservice_p.h"

2
share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h
View File

@@ -36,7 +36,7 @@
#include "qmlinspectorconstants.h" #include "qmlinspectorconstants.h"
#include "qmljsdebugger_global.h" #include "qmljsdebugger_global.h"
#include <QtCore/QHash> #include <QHash>
QT_FORWARD_DECLARE_CLASS(QColor) QT_FORWARD_DECLARE_CLASS(QColor)
QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine) QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine)

4
share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h
View File

@@ -36,8 +36,8 @@
#include "qmljsdebugger_global.h" #include "qmljsdebugger_global.h"
#include "qmlinspectorconstants.h" #include "qmlinspectorconstants.h"
#include <QtCore/QScopedPointer> #include <QScopedPointer>
#include <QtDeclarative/QDeclarativeView> #include <QDeclarativeView>
QT_FORWARD_DECLARE_CLASS(QDeclarativeItem) QT_FORWARD_DECLARE_CLASS(QDeclarativeItem)
QT_FORWARD_DECLARE_CLASS(QMouseEvent) QT_FORWARD_DECLARE_CLASS(QMouseEvent)

2
share/qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h
View File

@@ -33,7 +33,7 @@
#ifndef QMLJSDEBUGGER_GLOBAL_H #ifndef QMLJSDEBUGGER_GLOBAL_H
#define QMLJSDEBUGGER_GLOBAL_H #define QMLJSDEBUGGER_GLOBAL_H
#include <QtCore/qglobal.h> #include <qglobal.h>
# if defined(BUILD_QMLJSDEBUGGER_LIB) # if defined(BUILD_QMLJSDEBUGGER_LIB)
# define QMLJSDEBUGGER_EXPORT Q_DECL_EXPORT # define QMLJSDEBUGGER_EXPORT Q_DECL_EXPORT

2
share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h
View File

@@ -33,7 +33,7 @@
#define QDECLARATIVEDEBUGHELPER_P_H #define QDECLARATIVEDEBUGHELPER_P_H
#include "../qmljsdebugger_global.h" #include "../qmljsdebugger_global.h"
#include <QtCore/qglobal.h> #include <qglobal.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h
View File

@@ -33,7 +33,7 @@
#define QDECLARATIVEDEBUGSERVICE_H #define QDECLARATIVEDEBUGSERVICE_H
#include "../qmljsdebugger_global.h" #include "../qmljsdebugger_global.h"
#include <QtCore/qobject.h> #include <qobject.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
share/qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h
View File

@@ -36,8 +36,8 @@
#include <qdeclarative.h> #include <qdeclarative.h>
#include <qdeclarativeproperty.h> #include <qdeclarativeproperty.h>
#include <QtCore/qobject.h> #include <qobject.h>
#include <QtCore/qsharedpointer.h> #include <qsharedpointer.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

16
share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp
View File

@@ -32,14 +32,14 @@
#include "jsdebuggeragent.h" #include "jsdebuggeragent.h"
#include "qt_private/qdeclarativedebughelper_p.h" #include "qt_private/qdeclarativedebughelper_p.h"
#include <QtCore/qdatetime.h> #include <qdatetime.h>
#include <QtCore/qdebug.h> #include <qdebug.h>
#include <QtCore/qcoreapplication.h> #include <qcoreapplication.h>
#include <QtCore/qset.h> #include <qset.h>
#include <QtCore/qurl.h> #include <qurl.h>
#include <QtScript/qscriptcontextinfo.h> #include <qscriptcontextinfo.h>
#include <QtScript/qscriptengine.h> #include <qscriptengine.h>
#include <QtScript/qscriptvalueiterator.h> #include <qscriptvalueiterator.h>
namespace QmlJSDebugger { namespace QmlJSDebugger {

8
share/qtcreator/qml/qmljsdebugger/protocol/inspectorprotocol.h
View File

@@ -33,10 +33,10 @@
#ifndef INSPECTORPROTOCOL_H #ifndef INSPECTORPROTOCOL_H
#define INSPECTORPROTOCOL_H #define INSPECTORPROTOCOL_H
#include <QtCore/QDebug> #include <QDebug>
#include <QtCore/QMetaType> #include <QMetaType>
#include <QtCore/QMetaEnum> #include <QMetaEnum>
#include <QtCore/QObject> #include <QObject>
namespace QmlJSDebugger { namespace QmlJSDebugger {

18
share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp
View File

@@ -41,15 +41,15 @@
#include "qt_private/qdeclarativedebughelper_p.h" #include "qt_private/qdeclarativedebughelper_p.h"
#include <QtDeclarative/QDeclarativeItem> #include <QDeclarativeItem>
#include <QtDeclarative/QDeclarativeEngine> #include <QDeclarativeEngine>
#include <QtDeclarative/QDeclarativeContext> #include <QDeclarativeContext>
#include <QtDeclarative/QDeclarativeExpression> #include <QDeclarativeExpression>
#include <QtGui/QWidget> #include <QWidget>
#include <QtGui/QVBoxLayout> #include <QVBoxLayout>
#include <QtGui/QMouseEvent> #include <QMouseEvent>
#include <QtGui/QGraphicsObject> #include <QGraphicsObject>
#include <QtGui/QApplication> #include <QApplication>
#include "qt_private/qdeclarativestate_p.h" #include "qt_private/qdeclarativestate_p.h"

4
share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h
View File

@@ -33,8 +33,8 @@
#ifndef QDECLARATIVEVIEWINSPECTOR_P_H #ifndef QDECLARATIVEVIEWINSPECTOR_P_H
#define QDECLARATIVEVIEWINSPECTOR_P_H #define QDECLARATIVEVIEWINSPECTOR_P_H
#include <QtCore/QWeakPointer> #include <QWeakPointer>
#include <QtCore/QPointF> #include <QPointF>
#include "qdeclarativeviewinspector.h" #include "qdeclarativeviewinspector.h"
#include "qdeclarativeinspectorservice.h" #include "qdeclarativeinspectorservice.h"

2
share/qtcreator/qml/qmlobserver/deviceorientation.h
View File

@@ -32,7 +32,7 @@
#ifndef ORIENTATION_H #ifndef ORIENTATION_H
#define ORIENTATION_H #define ORIENTATION_H
#include <QtCore/QObject> #include <QObject>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

4
share/qtcreator/qml/qmlobserver/loggerwidget.h
View File

@@ -32,8 +32,8 @@
#ifndef LOGGERWIDGET_H #ifndef LOGGERWIDGET_H
#define LOGGERWIDGET_H #define LOGGERWIDGET_H
#include <QtGui/QMainWindow> #include <QMainWindow>
#include <QtCore/QMetaType> #include <QMetaType>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

4
share/qtcreator/qml/qmlobserver/proxysettings.cpp
View File

@@ -29,8 +29,8 @@
** **
**************************************************************************/ **************************************************************************/
#include <QtGui/QIntValidator> #include <QIntValidator>
#include <QtCore/QSettings> #include <QSettings>
#include "proxysettings.h" #include "proxysettings.h"

4
share/qtcreator/qml/qmlobserver/proxysettings.h
View File

@@ -32,8 +32,8 @@
#ifndef PROXYSETTINGS_H #ifndef PROXYSETTINGS_H
#define PROXYSETTINGS_H #define PROXYSETTINGS_H
#include <QtGui/QDialog> #include <QDialog>
#include <QtNetwork/QNetworkProxy> #include <QNetworkProxy>
#ifdef Q_WS_MAEMO_5 #ifdef Q_WS_MAEMO_5
#include "ui_proxysettings_maemo5.h" #include "ui_proxysettings_maemo5.h"
#else #else

16
share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp
View File

@@ -30,14 +30,14 @@
**************************************************************************/ **************************************************************************/
#include <qdeclarativetester.h> #include <qdeclarativetester.h>
#include <QtDeclarative/qdeclarativeview.h> #include <qdeclarativeview.h>
#include <QtDeclarative/QDeclarativeComponent> #include <QDeclarativeComponent>
#include <QtGui/QGraphicsObject> #include <QGraphicsObject>
#include <QtGui/QApplication> #include <QApplication>
#include <QtCore/QDebug> #include <QDebug>
#include <QtCore/QFile> #include <QFile>
#include <QtCore/QDir> #include <QDir>
#include <QtCore/QCryptographicHash> #include <QCryptographicHash>
#ifndef NO_PRIVATE_HEADERS #ifndef NO_PRIVATE_HEADERS
#include <private/qabstractanimation_p.h> #include <private/qabstractanimation_p.h>

16
share/qtcreator/qml/qmlobserver/qdeclarativetester.h
View File

@@ -34,15 +34,15 @@
#include <qmlruntime.h> #include <qmlruntime.h>
#include <QtDeclarative/qdeclarativelist.h> #include <qdeclarativelist.h>
#include <QtDeclarative/qdeclarative.h> #include <qdeclarative.h>
#include <QtGui/QMouseEvent> #include <QMouseEvent>
#include <QtGui/QKeyEvent> #include <QKeyEvent>
#include <QtGui/QImage> #include <QImage>
#include <QtCore/QUrl> #include <QUrl>
#include <QtCore/QEvent> #include <QEvent>
#include <QtCore/QAbstractAnimation> #include <QAbstractAnimation>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

60
share/qtcreator/qml/qmlobserver/qmlruntime.cpp
View File

@@ -57,39 +57,39 @@
#include <qdeclarativeviewinspector.h> #include <qdeclarativeviewinspector.h>
#include <qdeclarativeinspectorservice.h> #include <qdeclarativeinspectorservice.h>
#include <QtNetwork/QNetworkReply> #include <QNetworkReply>
#include <QtNetwork/QNetworkCookieJar> #include <QNetworkCookieJar>
#include <QtNetwork/QNetworkDiskCache> #include <QNetworkDiskCache>
#include <QtNetwork/QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QtNetwork/QNetworkProxyFactory> #include <QNetworkProxyFactory>
#include <QtDeclarative/QDeclarativeComponent> #include <QDeclarativeComponent>
#include <QtGui/QWidget> #include <QWidget>
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QTextBrowser> #include <QTextBrowser>
#include <QtGui/QVBoxLayout> #include <QVBoxLayout>
#include <QtGui/QProgressDialog> #include <QProgressDialog>
#include <QtGui/QMenuBar> #include <QMenuBar>
#include <QtGui/QMenu> #include <QMenu>
#include <QtGui/QAction> #include <QAction>
#include <QtGui/QFileDialog> #include <QFileDialog>
#include <QtGui/QInputDialog> #include <QInputDialog>
#include <QtGui/QGraphicsObject> #include <QGraphicsObject>
#include <QtGui/QKeyEvent> #include <QKeyEvent>
#include <QtCore/QSignalMapper> #include <QSignalMapper>
#include <QtCore/QSettings> #include <QSettings>
#include <QtCore/QXmlStreamReader> #include <QXmlStreamReader>
#include <QtCore/QBuffer> #include <QBuffer>
#include <QtCore/QTranslator> #include <QTranslator>
#include <QtCore/QDir> #include <QDir>
#include <QtCore/QFile> #include <QFile>
#include <QtCore/QFileInfo> #include <QFileInfo>
#include <QtCore/QProcess> #include <QProcess>
#include <QtCore/QTimer> #include <QTimer>
#include <QtCore/QMutex> #include <QMutex>
#include <QtCore/QMutexLocker> #include <QMutexLocker>
#include "proxysettings.h" #include "proxysettings.h"
#include "deviceorientation.h" #include "deviceorientation.h"

8
share/qtcreator/qml/qmlobserver/qmlruntime.h
View File

@@ -32,10 +32,10 @@
#ifndef QDECLARATIVEVIEWER_H #ifndef QDECLARATIVEVIEWER_H
#define QDECLARATIVEVIEWER_H #define QDECLARATIVEVIEWER_H
#include <QtGui/QMainWindow> #include <QMainWindow>
#include <QtCore/QTimer> #include <QTimer>
#include <QtCore/QTime> #include <QTime>
#include <QtCore/QList> #include <QList>
#include "loggerwidget.h" #include "loggerwidget.h"

8
share/qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h
View File

@@ -29,10 +29,10 @@
** **
**************************************************************************/ **************************************************************************/
#include <QtGui/qplaintextedit.h> #include <qplaintextedit.h>
#include <QtGui/qtextedit.h> #include <qtextedit.h>
#include <QtGui/qabstractkineticscroller.h> #include <qabstractkineticscroller.h>
#include <QtGui/qscrollarea.h> #include <qscrollarea.h>
#include <QtDebug> #include <QtDebug>
#ifndef TEXTEDITAUTORESIZER_H #ifndef TEXTEDITAUTORESIZER_H

2
share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp
View File

@@ -58,7 +58,7 @@
#include <QSGItem> #include <QSGItem>
#endif #endif
#include <QtDeclarative/QDeclarativeEngine> #include <QDeclarativeEngine>
/*! /*!
\class QmlDesigner::NodeInstance \class QmlDesigner::NodeInstance

2
share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp
View File

@@ -35,7 +35,7 @@
#include <QApplication> #include <QApplication>
#include <QStringList> #include <QStringList>
#ifdef QT_SIMULATOR #ifdef QT_SIMULATOR
#include <QtGui/private/qsimulatorconnection_p.h> #include <private/qsimulatorconnection_p.h>
#endif #endif
#include <qt4nodeinstanceclientproxy.h> #include <qt4nodeinstanceclientproxy.h>

24
share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp
View File

@@ -8,20 +8,20 @@
#include "html5applicationviewer.h" #include "html5applicationviewer.h"
#include <QtCore/QCoreApplication> #include <QCoreApplication>
#include <QtCore/QDir> #include <QDir>
#include <QtCore/QFileInfo> #include <QFileInfo>
#include <QtGui/QVBoxLayout> #include <QVBoxLayout>
#include <QtGui/QGraphicsView> #include <QGraphicsView>
#include <QtGui/QGraphicsScene> #include <QGraphicsScene>
#include <QtGui/QGraphicsLinearLayout> #include <QGraphicsLinearLayout>
#include <QtWebKit/QGraphicsWebView> #include <QGraphicsWebView>
#include <QtWebKit/QWebFrame> #include <QWebFrame>
#ifdef TOUCH_OPTIMIZED_NAVIGATION #ifdef TOUCH_OPTIMIZED_NAVIGATION
#include <QtCore/QTimer> #include <QTimer>
#include <QtGui/QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include <QtWebKit/QWebElement> #include <QWebElement>
#include "navigationcontroller.h" #include "navigationcontroller.h"
#include "webtouchevent.h" #include "webtouchevent.h"
#include "webtouchnavigation.h" #include "webtouchnavigation.h"

4
share/qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.h
View File

@@ -9,8 +9,8 @@
#ifndef HTML5APPLICATIONVIEWER_H #ifndef HTML5APPLICATIONVIEWER_H
#define HTML5APPLICATIONVIEWER_H #define HTML5APPLICATIONVIEWER_H
#include <QtGui/QWidget> #include <QWidget>
#include <QtCore/QUrl> #include <QUrl>
class QGraphicsWebView; class QGraphicsWebView;

2
share/qtcreator/templates/html5app/main.cpp
View File

@@ -1,4 +1,4 @@
#include <QtGui/QApplication> #include <QApplication>
#include "html5applicationviewer.h" #include "html5applicationviewer.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])

2
share/qtcreator/templates/mobileapp/main.cpp
View File

@@ -1,6 +1,6 @@
#include "mainwindow.h" #include "mainwindow.h"
#include <QtGui/QApplication> #include <QApplication>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

2
share/qtcreator/templates/mobileapp/mainwindow.cpp
View File

@@ -1,7 +1,7 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include <QtCore/QCoreApplication> #include <QCoreApplication>
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent), ui(new Ui::MainWindow) : QMainWindow(parent), ui(new Ui::MainWindow)

2
share/qtcreator/templates/mobileapp/mainwindow.h
View File

@@ -1,7 +1,7 @@
#ifndef MAINWINDOW_H #ifndef MAINWINDOW_H
#define MAINWINDOW_H #define MAINWINDOW_H
#include <QtGui/QMainWindow> #include <QMainWindow>
namespace Ui { namespace Ui {
class MainWindow; class MainWindow;

4
share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h
View File

@@ -1,8 +1,8 @@
#ifndef @COLLECTION_INCLUDE_GUARD@ #ifndef @COLLECTION_INCLUDE_GUARD@
#define @COLLECTION_INCLUDE_GUARD@ #define @COLLECTION_INCLUDE_GUARD@
#include <QtDesigner/QtDesigner> #include <QtDesigner>
#include <QtCore/qplugin.h> #include <qplugin.h>
class @COLLECTION_PLUGIN_CLASS@ : public QObject, public QDesignerCustomWidgetCollectionInterface class @COLLECTION_PLUGIN_CLASS@ : public QObject, public QDesignerCustomWidgetCollectionInterface
{ {

2
share/qtcreator/templates/qt4project/customwidgetwizard/tpl_single.cpp
View File

@@ -1,7 +1,7 @@
#include "@WIDGET_HEADER@" #include "@WIDGET_HEADER@"
#include "@PLUGIN_HEADER@" #include "@PLUGIN_HEADER@"
#include <QtCore/QtPlugin> #include <QtPlugin>
@PLUGIN_CLASS@::@PLUGIN_CLASS@(QObject *parent) @PLUGIN_CLASS@::@PLUGIN_CLASS@(QObject *parent)
: QObject(parent) : QObject(parent)

2
share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.h
View File

@@ -1,7 +1,7 @@
#ifndef @WIDGET_INCLUDE_GUARD@ #ifndef @WIDGET_INCLUDE_GUARD@
#define @WIDGET_INCLUDE_GUARD@ #define @WIDGET_INCLUDE_GUARD@
#include <QtGui/@WIDGET_BASE_CLASS@> #include <@WIDGET_BASE_CLASS@>
class @WIDGET_CLASS@ : public @WIDGET_BASE_CLASS@ class @WIDGET_CLASS@ : public @WIDGET_BASE_CLASS@
{ {

2
share/qtcreator/templates/qt4project/mywidget.h
View File

@@ -1,7 +1,7 @@
#ifndef %PRE_DEF% #ifndef %PRE_DEF%
#define %PRE_DEF% #define %PRE_DEF%
#include <QtGui/%BASECLASS%> #include <%BASECLASS%>
class %CLASS% : public %BASECLASS% class %CLASS% : public %BASECLASS%
{ {

2
share/qtcreator/templates/qt4project/mywidget_form.h
View File

@@ -1,7 +1,7 @@
#ifndef %PRE_DEF% #ifndef %PRE_DEF%
#define %PRE_DEF% #define %PRE_DEF%
#include <QtGui/%BASECLASS%> #include <%BASECLASS%>
namespace Ui namespace Ui
{ {

2
share/qtcreator/templates/qtquickapp/main.cpp
View File

@@ -1,4 +1,4 @@
#include <QtGui/QApplication> #include <QApplication>
#include "qmlapplicationviewer.h" #include "qmlapplicationviewer.h"
Q_DECL_EXPORT int main(int argc, char *argv[]) Q_DECL_EXPORT int main(int argc, char *argv[])

12
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -9,12 +9,12 @@
#include "qmlapplicationviewer.h" #include "qmlapplicationviewer.h"
#include <QtCore/QDir> #include <QDir>
#include <QtCore/QFileInfo> #include <QFileInfo>
#include <QtGui/QApplication> #include <QApplication>
#include <QtDeclarative/QDeclarativeComponent> #include <QDeclarativeComponent>
#include <QtDeclarative/QDeclarativeEngine> #include <QDeclarativeEngine>
#include <QtDeclarative/QDeclarativeContext> #include <QDeclarativeContext>
#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN

2
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h
View File

@@ -10,7 +10,7 @@
#ifndef QMLAPPLICATIONVIEWER_H #ifndef QMLAPPLICATIONVIEWER_H
#define QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H
#include <QtDeclarative/QDeclarativeView> #include <QDeclarativeView>
class QmlApplicationViewer : public QDeclarativeView class QmlApplicationViewer : public QDeclarativeView
{ {

2
share/qtcreator/templates/wizards/qml-extension/object.cpp
View File

@@ -1,6 +1,6 @@
#include "%ObjectName:l%.%CppHeaderSuffix%" #include "%ObjectName:l%.%CppHeaderSuffix%"
#include <QtDeclarative/qdeclarative.h> #include <qdeclarative.h>
%ObjectName%::%ObjectName%(QDeclarativeItem *parent): %ObjectName%::%ObjectName%(QDeclarativeItem *parent):
QDeclarativeItem(parent) QDeclarativeItem(parent)

2
share/qtcreator/templates/wizards/qml-extension/object.h
View File

@@ -1,7 +1,7 @@
#ifndef %ObjectName:u%_H #ifndef %ObjectName:u%_H
#define %ObjectName:u%_H #define %ObjectName:u%_H
#include <QtDeclarative/QDeclarativeItem> #include <QDeclarativeItem>
class %ObjectName% : public QDeclarativeItem class %ObjectName% : public QDeclarativeItem
{ {

2
share/qtcreator/templates/wizards/qml-extension/plugin.cpp
View File

@@ -1,7 +1,7 @@
#include "%ProjectName:l%_plugin.%CppHeaderSuffix%" #include "%ProjectName:l%_plugin.%CppHeaderSuffix%"
#include "%ObjectName:l%.%CppHeaderSuffix%" #include "%ObjectName:l%.%CppHeaderSuffix%"
#include <QtDeclarative/qdeclarative.h> #include <qdeclarative.h>
void %ProjectName:s%Plugin::registerTypes(const char *uri) void %ProjectName:s%Plugin::registerTypes(const char *uri)
{ {

2
share/qtcreator/templates/wizards/qml-extension/plugin.h
View File

@@ -1,7 +1,7 @@
#ifndef %ProjectName:h%_PLUGIN_H #ifndef %ProjectName:h%_PLUGIN_H
#define %ProjectName:h%_PLUGIN_H #define %ProjectName:h%_PLUGIN_H
#include <QtDeclarative/QDeclarativeExtensionPlugin> #include <QDeclarativeExtensionPlugin>
class %ProjectName:s%Plugin : public QDeclarativeExtensionPlugin class %ProjectName:s%Plugin : public QDeclarativeExtensionPlugin
{ {

10
share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp
View File

@@ -8,12 +8,12 @@
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <QtGui/QAction> #include <QAction>
#include <QtGui/QMessageBox> #include <QMessageBox>
#include <QtGui/QMainWindow> #include <QMainWindow>
#include <QtGui/QMenu> #include <QMenu>
#include <QtCore/QtPlugin> #include <QtPlugin>
using namespace %PluginName%::Internal; using namespace %PluginName%::Internal;

2
share/qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h
View File

@@ -1,7 +1,7 @@
#ifndef %PluginName:u%_GLOBAL_%CppHeaderSuffix:u% #ifndef %PluginName:u%_GLOBAL_%CppHeaderSuffix:u%
#define %PluginName:u%_GLOBAL_%CppHeaderSuffix:u% #define %PluginName:u%_GLOBAL_%CppHeaderSuffix:u%
#include <QtCore/QtGlobal> #include <QtGlobal>
#if defined(%PluginName:u%_LIBRARY) #if defined(%PluginName:u%_LIBRARY)
# define %PluginName:u%SHARED_EXPORT Q_DECL_EXPORT # define %PluginName:u%SHARED_EXPORT Q_DECL_EXPORT

32
src/app/main.cpp
View File

@@ -38,24 +38,24 @@
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <extensionsystem/pluginspec.h> #include <extensionsystem/pluginspec.h>
#include <QtCore/QDebug> #include <QDebug>
#include <QtCore/QDir> #include <QDir>
#include <QtCore/QFileInfo> #include <QFileInfo>
#include <QtCore/QLibraryInfo> #include <QLibraryInfo>
#include <QtCore/QSettings> #include <QSettings>
#include <QtCore/QTextStream> #include <QTextStream>
#include <QtCore/QThreadPool> #include <QThreadPool>
#include <QtCore/QTimer> #include <QTimer>
#include <QtCore/QTranslator> #include <QTranslator>
#include <QtCore/QUrl> #include <QUrl>
#include <QtCore/QVariant> #include <QVariant>
#include <QtNetwork/QNetworkProxyFactory> #include <QNetworkProxyFactory>
#include <QtGui/QApplication> #include <QApplication>
#include <QtGui/QDesktopServices> #include <QDesktopServices>
#include <QtGui/QMainWindow> #include <QMainWindow>
#include <QtGui/QMessageBox> #include <QMessageBox>
#ifdef ENABLE_QT_BREAKPAD #ifdef ENABLE_QT_BREAKPAD
#include <qtsystemexceptionhandler.h> #include <qtsystemexceptionhandler.h>

2
src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h vendored
View File

@@ -25,7 +25,7 @@
#include <cstddef> #include <cstddef>
#ifndef CPLUSPLUS_WITHOUT_QT #ifndef CPLUSPLUS_WITHOUT_QT
# include <QtCore/qglobal.h> # include <qglobal.h>
# if defined(CPLUSPLUS_BUILD_LIB) # if defined(CPLUSPLUS_BUILD_LIB)
# define CPLUSPLUS_EXPORT Q_DECL_EXPORT # define CPLUSPLUS_EXPORT Q_DECL_EXPORT

2
src/libs/3rdparty/precompiled_headers/botan_pch.h vendored
View File

@@ -31,7 +31,7 @@
**************************************************************************/ **************************************************************************/
#if defined __cplusplus #if defined __cplusplus
#include <QtCore/QtGlobal> #include <QtGlobal>
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
# define _POSIX_ # define _POSIX_

4
src/libs/aggregation/aggregate.cpp
View File

@@ -32,8 +32,8 @@
#include "aggregate.h" #include "aggregate.h"
#include <QtCore/QWriteLocker> #include <QWriteLocker>
#include <QtCore/QDebug> #include <QDebug>
/*! /*!
\namespace Aggregation \namespace Aggregation

10
src/libs/aggregation/aggregate.h
View File

@@ -35,11 +35,11 @@
#include "aggregation_global.h" #include "aggregation_global.h"
#include <QtCore/QObject> #include <QObject>
#include <QtCore/QList> #include <QList>
#include <QtCore/QHash> #include <QHash>
#include <QtCore/QReadWriteLock> #include <QReadWriteLock>
#include <QtCore/QReadLocker> #include <QReadLocker>
namespace Aggregation { namespace Aggregation {

2
src/libs/aggregation/aggregation_global.h
View File

@@ -33,7 +33,7 @@
#ifndef AGGREGATION_GLOBAL_H #ifndef AGGREGATION_GLOBAL_H
#define AGGREGATION_GLOBAL_H #define AGGREGATION_GLOBAL_H
#include <QtCore/qglobal.h> #include <qglobal.h>
#if defined(AGGREGATION_LIBRARY) #if defined(AGGREGATION_LIBRARY)
# define AGGREGATION_EXPORT Q_DECL_EXPORT # define AGGREGATION_EXPORT Q_DECL_EXPORT

2
src/libs/aggregation/examples/text/main.cpp
View File

@@ -32,7 +32,7 @@
#include "main.h" #include "main.h"
#include <QtGui/QApplication> #include <QApplication>
MyMain::MyMain(QWidget *parent, Qt::WFlags flags) MyMain::MyMain(QWidget *parent, Qt::WFlags flags)
: QWidget(parent, flags) : QWidget(parent, flags)

2
src/libs/aggregation/examples/text/main.h
View File

@@ -38,7 +38,7 @@
#include <aggregate.h> #include <aggregate.h>
#include <QtGui/QWidget> #include <QWidget>
class MyMain : public QWidget class MyMain : public QWidget
{ {

2
src/libs/aggregation/examples/text/myinterfaces.h
View File

@@ -35,7 +35,7 @@
#include <aggregate.h> #include <aggregate.h>
#include <QtCore/QString> #include <QString>
class IComboEntry : public QObject class IComboEntry : public QObject
{ {

4
src/libs/cplusplus/ASTParent.h
View File

@@ -34,8 +34,8 @@
#define CPLUSPLUS_ASTPARENT_H #define CPLUSPLUS_ASTPARENT_H
#include <ASTVisitor.h> #include <ASTVisitor.h>
#include <QtCore/QHash> #include <QHash>
#include <QtCore/QStack> #include <QStack>
namespace CPlusPlus { namespace CPlusPlus {

2
src/libs/cplusplus/ASTPath.cpp
View File

@@ -36,7 +36,7 @@
#include <TranslationUnit.h> #include <TranslationUnit.h>
#ifdef DEBUG_AST_PATH #ifdef DEBUG_AST_PATH
# include <QtCore/QDebug> # include <QDebug>
# include <typeinfo> # include <typeinfo>
#endif // DEBUG_AST_PATH #endif // DEBUG_AST_PATH

4
src/libs/cplusplus/ASTPath.h
View File

@@ -38,8 +38,8 @@
#include "CppDocument.h" #include "CppDocument.h"
#include <QtCore/QList> #include <QList>
#include <QtGui/QTextCursor> #include <QTextCursor>
#undef DEBUG_AST_PATH #undef DEBUG_AST_PATH

2
src/libs/cplusplus/BackwardsScanner.cpp
View File

@@ -31,7 +31,7 @@
**************************************************************************/ **************************************************************************/
#include "BackwardsScanner.h" #include "BackwardsScanner.h"
#include <Token.h> #include <Token.h>
#include <QtGui/QTextCursor> #include <QTextCursor>
#include <QTextDocument> #include <QTextDocument>
using namespace CPlusPlus; using namespace CPlusPlus;

2
src/libs/cplusplus/BackwardsScanner.h
View File

@@ -34,7 +34,7 @@
#include "SimpleLexer.h" #include "SimpleLexer.h"
#include <QtGui/QTextBlock> #include <QTextBlock>
QT_FORWARD_DECLARE_CLASS(QTextCursor) QT_FORWARD_DECLARE_CLASS(QTextCursor)

8
src/libs/cplusplus/CppDocument.cpp
View File

@@ -52,10 +52,10 @@
#include <CoreTypes.h> #include <CoreTypes.h>
#include <LookupContext.h> #include <LookupContext.h>
#include <QtCore/QByteArray> #include <QByteArray>
#include <QtCore/QBitArray> #include <QBitArray>
#include <QtCore/QDir> #include <QDir>
#include <QtCore/QtDebug> #include <QtDebug>
/*! /*!
\namespace CPlusPlus \namespace CPlusPlus

10
src/libs/cplusplus/CppDocument.h
View File

@@ -36,11 +36,11 @@
#include <CPlusPlusForwardDeclarations.h> #include <CPlusPlusForwardDeclarations.h>
#include "Macro.h" #include "Macro.h"
#include <QtCore/QSharedPointer> #include <QSharedPointer>
#include <QtCore/QDateTime> #include <QDateTime>
#include <QtCore/QHash> #include <QHash>
#include <QtCore/QFileInfo> #include <QFileInfo>
#include <QtCore/QAtomicInt> #include <QAtomicInt>
namespace CPlusPlus { namespace CPlusPlus {

6
src/libs/cplusplus/CppRewriter.cpp
View File

@@ -39,9 +39,9 @@
#include <Scope.h> #include <Scope.h>
#include <Overview.h> #include <Overview.h>
#include <QtCore/QVarLengthArray> #include <QVarLengthArray>
#include <QtCore/QRegExp> #include <QRegExp>
#include <QtCore/QDebug> #include <QDebug>
namespace CPlusPlus { namespace CPlusPlus {

2
src/libs/cplusplus/DependencyTable.cpp
View File

@@ -33,7 +33,7 @@
#include "DependencyTable.h" #include "DependencyTable.h"
#include "CppDocument.h" #include "CppDocument.h"
#include <QtCore/QDebug> #include <QDebug>
using namespace CPlusPlus; using namespace CPlusPlus;

10
src/libs/cplusplus/DependencyTable.h
View File

@@ -35,11 +35,11 @@
#include <CPlusPlusForwardDeclarations.h> #include <CPlusPlusForwardDeclarations.h>
#include <QtCore/QBitArray> #include <QBitArray>
#include <QtCore/QHash> #include <QHash>
#include <QtCore/QString> #include <QString>
#include <QtCore/QStringList> #include <QStringList>
#include <QtCore/QVector> #include <QVector>
namespace CPlusPlus { namespace CPlusPlus {

4
src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
View File

@@ -40,8 +40,8 @@
#include <CoreTypes.h> #include <CoreTypes.h>
#include <Literals.h> #include <Literals.h>
#include <QtCore/QVarLengthArray> #include <QVarLengthArray>
#include <QtCore/QDebug> #include <QDebug>
using namespace CPlusPlus; using namespace CPlusPlus;

6
src/libs/cplusplus/DeprecatedGenTemplateInstance.h
View File

@@ -37,9 +37,9 @@
#include <NameVisitor.h> #include <NameVisitor.h>
#include <FullySpecifiedType.h> #include <FullySpecifiedType.h>
#include <QtCore/QList> #include <QList>
#include <QtCore/QPair> #include <QPair>
#include <QtCore/QSharedPointer> #include <QSharedPointer>
namespace CPlusPlus { namespace CPlusPlus {

2
src/libs/cplusplus/ExpressionUnderCursor.h
View File

@@ -34,7 +34,7 @@
#define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H #define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
#include "CPlusPlusForwardDeclarations.h" #include "CPlusPlusForwardDeclarations.h"
#include <QtCore/QList> #include <QList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QString; class QString;

2
src/libs/cplusplus/FastPreprocessor.cpp
View File

@@ -33,7 +33,7 @@
#include "FastPreprocessor.h" #include "FastPreprocessor.h"
#include <Literals.h> #include <Literals.h>
#include <TranslationUnit.h> #include <TranslationUnit.h>
#include <QtCore/QDebug> #include <QDebug>
using namespace CPlusPlus; using namespace CPlusPlus;

4
src/libs/cplusplus/FastPreprocessor.h
View File

@@ -39,8 +39,8 @@
#include <Control.h> #include <Control.h>
#include <QtCore/QSet> #include <QSet>
#include <QtCore/QString> #include <QString>
namespace CPlusPlus { namespace CPlusPlus {

2
src/libs/cplusplus/FindUsages.h
View File

@@ -37,7 +37,7 @@
#include "CppDocument.h" #include "CppDocument.h"
#include "TypeOfExpression.h" #include "TypeOfExpression.h"
#include <ASTVisitor.h> #include <ASTVisitor.h>
#include <QtCore/QSet> #include <QSet>
namespace CPlusPlus { namespace CPlusPlus {

Some files were not shown because too many files have changed in this diff Show More