diff options
17 files changed, 135 insertions, 129 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index b72ee9600..d0afa3a32 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -38,14 +38,16 @@ ****************************************************************************/ #include "qt3dquick3dcoreplugin.h" + #include <Qt3DCore/qtransform.h> -#include <private/quick3dentity_p.h> -#include <private/quick3dentityloader_p.h> -#include <private/quick3dnodeinstantiator_p.h> -#include <private/qquaternionanimation_p.h> -#include <private/qt3dquick_global_p.h> #include <QtCore/qvariantanimation.h> +#include <Qt3DQuick/private/quick3dentity_p.h> +#include <Qt3DQuick/private/quick3dentityloader_p.h> +#include <Qt3DQuick/private/quick3dnodeinstantiator_p.h> +#include <Qt3DQuick/private/qquaternionanimation_p.h> +#include <Qt3DQuick/private/qt3dquick_global_p.h> + QT_BEGIN_NAMESPACE void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 2746c62b2..795e35061 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -38,18 +38,19 @@ ****************************************************************************/ #include "qt3dquick3dextrasplugin.h" -#include <Qt3DExtras/qcuboidmesh.h> + +#include <Qt3DExtras/qconegeometry.h> #include <Qt3DExtras/qconemesh.h> +#include <Qt3DExtras/qcuboidgeometry.h> +#include <Qt3DExtras/qcuboidmesh.h> +#include <Qt3DExtras/qcylindergeometry.h> #include <Qt3DExtras/qcylindermesh.h> +#include <Qt3DExtras/qplanegeometry.h> #include <Qt3DExtras/qplanemesh.h> +#include <Qt3DExtras/qspheregeometry.h> #include <Qt3DExtras/qspheremesh.h> -#include <Qt3DExtras/qtorusmesh.h> #include <Qt3DExtras/qtorusgeometry.h> -#include <Qt3DExtras/qspheregeometry.h> -#include <Qt3DExtras/qcuboidgeometry.h> -#include <Qt3DExtras/qplanegeometry.h> -#include <Qt3DExtras/qconegeometry.h> -#include <Qt3DExtras/qcylindergeometry.h> +#include <Qt3DExtras/qtorusmesh.h> #include <QtQml/qqml.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp index d31680b4d..9d83f964f 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -37,29 +37,31 @@ ** ****************************************************************************/ -#include <QtQml> -#include <Qt3DInput/qkeyboarddevice.h> -#include <Qt3DInput/qkeyboardhandler.h> -#include <Qt3DInput/qkeyevent.h> -#include <Qt3DInput/qmousedevice.h> -#include <Qt3DInput/qmousehandler.h> -#include <Qt3DInput/qmouseevent.h> +#include "qt3dquick3dinputplugin.h" -#include <Qt3DInput/qaxis.h> -#include <Qt3DInput/qaxisaccumulator.h> -#include <Qt3DInput/qaxissetting.h> +#include <Qt3DInput/qabstractphysicaldevice.h> #include <Qt3DInput/qaction.h> #include <Qt3DInput/qactioninput.h> #include <Qt3DInput/qanalogaxisinput.h> +#include <Qt3DInput/qaxis.h> +#include <Qt3DInput/qaxisaccumulator.h> +#include <Qt3DInput/qaxissetting.h> #include <Qt3DInput/qbuttonaxisinput.h> -#include <Qt3DInput/qinputsequence.h> #include <Qt3DInput/qinputchord.h> -#include <Qt3DInput/qlogicaldevice.h> -#include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DInput/qinputsequence.h> #include <Qt3DInput/qinputsettings.h> +#include <Qt3DInput/qkeyboarddevice.h> +#include <Qt3DInput/qkeyboardhandler.h> +#include <Qt3DInput/qkeyevent.h> +#include <Qt3DInput/qlogicaldevice.h> +#include <Qt3DInput/qmousedevice.h> +#include <Qt3DInput/qmouseevent.h> +#include <Qt3DInput/qmousehandler.h> +#include <QtQml> + #include <Qt3DInput/private/qgenericinputdevice_p.h> -#include <Qt3DQuickInput/private/quick3daxis_p.h> #include <Qt3DQuickInput/private/quick3daction_p.h> +#include <Qt3DQuickInput/private/quick3daxis_p.h> #include <Qt3DQuickInput/private/quick3dinputchord_p.h> #include <Qt3DQuickInput/private/quick3dinputsequence_p.h> #include <Qt3DQuickInput/private/quick3dlogicaldevice_p.h> @@ -69,8 +71,6 @@ # include <Qt3DInput/private/qgamepadinput_p.h> #endif -#include "qt3dquick3dinputplugin.h" - QT_BEGIN_NAMESPACE void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) diff --git a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp index 3f96928b7..f97bc8fc6 100644 --- a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp +++ b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp @@ -37,10 +37,11 @@ ** ****************************************************************************/ -#include <QtQml> -#include <Qt3DLogic/qframeaction.h> #include "qt3dquick3dlogicplugin.h" +#include <Qt3DLogic/qframeaction.h> +#include <QtQml> + QT_BEGIN_NAMESPACE void Qt3DQuick3DLogicPlugin::registerTypes(const char *uri) diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 2e68893d6..cdffa9734 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -39,89 +39,91 @@ ****************************************************************************/ #include "qt3dquick3drenderplugin.h" -#include <Qt3DRender/qsceneloader.h> -#include <Qt3DRender/qmesh.h> -#include <Qt3DRender/qrenderpass.h> -#include <Qt3DRender/qshaderprogram.h> -#include <Qt3DRender/qviewport.h> -#include <Qt3DRender/qrenderpassfilter.h> -#include <Qt3DRender/qtechniquefilter.h> -#include <Qt3DRender/qrendertargetselector.h> -#include <Qt3DRender/qrendersurfaceselector.h> -#include <Qt3DRender/qtexture.h> -#include <Qt3DRender/qtechnique.h> -#include <Qt3DRender/qcameraselector.h> -#include <Qt3DRender/qeffect.h> -#include <Qt3DRender/qparameter.h> -#include <Qt3DRender/qfilterkey.h> -#include <Qt3DRender/qlayer.h> + #include <Qt3DRender/qabstractlight.h> -#include <Qt3DRender/qspotlight.h> -#include <Qt3DRender/qdirectionallight.h> -#include <Qt3DRender/qpointlight.h> -#include <Qt3DRender/qgraphicsapifilter.h> -#include <Qt3DRender/qrenderstate.h> -#include <Qt3DRender/qblendequationarguments.h> -#include <Qt3DRender/qblendequation.h> +#include <Qt3DRender/qalphacoverage.h> #include <Qt3DRender/qalphatest.h> -#include <Qt3DRender/qdepthtest.h> -#include <Qt3DRender/qnodepthmask.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qblendequation.h> +#include <Qt3DRender/qblendequationarguments.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qcamera.h> +#include <Qt3DRender/qcameralens.h> +#include <Qt3DRender/qcameraselector.h> +#include <Qt3DRender/qclearbuffers.h> +#include <Qt3DRender/qclipplane.h> +#include <Qt3DRender/qcolormask.h> +#include <Qt3DRender/qcomputecommand.h> #include <Qt3DRender/qcullface.h> -#include <Qt3DRender/qfrontface.h> -#include <Qt3DRender/qstenciltest.h> -#include <Qt3DRender/qstenciltestarguments.h> -#include <Qt3DRender/qscissortest.h> +#include <Qt3DRender/qdepthtest.h> +#include <Qt3DRender/qdirectionallight.h> +#include <Qt3DRender/qdispatchcompute.h> #include <Qt3DRender/qdithering.h> -#include <Qt3DRender/qrendertargetoutput.h> -#include <Qt3DRender/qclearbuffers.h> -#include <Qt3DRender/qalphacoverage.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qfilterkey.h> +#include <Qt3DRender/qfrontface.h> +#include <Qt3DRender/qfrustumculling.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/qgraphicsapifilter.h> +#include <Qt3DRender/qlayer.h> +#include <Qt3DRender/qmesh.h> #include <Qt3DRender/qmultisampleantialiasing.h> +#include <Qt3DRender/qnodepthmask.h> +#include <Qt3DRender/qnodraw.h> +#include <Qt3DRender/qobjectpicker.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qpickevent.h> +#include <Qt3DRender/qpickingsettings.h> +#include <Qt3DRender/qpointlight.h> #include <Qt3DRender/qpointsize.h> #include <Qt3DRender/qpolygonoffset.h> -#include <Qt3DRender/qcolormask.h> -#include <Qt3DRender/qshaderdata.h> -#include <Qt3DRender/qnodraw.h> -#include <Qt3DRender/qclipplane.h> +#include <Qt3DRender/qrendercapture.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qrenderpassfilter.h> +#include <Qt3DRender/qrendersettings.h> +#include <Qt3DRender/qrenderstate.h> +#include <Qt3DRender/qrendersurfaceselector.h> +#include <Qt3DRender/qrendertargetoutput.h> +#include <Qt3DRender/qrendertargetselector.h> +#include <Qt3DRender/qsceneloader.h> +#include <Qt3DRender/qscissortest.h> #include <Qt3DRender/qseamlesscubemap.h> +#include <Qt3DRender/qshaderdata.h> +#include <Qt3DRender/qshaderprogram.h> #include <Qt3DRender/qsortpolicy.h> +#include <Qt3DRender/qspotlight.h> +#include <Qt3DRender/qstencilmask.h> #include <Qt3DRender/qstenciloperation.h> #include <Qt3DRender/qstenciloperationarguments.h> -#include <Qt3DRender/qstencilmask.h> -#include <Qt3DRender/qattribute.h> -#include <Qt3DRender/qbuffer.h> -#include <Qt3DRender/qgeometry.h> -#include <Qt3DRender/qgeometryrenderer.h> -#include <Qt3DRender/qobjectpicker.h> -#include <Qt3DRender/qpickevent.h> -#include <Qt3DRender/qfrustumculling.h> -#include <Qt3DRender/qdispatchcompute.h> -#include <Qt3DRender/qcomputecommand.h> -#include <Qt3DRender/qcameralens.h> -#include <Qt3DRender/qcamera.h> -#include <Qt3DRender/qrendersettings.h> -#include <Qt3DRender/qpickingsettings.h> -#include <Qt3DRender/qrendercapture.h> +#include <Qt3DRender/qstenciltest.h> +#include <Qt3DRender/qstenciltestarguments.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qtechniquefilter.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qviewport.h> +#include <QtGui/qwindow.h> + +#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> +#include <Qt3DQuickRender/private/quick3dbuffer_p.h> +#include <Qt3DQuickRender/private/quick3deffect_p.h> +#include <Qt3DQuickRender/private/quick3dgeometry_p.h> #include <Qt3DQuickRender/private/quick3dlayerfilter_p.h> -#include <Qt3DQuickRender/private/quick3dtechnique_p.h> #include <Qt3DQuickRender/private/quick3dmaterial_p.h> -#include <Qt3DQuickRender/private/quick3dtechniquefilter_p.h> -#include <Qt3DQuickRender/private/quick3dviewport_p.h> +#include <Qt3DQuickRender/private/quick3dparameter_p.h> +#include <Qt3DQuickRender/private/quick3drenderpass_p.h> #include <Qt3DQuickRender/private/quick3drenderpassfilter_p.h> #include <Qt3DQuickRender/private/quick3drendertargetoutput_p.h> -#include <Qt3DQuickRender/private/quick3deffect_p.h> +#include <Qt3DQuickRender/private/quick3drendertargetselector_p.h> #include <Qt3DQuickRender/private/quick3dscene_p.h> -#include <Qt3DQuickRender/private/quick3dtexture_p.h> -#include <Qt3DQuickRender/private/quick3drenderpass_p.h> -#include <Qt3DQuickRender/private/quick3dparameter_p.h> #include <Qt3DQuickRender/private/quick3dshaderdata_p.h> #include <Qt3DQuickRender/private/quick3dshaderdataarray_p.h> #include <Qt3DQuickRender/private/quick3dstateset_p.h> -#include <Qt3DQuickRender/private/quick3drendertargetselector_p.h> -#include <Qt3DQuickRender/private/quick3dgeometry_p.h> -#include <Qt3DQuickRender/private/quick3dbuffer_p.h> -#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> +#include <Qt3DQuickRender/private/quick3dtechnique_p.h> +#include <Qt3DQuickRender/private/quick3dtechniquefilter_p.h> +#include <Qt3DQuickRender/private/quick3dtexture_p.h> +#include <Qt3DQuickRender/private/quick3dviewport_p.h> -#include <QtGui/qwindow.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp index 7103a1bb8..6b9ec96f8 100644 --- a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp +++ b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp @@ -37,9 +37,11 @@ ** ****************************************************************************/ -#include <QtQml> #include "qtquickscene3dplugin.h" -#include "scene3ditem_p.h" + +#include <QtQml> + +#include <scene3ditem_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/imports/scene3d/scene3dcleaner.cpp b/src/quick3d/imports/scene3d/scene3dcleaner.cpp index 06b795c8a..ec371410d 100644 --- a/src/quick3d/imports/scene3d/scene3dcleaner.cpp +++ b/src/quick3d/imports/scene3d/scene3dcleaner.cpp @@ -38,13 +38,13 @@ ****************************************************************************/ #include "scene3dcleaner_p.h" -#include "scene3dlogging_p.h" -#include "scene3drenderer_p.h" #include <Qt3DCore/qaspectengine.h> - #include <QtCore/qthread.h> +#include <scene3dlogging_p.h> +#include <scene3drenderer_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/imports/scene3d/scene3dcleaner_p.h b/src/quick3d/imports/scene3d/scene3dcleaner_p.h index 6ec2c7e6b..a246cbde7 100644 --- a/src/quick3d/imports/scene3d/scene3dcleaner_p.h +++ b/src/quick3d/imports/scene3d/scene3dcleaner_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QObject> +#include <QtCore/QObject> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index 4a5c959c4..fdb908aaa 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -38,24 +38,23 @@ ****************************************************************************/ #include "scene3ditem_p.h" -#include "scene3dcleaner_p.h" -#include "scene3dlogging_p.h" -#include "scene3drenderer_p.h" -#include "scene3dsgnode_p.h" #include <Qt3DCore/QAspectEngine> #include <Qt3DCore/qentity.h> -#include <Qt3DRender/qcamera.h> -#include <Qt3DRender/QRenderAspect> -#include <Qt3DRender/qrendersurfaceselector.h> -#include <Qt3DRender/private/qrendersurfaceselector_p.h> #include <Qt3DInput/QInputAspect> #include <Qt3DInput/qinputsettings.h> #include <Qt3DLogic/qlogicaspect.h> - - +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/qcamera.h> +#include <Qt3DRender/qrendersurfaceselector.h> #include <QtQuick/qquickwindow.h> +#include <Qt3DRender/private/qrendersurfaceselector_p.h> +#include <scene3dcleaner_p.h> +#include <scene3dlogging_p.h> +#include <scene3drenderer_p.h> +#include <scene3dsgnode_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h index 09859a763..f3d452d3d 100644 --- a/src/quick3d/imports/scene3d/scene3ditem_p.h +++ b/src/quick3d/imports/scene3d/scene3ditem_p.h @@ -51,8 +51,8 @@ // We mean it. // -#include <QQuickItem> #include <QtCore/qpointer.h> +#include <QtQuick/QQuickItem> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/imports/scene3d/scene3dlogging_p.h b/src/quick3d/imports/scene3d/scene3dlogging_p.h index 0f9448d42..91430939f 100644 --- a/src/quick3d/imports/scene3d/scene3dlogging_p.h +++ b/src/quick3d/imports/scene3d/scene3dlogging_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QLoggingCategory> +#include <QtCore/QLoggingCategory> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index 3065b19ac..0ef6c532e 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -38,22 +38,20 @@ ****************************************************************************/ #include "scene3drenderer_p.h" -#include "scene3dcleaner_p.h" -#include "scene3ditem_p.h" -#include "scene3dlogging_p.h" -#include "scene3dsgnode_p.h" -#include <Qt3DRender/qrenderaspect.h> -#include <Qt3DRender/private/qrenderaspect_p.h> #include <Qt3DCore/qaspectengine.h> -#include <Qt3DCore/private/qaspectengine_p.h> - -#include <QtQuick/qquickwindow.h> - +#include <Qt3DRender/qrenderaspect.h> +#include <QtCore/qthread.h> #include <QtGui/qopenglcontext.h> #include <QtGui/qopenglframebufferobject.h> +#include <QtQuick/qquickwindow.h> -#include <QtCore/qthread.h> +#include <Qt3DRender/private/qrenderaspect_p.h> +#include <Qt3DCore/private/qaspectengine_p.h> +#include <scene3dcleaner_p.h> +#include <scene3ditem_p.h> +#include <scene3dlogging_p.h> +#include <scene3dsgnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/imports/scene3d/scene3drenderer_p.h b/src/quick3d/imports/scene3d/scene3drenderer_p.h index 9ff5e7f36..f28501f31 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer_p.h +++ b/src/quick3d/imports/scene3d/scene3drenderer_p.h @@ -51,8 +51,7 @@ // We mean it. // -#include <QObject> - +#include <QtCore/QObject> #include <QtCore/qsize.h> QT_BEGIN_NAMESPACE diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h index f3817dc05..df431e452 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h +++ b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h @@ -52,10 +52,10 @@ // #include <QtQuick/QSGMaterial> -#include "scene3dsgmaterialshader_p.h" - #include <QtQuick/qsgtexture.h> +#include <scene3dsgmaterialshader_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp index 5ce0f4d60..8de5f922b 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp +++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp @@ -38,12 +38,13 @@ ****************************************************************************/ #include "scene3dsgmaterialshader_p.h" -#include "scene3dsgmaterial_p.h" #include <QtGui/qopenglcontext.h> #include <QtGui/qopenglfunctions.h> #include <QtGui/qsurfaceformat.h> +#include <scene3dsgmaterial_p.h> + QT_BEGIN_NAMESPACE namespace { diff --git a/src/quick3d/imports/scene3d/scene3dsgnode.cpp b/src/quick3d/imports/scene3d/scene3dsgnode.cpp index ae0a07350..8806b59a9 100644 --- a/src/quick3d/imports/scene3d/scene3dsgnode.cpp +++ b/src/quick3d/imports/scene3d/scene3dsgnode.cpp @@ -38,10 +38,11 @@ ****************************************************************************/ #include "scene3dsgnode_p.h" -#include "scene3dlogging_p.h" #include <QtCore/qthread.h> +#include <scene3dlogging_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DRender { diff --git a/src/quick3d/imports/scene3d/scene3dsgnode_p.h b/src/quick3d/imports/scene3d/scene3dsgnode_p.h index f7b21e2b9..68b68eea5 100644 --- a/src/quick3d/imports/scene3d/scene3dsgnode_p.h +++ b/src/quick3d/imports/scene3d/scene3dsgnode_p.h @@ -53,7 +53,7 @@ #include <QtQuick/QSGGeometryNode> -#include "scene3dsgmaterial_p.h" +#include <scene3dsgmaterial_p.h> QT_BEGIN_NAMESPACE |