diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-22 15:32:43 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-23 15:01:57 +0000 |
commit | 91d4985e7b597457d024e67c64fe136c550c23fd (patch) | |
tree | e86d593891f930551277a23c116abebddffd5870 /src | |
parent | 9ad3950c92ef5493a4f36428ce4e2731bb103581 (diff) |
Fix includes of Qt classes
The convention <QtModule/QClass> should be used. Among other things,
this makes generating Python bindings possible.
Task-number: PYSIDE-487
Change-Id: I32f114377dd70d27dee71a44b05c81474eb5dac3
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src')
36 files changed, 50 insertions, 50 deletions
diff --git a/src/extras/3dtext/qextrudedtextgeometry.h b/src/extras/3dtext/qextrudedtextgeometry.h index 9ee8b23f0..d6e682dbd 100644 --- a/src/extras/3dtext/qextrudedtextgeometry.h +++ b/src/extras/3dtext/qextrudedtextgeometry.h @@ -53,8 +53,8 @@ #include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometry.h> -#include <QString> -#include <QFont> +#include <QtCore/QString> +#include <QtGui/QFont> QT_BEGIN_NAMESPACE diff --git a/src/extras/3dtext/qextrudedtextmesh.h b/src/extras/3dtext/qextrudedtextmesh.h index 3f2f41a37..ea3054003 100644 --- a/src/extras/3dtext/qextrudedtextmesh.h +++ b/src/extras/3dtext/qextrudedtextmesh.h @@ -53,8 +53,8 @@ #include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qgeometryrenderer.h> -#include <QString> -#include <QFont> +#include <QtCore/QString> +#include <QtGui/QFont> QT_BEGIN_NAMESPACE diff --git a/src/extras/defaults/qmorphphongmaterial.h b/src/extras/defaults/qmorphphongmaterial.h index 3b65088b1..235426f1c 100644 --- a/src/extras/defaults/qmorphphongmaterial.h +++ b/src/extras/defaults/qmorphphongmaterial.h @@ -39,7 +39,7 @@ #include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> -#include <QColor> +#include <QtGui/QColor> QT_BEGIN_NAMESPACE diff --git a/src/extras/defaults/qtexturematerial.h b/src/extras/defaults/qtexturematerial.h index 3101b9a1b..ec3eba392 100644 --- a/src/extras/defaults/qtexturematerial.h +++ b/src/extras/defaults/qtexturematerial.h @@ -42,7 +42,7 @@ #include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qmaterial.h> -#include <QVector2D> +#include <QtGui/QVector2D> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qbuffercapture.h b/src/render/framegraph/qbuffercapture.h index d77266828..ab8c7d2c2 100644 --- a/src/render/framegraph/qbuffercapture.h +++ b/src/render/framegraph/qbuffercapture.h @@ -42,7 +42,7 @@ #include <Qt3DRender/QFrameGraphNode> #include <Qt3DRender/QBuffer> -#include <QByteArray> +#include <QtCore/QByteArray> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qclearbuffers.h b/src/render/framegraph/qclearbuffers.h index 91828c222..138e49450 100644 --- a/src/render/framegraph/qclearbuffers.h +++ b/src/render/framegraph/qclearbuffers.h @@ -42,8 +42,8 @@ #include <Qt3DRender/qframegraphnode.h> #include <Qt3DRender/qrendertargetoutput.h> -#include <QColor> -#include <QFlags> +#include <QtGui/QColor> +#include <QtCore/QFlags> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h index eb43708e1..b9ff6bbfb 100644 --- a/src/render/framegraph/qframegraphnode.h +++ b/src/render/framegraph/qframegraphnode.h @@ -42,7 +42,7 @@ #include <Qt3DCore/qnode.h> #include <Qt3DRender/qt3drender_global.h> -#include <QObject> +#include <QtCore/QObject> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h index 61eac5773..886c7c47a 100644 --- a/src/render/framegraph/qlayerfilter.h +++ b/src/render/framegraph/qlayerfilter.h @@ -41,7 +41,7 @@ #define QT3DRENDER_QLAYERFILTER_H #include <Qt3DRender/qframegraphnode.h> -#include <QStringList> +#include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrendercapture.h b/src/render/framegraph/qrendercapture.h index 5b768b593..e8f549bd1 100644 --- a/src/render/framegraph/qrendercapture.h +++ b/src/render/framegraph/qrendercapture.h @@ -38,7 +38,7 @@ #define QRENDERCAPTURE_H #include <Qt3DRender/QFrameGraphNode> -#include <QImage> +#include <QtGui/QImage> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index 934d0479b..c5b5d872e 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -42,7 +42,7 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qframegraphnode.h> -#include <QString> +#include <QtCore/QString> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h index 66a3428c5..fabd15174 100644 --- a/src/render/framegraph/qviewport.h +++ b/src/render/framegraph/qviewport.h @@ -41,8 +41,8 @@ #define QT3DRENDER_QVIEWPORT_H #include <Qt3DRender/qframegraphnode.h> -#include <QRectF> -#include <QColor> +#include <QtCore/QRectF> +#include <QtGui/QColor> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h index dd7c63778..c41159d85 100644 --- a/src/render/frontend/qcamera.h +++ b/src/render/frontend/qcamera.h @@ -43,9 +43,9 @@ #include <Qt3DCore/qentity.h> #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qcameralens.h> -#include <QMatrix4x4> -#include <QQuaternion> -#include <QVector3D> +#include <QtGui/QMatrix4x4> +#include <QtGui/QQuaternion> +#include <QtGui/QVector3D> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qcameralens.h b/src/render/frontend/qcameralens.h index fdb0d5868..800928c75 100644 --- a/src/render/frontend/qcameralens.h +++ b/src/render/frontend/qcameralens.h @@ -43,9 +43,9 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DRender/qt3drender_global.h> -#include <QMatrix4x4> -#include <QQuaternion> -#include <QVector3D> +#include <QtGui/QMatrix4x4> +#include <QtGui/QQuaternion> +#include <QtGui/QVector3D> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h index f44685d7e..e1e44289c 100644 --- a/src/render/frontend/qlayer.h +++ b/src/render/frontend/qlayer.h @@ -42,7 +42,7 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DRender/qt3drender_global.h> -#include <QStringList> +#include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h index 2e752d962..203885a9f 100644 --- a/src/render/frontend/qlevelofdetail.h +++ b/src/render/frontend/qlevelofdetail.h @@ -44,7 +44,7 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qlevelofdetailboundingsphere.h> -#include <QVector3D> +#include <QtGui/QVector3D> QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qlevelofdetailboundingsphere.h b/src/render/frontend/qlevelofdetailboundingsphere.h index b35df95e8..43ba422a8 100644 --- a/src/render/frontend/qlevelofdetailboundingsphere.h +++ b/src/render/frontend/qlevelofdetailboundingsphere.h @@ -43,7 +43,7 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DRender/qt3drender_global.h> -#include <QVector3D> +#include <QtGui/QVector3D> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index 7cb5acb0a..c91f4038a 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -42,7 +42,7 @@ #include <Qt3DCore/qnode.h> #include <Qt3DRender/qt3drender_global.h> -#include <QSharedPointer> +#include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qbufferdatagenerator.h b/src/render/geometry/qbufferdatagenerator.h index 702f396d4..004eb26eb 100644 --- a/src/render/geometry/qbufferdatagenerator.h +++ b/src/render/geometry/qbufferdatagenerator.h @@ -42,7 +42,7 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qabstractfunctor.h> -#include <QSharedPointer> +#include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qgeometryfactory.h b/src/render/geometry/qgeometryfactory.h index d5d88a45d..2e4d5c821 100644 --- a/src/render/geometry/qgeometryfactory.h +++ b/src/render/geometry/qgeometryfactory.h @@ -42,7 +42,7 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qabstractfunctor.h> -#include <QSharedPointer> +#include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h index fab76a249..51fdab63a 100644 --- a/src/render/geometry/qmesh.h +++ b/src/render/geometry/qmesh.h @@ -42,7 +42,7 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qgeometryrenderer.h> -#include <QUrl> +#include <QtCore/QUrl> QT_BEGIN_NAMESPACE diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index 31ec47ac0..2790bcccb 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -43,7 +43,7 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qscenechange.h> #include <Qt3DRender/qt3drender_global.h> -#include <QUrl> +#include <QtCore/QUrl> QT_BEGIN_NAMESPACE diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index 33a88b215..24d7686fd 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -43,8 +43,8 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qcomponent.h> -#include <QVector3D> -#include <QColor> +#include <QtGui/QVector3D> +#include <QtGui/QColor> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qfilterkey.h b/src/render/materialsystem/qfilterkey.h index 16db2a9e8..009447c88 100644 --- a/src/render/materialsystem/qfilterkey.h +++ b/src/render/materialsystem/qfilterkey.h @@ -42,7 +42,7 @@ #include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qnode.h> -#include <QVariant> +#include <QtCore/QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qgraphicsapifilter.h b/src/render/materialsystem/qgraphicsapifilter.h index 488d8bd4b..f1d6956b3 100644 --- a/src/render/materialsystem/qgraphicsapifilter.h +++ b/src/render/materialsystem/qgraphicsapifilter.h @@ -40,10 +40,10 @@ #ifndef QT3DRENDER_QGRAPHICSAPIFILTER_H #define QT3DRENDER_QGRAPHICSAPIFILTER_H -#include <QObject> -#include <QStringList> +#include <QtCore/QObject> +#include <QtCore/QStringList> #include <Qt3DRender/qt3drender_global.h> -#include <QSurfaceFormat> +#include <QtGui/QSurfaceFormat> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index e11d30e5c..aa7a9cf8d 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QMATERIAL_H #define QT3DRENDER_QMATERIAL_H -#include <QVariant> +#include <QtCore/QVariant> #include <Qt3DCore/qcomponent.h> #include <Qt3DRender/qt3drender_global.h> diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index c742b5e22..cbf30a5a8 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QPARAMETER_H #define QT3DRENDER_QPARAMETER_H -#include <QVariant> +#include <QtCore/QVariant> #include <Qt3DCore/qnode.h> #include <Qt3DRender/qt3drender_global.h> diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index 9c608d0c4..b19436e90 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -47,7 +47,7 @@ #include <Qt3DRender/qrenderstate.h> #include <Qt3DRender/qfilterkey.h> -#include <QHash> +#include <QtCore/QHash> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index e695d1eb0..7f32e2405 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -42,7 +42,7 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DRender/qt3drender_global.h> -#include <QVector> +#include <QtCore/QVector> QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index cf5c034e8..6bab92a2a 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -44,8 +44,8 @@ #include <Qt3DCore/qnode.h> #include <Qt3DRender/qrenderpass.h> #include <Qt3DRender/qfilterkey.h> -#include <QVector> -#include <QSharedPointer> +#include <QtCore/QVector> +#include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE diff --git a/src/render/picking/qpickevent.h b/src/render/picking/qpickevent.h index 3fbee0d30..7d854043e 100644 --- a/src/render/picking/qpickevent.h +++ b/src/render/picking/qpickevent.h @@ -40,9 +40,9 @@ #ifndef QT3DRENDER_QPICKEVENT_H #define QT3DRENDER_QPICKEVENT_H -#include <QObject> -#include <QVector3D> -#include <QPointF> +#include <QtCore/QObject> +#include <QtGui/QVector3D> +#include <QtCore/QPointF> #include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstenciloperationarguments.h b/src/render/renderstates/qstenciloperationarguments.h index db80ecc19..9705c9822 100644 --- a/src/render/renderstates/qstenciloperationarguments.h +++ b/src/render/renderstates/qstenciloperationarguments.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QSTENCILOPERATIONARGUMENTS_H #define QT3DRENDER_QSTENCILOPERATIONARGUMENTS_H -#include <QObject> +#include <QtCore/QObject> #include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstenciltestarguments.h b/src/render/renderstates/qstenciltestarguments.h index f20885d03..35447d477 100644 --- a/src/render/renderstates/qstenciltestarguments.h +++ b/src/render/renderstates/qstenciltestarguments.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QSTENCILTESTARGUMENTS_H #define QT3DRENDER_QSTENCILTESTARGUMENTS_H -#include <QObject> +#include <QtCore/QObject> #include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/qtexturegenerator.h b/src/render/texture/qtexturegenerator.h index faa9e1c7b..10f0cde57 100644 --- a/src/render/texture/qtexturegenerator.h +++ b/src/render/texture/qtexturegenerator.h @@ -43,7 +43,7 @@ #include <Qt3DRender/qabstractfunctor.h> #include <Qt3DRender/qabstracttexture.h> #include <Qt3DRender/qtexturewrapmode.h> -#include <QSharedPointer> +#include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h index e2ab54a1b..9f1124ee7 100644 --- a/src/render/texture/qtextureimage.h +++ b/src/render/texture/qtextureimage.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QTEXTUREIMAGE_H #define QT3DRENDER_QTEXTUREIMAGE_H -#include <QUrl> +#include <QtCore/QUrl> #include <Qt3DRender/qabstracttextureimage.h> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/qtextureimagedatagenerator.h b/src/render/texture/qtextureimagedatagenerator.h index 5213f3929..0e7e6c782 100644 --- a/src/render/texture/qtextureimagedatagenerator.h +++ b/src/render/texture/qtextureimagedatagenerator.h @@ -41,7 +41,7 @@ #define QT3DRENDER_QTEXTUREIMAGEDATAGENERATOR_H #include <Qt3DRender/qabstractfunctor.h> -#include <QSharedPointer> +#include <QtCore/QSharedPointer> // TO DO TexImageDataPtr -> QImageDataPtr + d_ptr // We might also get rid of the layer, face, mipmap level from diff --git a/src/render/texture/qtexturewrapmode.h b/src/render/texture/qtexturewrapmode.h index 7349e654c..36af013a8 100644 --- a/src/render/texture/qtexturewrapmode.h +++ b/src/render/texture/qtexturewrapmode.h @@ -41,7 +41,7 @@ #define QT3DRENDER_QTEXTUREWRAPMODE_H #include <Qt3DRender/qt3drender_global.h> -#include <QObject> +#include <QtCore/QObject> QT_BEGIN_NAMESPACE |