Commit 3fa55b7a authored by Erik Verbruggen's avatar Erik Verbruggen
Browse files

Removed module names from #include directives.



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

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent 9a9ba120

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
#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
......
...@@ -8,12 +8,12 @@ ...@@ -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;
......
...@@ -4,12 +4,12 @@ ...@@ -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 {
......
...@@ -6,7 +6,7 @@ ...@@ -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;
......
...@@ -36,7 +36,7 @@ ...@@ -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[])
......
...@@ -38,7 +38,7 @@ ...@@ -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[])
{ {
......
...@@ -39,10 +39,10 @@ ...@@ -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)
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "ui_textfinder.h" #include "ui_textfinder.h"
#include <QtGui/QWidget> #include <QWidget>
namespace Ui namespace Ui
{ {
......
#include <QtGui/QApplication> #include <QApplication>
#include "qmlapplicationviewer.h" #include "qmlapplicationviewer.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
** **
**************************************************************************/ **************************************************************************/
#include <QtCore/qglobal.h> #include <qglobal.h>
#if USE_QT_CORE #if USE_QT_CORE
#include <QDateTime> #include <QDateTime>
......
...@@ -33,8 +33,8 @@ ...@@ -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
......
...@@ -30,16 +30,16 @@ ...@@ -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>
......
...@@ -33,26 +33,26 @@ ...@@ -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
......
...@@ -35,8 +35,8 @@ ...@@ -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)
......
...@@ -36,11 +36,11 @@ ...@@ -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
{ {
......
...@@ -33,8 +33,8 @@ ...@@ -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;
......
...@@ -34,11 +34,11 @@ ...@@ -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 {
......
...@@ -35,8 +35,8 @@ ...@@ -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)
......
...@@ -33,13 +33,13 @@ ...@@ -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 {
......
...@@ -35,7 +35,7 @@ ...@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment