From 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 12 Oct 2015 20:45:19 +0100 Subject: Move Qt3DCore into Qt3DCore namespace Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire --- examples/qt3d/anaglyph-rendering/main.cpp | 2 +- examples/qt3d/assimp-cpp/main.cpp | 26 +-- examples/qt3d/assimp/main.cpp | 8 +- examples/qt3d/basicshapes-cpp/main.cpp | 6 +- examples/qt3d/basicshapes-cpp/scenemodifier.cpp | 38 ++-- examples/qt3d/basicshapes-cpp/scenemodifier.h | 12 +- examples/qt3d/bigmodel-qml/main.cpp | 2 +- examples/qt3d/bigscene-cpp/main.cpp | 6 +- examples/qt3d/bigscene-instanced-qml/main.cpp | 2 +- examples/qt3d/clip-planes-qml/main.cpp | 2 +- examples/qt3d/cpp_example/main.cpp | 20 +- examples/qt3d/custom-mesh-cpp/main.cpp | 12 +- examples/qt3d/cylinder-cpp/main.cpp | 14 +- examples/qt3d/cylinder-qml/main.cpp | 2 +- .../deferred-renderer-cpp/deferredrenderer.cpp | 4 +- .../qt3d/deferred-renderer-cpp/deferredrenderer.h | 4 +- .../qt3d/deferred-renderer-cpp/finaleffect.cpp | 2 +- examples/qt3d/deferred-renderer-cpp/finaleffect.h | 2 +- examples/qt3d/deferred-renderer-cpp/gbuffer.cpp | 2 +- examples/qt3d/deferred-renderer-cpp/gbuffer.h | 2 +- examples/qt3d/deferred-renderer-cpp/main.cpp | 20 +- .../qt3d/deferred-renderer-cpp/pointlightblock.cpp | 2 +- .../qt3d/deferred-renderer-cpp/pointlightblock.h | 2 +- .../qt3d/deferred-renderer-cpp/sceneeffect.cpp | 2 +- examples/qt3d/deferred-renderer-cpp/sceneeffect.h | 2 +- examples/qt3d/deferred-renderer-qml/main.cpp | 2 +- examples/qt3d/dynamicscene-cpp/boxentity.cpp | 6 +- examples/qt3d/dynamicscene-cpp/boxentity.h | 8 +- examples/qt3d/dynamicscene-cpp/examplescene.cpp | 4 +- examples/qt3d/dynamicscene-cpp/examplescene.h | 4 +- examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp | 4 +- examples/qt3d/dynamicscene-cpp/forwardrenderer.h | 4 +- examples/qt3d/dynamicscene-cpp/main.cpp | 6 +- examples/qt3d/enabled-qml/main.cpp | 2 +- examples/qt3d/gltf/main.cpp | 2 +- examples/qt3d/gooch-qml/main.cpp | 2 +- examples/qt3d/keyboardinput-qml/main.cpp | 2 +- examples/qt3d/loader-qml/main.cpp | 2 +- examples/qt3d/materials-cpp/barrel.cpp | 2 +- examples/qt3d/materials-cpp/barrel.h | 2 +- examples/qt3d/materials-cpp/houseplant.cpp | 4 +- examples/qt3d/materials-cpp/houseplant.h | 4 +- examples/qt3d/materials-cpp/main.cpp | 8 +- examples/qt3d/materials-cpp/planeentity.cpp | 14 +- examples/qt3d/materials-cpp/planeentity.h | 14 +- examples/qt3d/materials-cpp/renderableentity.cpp | 18 +- examples/qt3d/materials-cpp/renderableentity.h | 18 +- .../qt3d/materials-cpp/rotatingtrefoilknot.cpp | 2 +- examples/qt3d/materials-cpp/rotatingtrefoilknot.h | 2 +- examples/qt3d/materials-cpp/trefoilknot.cpp | 22 +- examples/qt3d/materials-cpp/trefoilknot.h | 22 +- examples/qt3d/materials/main.cpp | 2 +- examples/qt3d/mouseinput-qml/main.cpp | 2 +- examples/qt3d/multiviewport/main.cpp | 2 +- examples/qt3d/plasma/main.cpp | 2 +- examples/qt3d/playground-qml/main.cpp | 2 +- examples/qt3d/shadow-map-qml/main.cpp | 2 +- examples/qt3d/simple-cpp/main.cpp | 20 +- examples/qt3d/simple-qml/main.cpp | 2 +- examples/qt3d/simple-shaders-qml/main.cpp | 2 +- examples/qt3d/skybox/main.cpp | 2 +- examples/qt3d/tessellation-modes/main.cpp | 2 +- .../tessellation-modes/tessellatedquadmesh.cpp | 4 +- .../qt3d/tessellation-modes/tessellatedquadmesh.h | 2 +- examples/qt3d/torus-qml/main.cpp | 2 +- examples/qt3d/transparency-qml/main.cpp | 2 +- examples/qt3d/wave/main.cpp | 2 +- examples/qt3d/wireframe/main.cpp | 2 +- src/collision/qabstractcollider.cpp | 2 +- src/collision/qabstractcollider.h | 2 +- src/collision/qabstractcollider_p.h | 2 +- src/collision/qboxcollider.cpp | 6 +- src/collision/qcapsulecollider.cpp | 6 +- src/collision/qcollisionaspect.cpp | 28 +-- src/collision/qcollisionaspect.h | 12 +- src/collision/qcollisionaspect_p.h | 2 +- src/collision/qspherecollider.cpp | 6 +- src/core/aspects/qabstractaspect.cpp | 8 +- src/core/aspects/qabstractaspect.h | 10 +- src/core/aspects/qabstractaspect_p.h | 8 +- src/core/aspects/qaspectengine.cpp | 24 +- src/core/aspects/qaspectengine.h | 10 +- src/core/aspects/qaspectengine_p.h | 8 +- src/core/aspects/qaspectfactory.cpp | 6 +- src/core/aspects/qaspectfactory.h | 14 +- src/core/aspects/qaspectfactory_p.h | 8 +- src/core/aspects/qaspectmanager.cpp | 6 +- src/core/aspects/qaspectmanager_p.h | 14 +- src/core/aspects/qaspectthread.cpp | 4 +- src/core/aspects/qaspectthread.h | 10 +- src/core/bounds/qaxisalignedboundingbox.cpp | 4 +- src/core/bounds/qaxisalignedboundingbox.h | 10 +- src/core/core-components/qcamera.cpp | 34 +-- src/core/core-components/qcamera.h | 12 +- src/core/core-components/qcamera_p.h | 10 +- src/core/core-components/qcameralens.cpp | 58 ++--- src/core/core-components/qcameralens.h | 6 +- src/core/core-components/qcameralens_p.h | 10 +- src/core/corelogging.cpp | 2 +- src/core/corelogging_p.h | 8 +- src/core/io/qabstractattribute.cpp | 6 +- src/core/io/qabstractattribute.h | 10 +- src/core/io/qabstractattribute_p.h | 8 +- src/core/io/qabstractbuffer.cpp | 6 +- src/core/io/qabstractbuffer.h | 8 +- src/core/io/qabstractbuffer_p.h | 8 +- src/core/io/qurlhelper.cpp | 2 +- src/core/io/qurlhelper_p.h | 8 +- src/core/jobs/dependencyhandler.cpp | 4 +- src/core/jobs/dependencyhandler_p.h | 16 +- src/core/jobs/qabstractaspectjobmanager.cpp | 4 +- src/core/jobs/qabstractaspectjobmanager_p.h | 4 +- src/core/jobs/qaspectjob.cpp | 6 +- src/core/jobs/qaspectjob.h | 10 +- src/core/jobs/qaspectjob_p.h | 8 +- src/core/jobs/qaspectjobmanager.cpp | 6 +- src/core/jobs/qaspectjobmanager_p.h | 10 +- src/core/jobs/qaspectjobproviderinterface.h | 8 +- src/core/jobs/qthreadpooler.cpp | 6 +- src/core/jobs/qthreadpooler_p.h | 10 +- src/core/jobs/task.cpp | 4 +- src/core/jobs/task_p.h | 10 +- src/core/jobs/weaverjob.cpp | 4 +- src/core/jobs/weaverjob_p.h | 10 +- src/core/nodes/propertychangehandler_p.h | 2 +- src/core/nodes/qabstractnodefactory.cpp | 4 +- src/core/nodes/qabstractnodefactory.h | 4 +- src/core/nodes/qbackendnode.cpp | 4 +- src/core/nodes/qbackendnode.h | 8 +- src/core/nodes/qbackendnode_p.h | 8 +- src/core/nodes/qcomponent.cpp | 32 +-- src/core/nodes/qcomponent.h | 10 +- src/core/nodes/qcomponent_p.h | 8 +- src/core/nodes/qentity.cpp | 46 ++-- src/core/nodes/qentity.h | 10 +- src/core/nodes/qentity_p.h | 8 +- src/core/nodes/qnode.cpp | 60 ++--- src/core/nodes/qnode.h | 18 +- src/core/nodes/qnode_p.h | 10 +- src/core/nodes/qnodeid.cpp | 2 +- src/core/nodes/qnodeid.h | 12 +- src/core/nodes/qnodevisitor.cpp | 4 +- src/core/nodes/qnodevisitor.h | 10 +- src/core/qabstractfunctor.cpp | 2 +- src/core/qabstractfunctor.h | 10 +- src/core/qbackendnodefactory.cpp | 4 +- src/core/qbackendnodefactory.h | 10 +- src/core/qbackendscenepropertychange.cpp | 6 +- src/core/qbackendscenepropertychange.h | 8 +- src/core/qbackendscenepropertychange_p.h | 8 +- src/core/qboundingsphere.cpp | 4 +- src/core/qboundingsphere.h | 10 +- src/core/qboundingvolume.cpp | 4 +- src/core/qboundingvolume.h | 12 +- src/core/qboundingvolumeprovider.cpp | 2 +- src/core/qboundingvolumeprovider.h | 10 +- src/core/qchangearbiter.cpp | 6 +- src/core/qchangearbiter_p.h | 16 +- src/core/qlockableobserverinterface.cpp | 4 +- src/core/qlockableobserverinterface_p.h | 12 +- src/core/qobservableinterface.cpp | 4 +- src/core/qobservableinterface_p.h | 10 +- src/core/qobserverinterface.cpp | 4 +- src/core/qobserverinterface_p.h | 12 +- src/core/qpostman.cpp | 2 +- src/core/qpostman_p.h | 10 +- src/core/qray3d.cpp | 4 +- src/core/qray3d.h | 20 +- src/core/qscene.cpp | 2 +- src/core/qscene_p.h | 14 +- src/core/qscenechange.cpp | 6 +- src/core/qscenechange.h | 10 +- src/core/qscenechange_p.h | 8 +- src/core/qsceneobserverinterface.cpp | 2 +- src/core/qsceneobserverinterface.h | 10 +- src/core/qscenepropertychange.cpp | 6 +- src/core/qscenepropertychange.h | 10 +- src/core/qscenepropertychange_p.h | 8 +- src/core/qscheduler.cpp | 4 +- src/core/qscheduler_p.h | 10 +- src/core/qtickclock.cpp | 6 +- src/core/qtickclock_p.h | 10 +- src/core/resources/qboundedcircularbuffer_p.h | 8 +- src/core/resources/qcircularbuffer_p.h | 8 +- src/core/resources/qframeallocator.cpp | 6 +- src/core/resources/qframeallocator.h | 6 +- src/core/resources/qframeallocator_p.h | 8 +- src/core/resources/qhandle.h | 8 +- src/core/resources/qhandlemanager.h | 8 +- src/core/resources/qresourcemanager.cpp | 8 +- src/core/resources/qresourcemanager_p.h | 12 +- src/core/services/nullservices_p.h | 10 +- .../services/qabstractcollisionqueryservice.cpp | 2 +- src/core/services/qabstractcollisionqueryservice.h | 10 +- .../services/qabstractcollisionqueryservice_p.h | 8 +- src/core/services/qabstractframeadvanceservice.cpp | 12 +- src/core/services/qabstractframeadvanceservice.h | 8 +- src/core/services/qabstractframeadvanceservice_p.h | 8 +- src/core/services/qabstractserviceprovider_p.h | 10 +- src/core/services/qcollisionqueryresult.cpp | 2 +- src/core/services/qcollisionqueryresult.h | 8 +- src/core/services/qcollisionqueryresult_p.h | 8 +- src/core/services/qopenglinformationservice.cpp | 10 +- src/core/services/qopenglinformationservice.h | 10 +- src/core/services/qopenglinformationservice_p.h | 8 +- src/core/services/qservicelocator.cpp | 20 +- src/core/services/qservicelocator.h | 8 +- src/core/services/qsysteminformationservice.cpp | 10 +- src/core/services/qsysteminformationservice.h | 10 +- src/core/services/qsysteminformationservice_p.h | 8 +- src/core/services/qtickclockservice.cpp | 10 +- src/core/services/qtickclockservice_p.h | 8 +- src/core/transforms/qabstracttransform.cpp | 6 +- src/core/transforms/qabstracttransform.h | 10 +- src/core/transforms/qabstracttransform_p.h | 8 +- src/core/transforms/qlookattransform.cpp | 6 +- src/core/transforms/qlookattransform.h | 12 +- src/core/transforms/qlookattransform_p.h | 8 +- src/core/transforms/qmatrixtransform.cpp | 10 +- src/core/transforms/qmatrixtransform.h | 12 +- src/core/transforms/qmatrixtransform_p.h | 8 +- src/core/transforms/qrotatetransform.cpp | 8 +- src/core/transforms/qrotatetransform.h | 10 +- src/core/transforms/qrotatetransform_p.h | 8 +- src/core/transforms/qscaletransform.cpp | 4 +- src/core/transforms/qscaletransform.h | 8 +- src/core/transforms/qscaletransform_p.h | 8 +- src/core/transforms/qtransform.cpp | 6 +- src/core/transforms/qtransform.h | 10 +- src/core/transforms/qtransform_p.h | 10 +- src/core/transforms/qtranslatetransform.cpp | 6 +- src/core/transforms/qtranslatetransform.h | 10 +- src/core/transforms/qtranslatetransform_p.h | 8 +- src/input/assignkeyboardfocusjob.cpp | 2 +- src/input/assignkeyboardfocusjob_p.h | 6 +- src/input/cameracontroller.cpp | 6 +- src/input/cameracontroller_p.h | 10 +- src/input/handle_types_p.h | 8 +- src/input/inputhandler.cpp | 6 +- src/input/inputhandler_p.h | 4 +- src/input/inputmanagers_p.h | 24 +- src/input/keyboardcontroller.cpp | 18 +- src/input/keyboardcontroller_p.h | 34 +-- src/input/keyboardinput.cpp | 6 +- src/input/keyboardinput_p.h | 20 +- src/input/keyeventdispatcherjob.cpp | 2 +- src/input/keyeventdispatcherjob_p.h | 6 +- src/input/mousecontroller.cpp | 16 +- src/input/mousecontroller_p.h | 22 +- src/input/mouseeventdispatcherjob.cpp | 2 +- src/input/mouseeventdispatcherjob_p.h | 6 +- src/input/mouseinput.cpp | 16 +- src/input/mouseinput_p.h | 20 +- src/input/q3dkeyevent.cpp | 4 +- src/input/q3dmouseevent.cpp | 38 ++-- src/input/qinputaspect.cpp | 14 +- src/input/qinputaspect.h | 20 +- src/input/qinputaspect_p.h | 2 +- src/input/qkeyboardcontroller.cpp | 10 +- src/input/qkeyboardcontroller.h | 4 +- src/input/qkeyboardcontroller_p.h | 2 +- src/input/qkeyboardinput.cpp | 10 +- src/input/qkeyboardinput.h | 6 +- src/input/qkeyboardinput_p.h | 2 +- src/input/qmousecontroller.cpp | 10 +- src/input/qmousecontroller.h | 8 +- src/input/qmousecontroller_p.h | 2 +- src/input/qmouseinput.cpp | 20 +- src/input/qmouseinput.h | 8 +- src/input/qmouseinput_p.h | 2 +- src/logic/callbackjob_p.h | 4 +- src/logic/executor.cpp | 6 +- src/logic/executor_p.h | 12 +- src/logic/handle_types_p.h | 4 +- src/logic/handler.cpp | 12 +- src/logic/handler_p.h | 16 +- src/logic/manager.cpp | 2 +- src/logic/manager_p.h | 4 +- src/logic/managers_p.h | 8 +- src/logic/qlogicaspect.cpp | 12 +- src/logic/qlogicaspect.h | 12 +- src/logic/qlogicaspect_p.h | 2 +- src/logic/qlogiccomponent.cpp | 6 +- src/logic/qlogiccomponent.h | 4 +- src/logic/qlogiccomponent_p.h | 2 +- src/plugins/sceneparsers/assimp/assimpparser.cpp | 16 +- src/plugins/sceneparsers/assimp/assimpparser_p.h | 10 +- src/plugins/sceneparsers/gltf/gltfparser.cpp | 14 +- src/plugins/sceneparsers/gltf/gltfparser_p.h | 12 +- src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | 34 +-- .../imports/render/qt3dquick3drendererplugin.cpp | 6 +- src/quick3d/imports/scene3d/scene3ditem.cpp | 48 ++-- src/quick3d/imports/scene3d/scene3ditem_p.h | 12 +- src/quick3d/quick3d/items/quick3dconfiguration.cpp | 10 +- src/quick3d/quick3d/items/quick3dconfiguration.h | 9 +- src/quick3d/quick3d/items/quick3dentity.cpp | 12 +- src/quick3d/quick3d/items/quick3dentity.h | 19 +- src/quick3d/quick3d/items/quick3dentityloader.cpp | 14 +- src/quick3d/quick3d/items/quick3dentityloader.h | 7 +- src/quick3d/quick3d/items/quick3dentityloader_p.h | 7 +- src/quick3d/quick3d/items/quick3dnode.cpp | 20 +- src/quick3d/quick3d/items/quick3dnode.h | 20 +- .../quick3d/items/quick3dnodeinstantiator.cpp | 24 +- .../quick3d/items/quick3dnodeinstantiator_p.h | 4 +- .../quick3d/items/quick3dnodeinstantiator_p_p.h | 4 +- src/quick3d/quick3d/items/quick3dtransform.cpp | 14 +- src/quick3d/quick3d/items/quick3dtransform.h | 21 +- src/quick3d/quick3d/qqmlaspectengine.cpp | 10 +- src/quick3d/quick3d/qqmlaspectengine.h | 8 +- src/quick3d/quick3d/qqmlaspectengine_p.h | 8 +- src/quick3d/quick3d/qt3dquick_global.cpp | 10 +- src/quick3d/quick3d/qt3dquick_global_p.h | 8 +- src/quick3d/quick3d/qt3dquicknodefactory.cpp | 4 +- src/quick3d/quick3d/qt3dquicknodefactory_p.h | 4 +- src/quick3d/quick3d/qt3dquickvaluetypes.cpp | 8 +- src/quick3d/quick3d/qt3dquickvaluetypes_p.h | 9 +- .../quick3drenderer/items/quick3dgeometry.cpp | 18 +- .../quick3drenderer/items/quick3dgeometry.h | 16 +- .../quick3drenderer/items/quick3drenderpass.h | 2 +- .../quick3drenderer/items/quick3dshaderdata.cpp | 4 +- .../quick3drenderer/items/quick3dshaderdata.h | 2 +- .../items/quick3dshaderdataarray.cpp | 2 +- .../quick3drenderer/items/quick3dshaderdataarray.h | 6 +- .../quick3drenderer/qt3dquickrenderer_global.cpp | 2 +- .../qt3dquickrenderernodefactory.cpp | 4 +- .../qt3dquickrenderernodefactory_p.h | 6 +- src/render/backend/attachmentpack_p.h | 2 +- src/render/backend/cameralens.cpp | 6 +- src/render/backend/cameralens_p.h | 6 +- src/render/backend/entity.cpp | 38 ++-- src/render/backend/entity_p.h | 60 ++--- src/render/backend/handle_types_p.h | 52 ++--- src/render/backend/layer.cpp | 6 +- src/render/backend/layer_p.h | 6 +- src/render/backend/managers_p.h | 160 +++++++------- src/render/backend/nodefunctor_p.h | 8 +- src/render/backend/parameterpack.cpp | 6 +- src/render/backend/parameterpack_p.h | 8 +- src/render/backend/quniformvalue.cpp | 4 +- src/render/backend/quniformvalue_p.h | 18 +- src/render/backend/renderattachment.cpp | 8 +- src/render/backend/renderattachment_p.h | 10 +- src/render/backend/renderer.cpp | 18 +- src/render/backend/renderer_p.h | 24 +- src/render/backend/rendertarget.cpp | 8 +- src/render/backend/rendertarget_p.h | 14 +- src/render/backend/renderview.cpp | 2 +- src/render/backend/renderview_p.h | 10 +- src/render/backend/transform.cpp | 8 +- src/render/backend/transform_p.h | 6 +- src/render/defaults/qdiffusemapmaterial.h | 2 +- src/render/defaults/qdiffusespecularmapmaterial.h | 2 +- src/render/defaults/qforwardrenderer.cpp | 4 +- src/render/defaults/qforwardrenderer.h | 8 +- src/render/defaults/qgoochmaterial.cpp | 20 +- src/render/defaults/qgoochmaterial.h | 4 +- .../defaults/qnormaldiffusemapalphamaterial.h | 2 +- src/render/defaults/qnormaldiffusemapmaterial.h | 4 +- .../defaults/qnormaldiffusespecularmapmaterial.h | 4 +- src/render/defaults/qpervertexcolormaterial.h | 2 +- src/render/defaults/qphongmaterial.h | 2 +- src/render/defaults/qskyboxentity.cpp | 14 +- src/render/defaults/qskyboxentity.h | 4 +- src/render/defaults/qskyboxentity_p.h | 8 +- src/render/framegraph/cameraselectornode.cpp | 6 +- src/render/framegraph/cameraselectornode_p.h | 8 +- src/render/framegraph/clearbuffer.cpp | 6 +- src/render/framegraph/clearbuffer_p.h | 4 +- src/render/framegraph/framegraphnode.cpp | 6 +- src/render/framegraph/framegraphnode_p.h | 20 +- .../framegraph/framegraphsubtreeselector.cpp | 4 +- .../framegraph/framegraphsubtreeselector_p.h | 4 +- src/render/framegraph/framegraphvisitor.cpp | 4 +- src/render/framegraph/framegraphvisitor_p.h | 4 +- src/render/framegraph/layerfilternode.cpp | 6 +- src/render/framegraph/layerfilternode_p.h | 4 +- src/render/framegraph/nodraw.cpp | 6 +- src/render/framegraph/nodraw_p.h | 4 +- src/render/framegraph/qcameraselector.cpp | 10 +- src/render/framegraph/qcameraselector.h | 12 +- src/render/framegraph/qcameraselector_p.h | 2 +- src/render/framegraph/qclearbuffer.h | 6 +- src/render/framegraph/qframegraph.h | 8 +- src/render/framegraph/qframegraph_p.h | 2 +- src/render/framegraph/qframegraphnode.cpp | 2 +- src/render/framegraph/qframegraphnode.h | 6 +- src/render/framegraph/qframegraphnode_p.h | 2 +- src/render/framegraph/qframegraphselector.h | 4 +- src/render/framegraph/qlayerfilter.h | 6 +- src/render/framegraph/qnodraw.cpp | 6 +- src/render/framegraph/qnodraw.h | 2 +- src/render/framegraph/qrenderpassfilter.cpp | 2 +- src/render/framegraph/qrenderpassfilter.h | 6 +- src/render/framegraph/qrendertargetselector.cpp | 2 +- src/render/framegraph/qrendertargetselector.h | 6 +- src/render/framegraph/qsortcriterion.cpp | 2 +- src/render/framegraph/qsortcriterion.h | 8 +- src/render/framegraph/qsortcriterion_p.h | 2 +- src/render/framegraph/qsortmethod.cpp | 4 +- src/render/framegraph/qsortmethod.h | 6 +- src/render/framegraph/qstateset.cpp | 24 +- src/render/framegraph/qstateset.h | 6 +- src/render/framegraph/qtechniquefilter.cpp | 2 +- src/render/framegraph/qtechniquefilter.h | 6 +- src/render/framegraph/qviewport.h | 6 +- src/render/framegraph/renderpassfilternode.cpp | 12 +- src/render/framegraph/renderpassfilternode_p.h | 12 +- src/render/framegraph/rendertargetselectornode.cpp | 8 +- src/render/framegraph/rendertargetselectornode_p.h | 8 +- src/render/framegraph/sortcriterion.cpp | 6 +- src/render/framegraph/sortcriterion_p.h | 6 +- src/render/framegraph/sortmethod.cpp | 6 +- src/render/framegraph/sortmethod_p.h | 8 +- src/render/framegraph/statesetnode.cpp | 10 +- src/render/framegraph/statesetnode_p.h | 10 +- src/render/framegraph/techniquefilternode.cpp | 12 +- src/render/framegraph/techniquefilternode_p.h | 12 +- src/render/framegraph/viewportnode.cpp | 6 +- src/render/framegraph/viewportnode_p.h | 4 +- src/render/frontend/qitemmodelbuffer.cpp | 4 +- src/render/frontend/qlayer.h | 8 +- src/render/frontend/qlayer_p.h | 2 +- src/render/frontend/qrenderaspect.cpp | 24 +- src/render/frontend/qrenderaspect.h | 12 +- src/render/frontend/qrenderaspect_p.h | 2 +- src/render/frontend/qrenderattachment.h | 8 +- src/render/frontend/qrenderattachment_p.h | 2 +- src/render/frontend/qrendertarget.cpp | 2 +- src/render/frontend/qrendertarget.h | 8 +- src/render/frontend/qrendertarget_p.h | 2 +- src/render/frontend/qwindow.cpp | 8 +- src/render/frontend/qwindow.h | 8 +- src/render/frontend/qwindow_p.h | 10 +- src/render/frontend/sphere.cpp | 8 +- src/render/frontend/sphere.h | 12 +- src/render/geometry/attribute.cpp | 16 +- src/render/geometry/attribute_p.h | 18 +- src/render/geometry/buffer.cpp | 12 +- src/render/geometry/buffer_p.h | 14 +- src/render/geometry/buffermanager.cpp | 6 +- src/render/geometry/buffermanager_p.h | 14 +- src/render/geometry/geometry.cpp | 6 +- src/render/geometry/geometry_p.h | 10 +- src/render/geometry/geometryrenderer.cpp | 14 +- src/render/geometry/geometryrenderer_p.h | 18 +- src/render/geometry/geometryrenderermanager.cpp | 6 +- src/render/geometry/geometryrenderermanager_p.h | 14 +- src/render/geometry/qattribute.cpp | 2 +- src/render/geometry/qattribute.h | 6 +- src/render/geometry/qattribute_p.h | 2 +- src/render/geometry/qbuffer.cpp | 4 +- src/render/geometry/qbuffer.h | 8 +- src/render/geometry/qbuffer_p.h | 2 +- src/render/geometry/qbufferfunctor.h | 2 +- src/render/geometry/qcuboidmesh.h | 2 +- src/render/geometry/qcylindermesh.h | 2 +- src/render/geometry/qgeometry.cpp | 6 +- src/render/geometry/qgeometry.h | 16 +- src/render/geometry/qgeometry_p.h | 2 +- src/render/geometry/qgeometryfunctor.h | 2 +- src/render/geometry/qgeometryrenderer.cpp | 4 +- src/render/geometry/qgeometryrenderer.h | 10 +- src/render/geometry/qgeometryrenderer_p.h | 2 +- src/render/geometry/qmesh.cpp | 2 +- src/render/geometry/qmesh.h | 4 +- src/render/geometry/qplanemesh.h | 2 +- src/render/geometry/qspheremesh.h | 2 +- src/render/geometry/qtorusmesh.h | 2 +- src/render/graphicshelpers/graphicscontext_p.h | 2 +- src/render/graphicshelpers/graphicshelperes2.cpp | 2 +- src/render/io/abstractsceneparser_p.h | 6 +- src/render/io/objloader.cpp | 2 +- src/render/io/qabstractsceneloader.cpp | 2 +- src/render/io/qabstractsceneloader.h | 8 +- src/render/io/qabstractsceneloader_p.h | 2 +- src/render/io/qsceneloader.cpp | 4 +- src/render/io/qsceneloader.h | 4 +- src/render/io/scene.cpp | 14 +- src/render/io/scene_p.h | 18 +- src/render/io/scenemanager.cpp | 12 +- src/render/io/scenemanager_p.h | 18 +- src/render/io/uniformbuffer_p.h | 2 +- src/render/jobs/framecleanupjob.cpp | 2 +- src/render/jobs/framecleanupjob_p.h | 2 +- src/render/jobs/framepreparationjob_p.h | 2 +- src/render/jobs/loadbufferjob_p.h | 2 +- src/render/jobs/loadgeometryjob_p.h | 2 +- src/render/jobs/loadscenejob.cpp | 4 +- src/render/jobs/loadscenejob_p.h | 6 +- src/render/jobs/loadtexturedatajob.cpp | 2 +- src/render/jobs/loadtexturedatajob_p.h | 6 +- src/render/jobs/renderviewjob.cpp | 2 +- src/render/jobs/renderviewjob_p.h | 2 +- src/render/jobs/renderviewjobutils.cpp | 4 +- src/render/jobs/renderviewjobutils_p.h | 6 +- src/render/jobs/updateboundingvolumejob_p.h | 2 +- src/render/jobs/updateworldtransformjob.cpp | 2 +- src/render/jobs/updateworldtransformjob_p.h | 2 +- src/render/lights/qabstractlight.cpp | 12 +- src/render/lights/qabstractlight.h | 6 +- src/render/lights/qdirectionallight.cpp | 2 +- src/render/lights/qdirectionallight.h | 6 +- src/render/lights/qpointlight.h | 4 +- src/render/lights/qspotlight.cpp | 12 +- src/render/lights/qspotlight.h | 6 +- src/render/materialsystem/annotation.cpp | 6 +- src/render/materialsystem/annotation_p.h | 6 +- src/render/materialsystem/effect.cpp | 12 +- src/render/materialsystem/effect_p.h | 14 +- src/render/materialsystem/material.cpp | 10 +- src/render/materialsystem/material_p.h | 12 +- src/render/materialsystem/parameter.cpp | 6 +- src/render/materialsystem/parameter_p.h | 6 +- src/render/materialsystem/parametermapping.cpp | 4 +- src/render/materialsystem/parametermapping_p.h | 4 +- src/render/materialsystem/qannotation.h | 6 +- src/render/materialsystem/qannotation_p.h | 2 +- src/render/materialsystem/qeffect.cpp | 2 +- src/render/materialsystem/qeffect.h | 8 +- src/render/materialsystem/qeffect_p.h | 2 +- src/render/materialsystem/qmaterial.cpp | 4 +- src/render/materialsystem/qmaterial.h | 8 +- src/render/materialsystem/qmaterial_p.h | 2 +- src/render/materialsystem/qopenglfilter.cpp | 4 +- src/render/materialsystem/qparameter.cpp | 2 +- src/render/materialsystem/qparameter.h | 12 +- src/render/materialsystem/qparameter_p.h | 2 +- src/render/materialsystem/qparametermapping.h | 10 +- src/render/materialsystem/qparametermapping_p.h | 2 +- src/render/materialsystem/qrenderpass.cpp | 8 +- src/render/materialsystem/qrenderpass.h | 8 +- src/render/materialsystem/qrenderpass_p.h | 2 +- src/render/materialsystem/qshaderdata.h | 8 +- src/render/materialsystem/qshaderdata_p.h | 2 +- src/render/materialsystem/qshaderprogram.cpp | 2 +- src/render/materialsystem/qshaderprogram.h | 8 +- src/render/materialsystem/qshaderprogram_p.h | 2 +- src/render/materialsystem/qtechnique.cpp | 2 +- src/render/materialsystem/qtechnique.h | 8 +- src/render/materialsystem/qtechnique_p.h | 2 +- src/render/materialsystem/renderpass.cpp | 22 +- src/render/materialsystem/renderpass_p.h | 30 +-- src/render/materialsystem/shader.cpp | 6 +- src/render/materialsystem/shader_p.h | 6 +- src/render/materialsystem/shaderdata.cpp | 16 +- src/render/materialsystem/shaderdata_p.h | 18 +- src/render/materialsystem/technique.cpp | 20 +- src/render/materialsystem/technique_p.h | 24 +- src/render/renderstates/qalphacoverage.h | 2 +- src/render/renderstates/qalphatest.h | 4 +- src/render/renderstates/qblendequation.h | 4 +- src/render/renderstates/qblendstate.cpp | 16 +- src/render/renderstates/qblendstate.h | 8 +- src/render/renderstates/qclipplane.cpp | 6 +- src/render/renderstates/qclipplane.h | 4 +- src/render/renderstates/qcolormask.cpp | 12 +- src/render/renderstates/qcolormask.h | 4 +- src/render/renderstates/qcullface.h | 4 +- src/render/renderstates/qdepthmask.h | 4 +- src/render/renderstates/qdepthtest.h | 4 +- src/render/renderstates/qdithering.h | 2 +- src/render/renderstates/qfrontface.h | 4 +- src/render/renderstates/qpolygonoffset.h | 4 +- src/render/renderstates/qrenderstate.cpp | 4 +- src/render/renderstates/qrenderstate.h | 4 +- src/render/renderstates/qrenderstate_p.h | 2 +- src/render/renderstates/qscissortest.h | 4 +- src/render/renderstates/qstencilmask.h | 4 +- src/render/renderstates/qstencilop.h | 4 +- src/render/renderstates/qstenciltest.h | 4 +- src/render/services/qraycastingservice.cpp | 14 +- src/render/services/qraycastingservice.h | 12 +- src/render/services/qraycastingservice_p.h | 24 +- src/render/services/vsyncframeadvanceservice.cpp | 2 +- src/render/services/vsyncframeadvanceservice_p.h | 2 +- src/render/texture/qabstracttextureimage.cpp | 16 +- src/render/texture/qabstracttextureimage.h | 10 +- src/render/texture/qabstracttextureimage_p.h | 2 +- src/render/texture/qabstracttextureprovider.cpp | 10 +- src/render/texture/qabstracttextureprovider.h | 10 +- src/render/texture/qabstracttextureprovider_p.h | 2 +- src/render/texture/qtextureimage.cpp | 2 +- src/render/texture/qtextureimage.h | 4 +- src/render/texture/qtextureproviders.h | 22 +- src/render/texture/texture.cpp | 12 +- src/render/texture/texture_p.h | 14 +- src/render/texture/texturedatamanager.cpp | 6 +- src/render/texture/texturedatamanager_p.h | 14 +- src/render/texture/textureimage.cpp | 12 +- src/render/texture/textureimage_p.h | 18 +- .../dynamicarraypolicy/tst_dynamicarraypolicy.cpp | 42 ++-- .../tst_preallocatedarraypolicy.cpp | 42 ++-- tests/auto/core/cloning/tst_cloning.cpp | 24 +- tests/auto/core/handle/tst_handle.cpp | 4 +- .../auto/core/handlemanager/tst_handlemanager.cpp | 20 +- .../tst_listresourcesmanager.cpp | 42 ++-- tests/auto/core/nodes/tst_nodes.cpp | 170 +++++++------- .../auto/core/qaspectengine/tst_qaspectengine.cpp | 4 +- .../core/qaspectfactory/tst_qaspectfactory.cpp | 2 +- .../tst_qboundedcircularbuffer.cpp | 2 +- .../core/qchangearbiter/tst_qchangearbiter.cpp | 246 ++++++++++----------- .../core/qcircularbuffer/tst_qcircularbuffer.cpp | 2 +- tests/auto/core/qentity/tst_qentity.cpp | 46 ++-- .../core/qframeallocator/tst_qframeallocator.cpp | 54 ++--- tests/auto/core/qray3d/tst_qray3d.cpp | 64 +++--- tests/auto/core/qscene/tst_qscene.cpp | 144 ++++++------ .../core/qservicelocator/tst_qservicelocator.cpp | 2 +- tests/auto/core/threadpooler/tst_threadpooler.cpp | 18 +- .../tst_quick3dnodeinstantiator.cpp | 2 +- tests/auto/render/attribute/tst_attribute.cpp | 36 +-- tests/auto/render/buffer/tst_buffer.cpp | 8 +- tests/auto/render/entity/tst_entity.cpp | 8 +- tests/auto/render/geometry/tst_geometry.cpp | 8 +- .../geometryrenderer/tst_geometryrenderer.cpp | 24 +- tests/auto/render/material/tst_material.cpp | 2 +- tests/auto/render/qattribute/tst_qattribute.cpp | 98 ++++---- tests/auto/render/qbuffer/tst_qbuffer.cpp | 48 ++-- tests/auto/render/qgeometry/tst_qgeometry.cpp | 56 ++--- .../qgeometryrenderer/tst_qgeometryrenderer.cpp | 90 ++++---- tests/auto/render/qmaterial/tst_qmaterial.cpp | 108 ++++----- tests/auto/render/raycasting/tst_raycasting.cpp | 2 +- tests/auto/render/renderpass/tst_renderpass.cpp | 2 +- tests/auto/render/renderviews/tst_renderviews.cpp | 2 +- .../qcircularbuffer/tst_bench_qcircularbuffer.cpp | 2 +- .../qframeallocator/tst_bench_qframeallocator.cpp | 2 +- .../arraypolicy/tst_bench_arraypolicy.cpp | 16 +- .../tst_bench_qresourcesmanager.cpp | 18 +- 627 files changed, 3237 insertions(+), 3269 deletions(-) diff --git a/examples/qt3d/anaglyph-rendering/main.cpp b/examples/qt3d/anaglyph-rendering/main.cpp index 6a7db95e6..e0907e307 100644 --- a/examples/qt3d/anaglyph-rendering/main.cpp +++ b/examples/qt3d/anaglyph-rendering/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp index a9da29f62..b23b22958 100644 --- a/examples/qt3d/assimp-cpp/main.cpp +++ b/examples/qt3d/assimp-cpp/main.cpp @@ -55,7 +55,7 @@ public: void onStatusChanged(); private: - void walkEntity(Qt3D::QEntity *e, int depth = 0); + void walkEntity(Qt3DCore::QEntity *e, int depth = 0); Qt3DRender::QSceneLoader *m_loader; }; @@ -68,29 +68,29 @@ void SceneWalker::onStatusChanged() // The QSceneLoader instance is a component of an entity. The loaded scene // tree is added under this entity. - QVector entities = m_loader->entities(); + QVector entities = m_loader->entities(); // Technically there could be multiple entities referencing the scene loader // but sharing is discouraged, and in our case there will be one anyhow. if (entities.isEmpty()) return; - Qt3D::QEntity *root = entities[0]; + Qt3DCore::QEntity *root = entities[0]; // Print the tree. walkEntity(root); // To access a given node (like a named mesh in the scene), use QObject::findChild(). // The scene structure and names always depend on the asset. - Qt3D::QEntity *e = root->findChild(QStringLiteral("PlanePropeller_mesh")); // toyplane.obj + Qt3DCore::QEntity *e = root->findChild(QStringLiteral("PlanePropeller_mesh")); // toyplane.obj if (e) qDebug() << "Found propeller node" << e << "with components" << e->components(); } -void SceneWalker::walkEntity(Qt3D::QEntity *e, int depth) +void SceneWalker::walkEntity(Qt3DCore::QEntity *e, int depth) { - Qt3D::QNodeList nodes = e->childrenNodes(); + Qt3DCore::QNodeList nodes = e->childrenNodes(); for (int i = 0; i < nodes.count(); ++i) { - Qt3D::QNode *node = nodes[i]; - Qt3D::QEntity *entity = qobject_cast(node); + Qt3DCore::QNode *node = nodes[i]; + Qt3DCore::QEntity *entity = qobject_cast(node); if (entity) { QString indent; indent.fill(' ', depth * 2); @@ -106,7 +106,7 @@ int main(int ac, char **av) Window view; - Qt3D::QAspectEngine engine; + Qt3DCore::QAspectEngine engine; Qt3DInput::QInputAspect *inputAspect = new Qt3DInput::QInputAspect(); engine.registerAspect(new Qt3DRender::QRenderAspect()); engine.registerAspect(inputAspect); @@ -117,11 +117,11 @@ int main(int ac, char **av) engine.setData(data); // Root entity - Qt3D::QEntity *sceneRoot = new Qt3D::QEntity(); + Qt3DCore::QEntity *sceneRoot = new Qt3DCore::QEntity(); // Scene Camera - Qt3D::QCamera *basicCamera = new Qt3D::QCamera(sceneRoot); - basicCamera->setProjectionType(Qt3D::QCameraLens::PerspectiveProjection); + Qt3DCore::QCamera *basicCamera = new Qt3DCore::QCamera(sceneRoot); + basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection); basicCamera->setAspectRatio(view.width() / view.height()); basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f)); basicCamera->setViewCenter(QVector3D(0.0f, 3.5f, 0.0f)); @@ -140,7 +140,7 @@ int main(int ac, char **av) sceneRoot->addComponent(frameGraphComponent); // Scene loader - Qt3D::QEntity *sceneLoaderEntity = new Qt3D::QEntity(sceneRoot); + Qt3DCore::QEntity *sceneLoaderEntity = new Qt3DCore::QEntity(sceneRoot); Qt3DRender::QSceneLoader *sceneLoader = new Qt3DRender::QSceneLoader(sceneLoaderEntity); SceneWalker sceneWalker(sceneLoader); QObject::connect(sceneLoader, &Qt3DRender::QSceneLoader::statusChanged, &sceneWalker, &SceneWalker::onStatusChanged); diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index 729250c13..e8389bf33 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -57,17 +57,17 @@ QObject *SceneHelper::findEntity(Qt3DRender::QSceneLoader *loader, const QString { // The QSceneLoader instance is a component of an entity. The loaded scene // tree is added under this entity. - QVector entities = loader->entities(); + QVector entities = loader->entities(); if (entities.isEmpty()) return 0; // Technically there could be multiple entities referencing the scene loader // but sharing is discouraged, and in our case there will be one anyhow. - Qt3D::QEntity *root = entities[0]; + Qt3DCore::QEntity *root = entities[0]; // The scene structure and names always depend on the asset. - return root->findChild(name); + return root->findChild(name); } void SceneHelper::addListEntry(const QVariant &list, QObject *entry) @@ -81,7 +81,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index 19da31f00..9bddbd314 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -89,7 +89,7 @@ int main(int argc, char **argv) widget->setWindowTitle(QStringLiteral("Basic shapes")); - Qt3D::QAspectEngine engine; + Qt3DCore::QAspectEngine engine; engine.registerAspect(new Qt3DRender::QRenderAspect()); Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); @@ -100,10 +100,10 @@ int main(int argc, char **argv) engine.setData(data); // Root entity - Qt3D::QEntity *rootEntity = new Qt3D::QEntity(); + Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); // Camera - Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(rootEntity); + Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity); cameraEntity->setObjectName(QStringLiteral("cameraEntity")); cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f); diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp index 97d8ad4be..d67e70902 100644 --- a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp +++ b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp @@ -38,7 +38,7 @@ #include -SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity) +SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity) : m_rootEntity(rootEntity) { @@ -53,10 +53,10 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity) // TorusMesh Transform //! [1] - Qt3D::QScaleTransform *torusScale = new Qt3D::QScaleTransform(); - Qt3D::QTranslateTransform *torusTranslation = new Qt3D::QTranslateTransform(); - Qt3D::QRotateTransform *torusRotation = new Qt3D::QRotateTransform(); - Qt3D::QTransform *torusTransforms = new Qt3D::QTransform(); + Qt3DCore::QScaleTransform *torusScale = new Qt3DCore::QScaleTransform(); + Qt3DCore::QTranslateTransform *torusTranslation = new Qt3DCore::QTranslateTransform(); + Qt3DCore::QRotateTransform *torusRotation = new Qt3DCore::QRotateTransform(); + Qt3DCore::QTransform *torusTransforms = new Qt3DCore::QTransform(); torusScale->setScale3D(QVector3D(2.0f, 2.0f, 2.0f)); torusTranslation->setTranslation(QVector3D(1.7f, 1.7f, 0.0f)); @@ -75,7 +75,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity) // Torus //! [3] - m_torusEntity = new Qt3D::QEntity(m_rootEntity); + m_torusEntity = new Qt3DCore::QEntity(m_rootEntity); m_torusEntity->addComponent(m_torus); m_torusEntity->addComponent(torusMaterial); m_torusEntity->addComponent(torusTransforms); @@ -89,10 +89,10 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity) cylinder->setSlices(20); // CylinderMesh Transform - Qt3D::QScaleTransform *cylinderScale = new Qt3D::QScaleTransform(); - Qt3D::QRotateTransform *cylinderRotation = new Qt3D::QRotateTransform(); - Qt3D::QTranslateTransform *cylinderTranslation = new Qt3D::QTranslateTransform(); - Qt3D::QTransform *cylinderTransforms = new Qt3D::QTransform(); + Qt3DCore::QScaleTransform *cylinderScale = new Qt3DCore::QScaleTransform(); + Qt3DCore::QRotateTransform *cylinderRotation = new Qt3DCore::QRotateTransform(); + Qt3DCore::QTranslateTransform *cylinderTranslation = new Qt3DCore::QTranslateTransform(); + Qt3DCore::QTransform *cylinderTransforms = new Qt3DCore::QTransform(); cylinderScale->setScale3D(QVector3D(1.5f, 1.5f, 1.5f)); cylinderTranslation->setTranslation(QVector3D(-2.6f, 2.4f, -1.5)); @@ -107,7 +107,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity) cylinderMaterial->setDiffuse(QColor(QRgb(0x928327))); // Cylinder - m_cylinderEntity = new Qt3D::QEntity(m_rootEntity); + m_cylinderEntity = new Qt3DCore::QEntity(m_rootEntity); m_cylinderEntity->addComponent(cylinder); m_cylinderEntity->addComponent(cylinderMaterial); m_cylinderEntity->addComponent(cylinderTransforms); @@ -116,9 +116,9 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity) Qt3DRender::QCuboidMesh *cuboid = new Qt3DRender::QCuboidMesh(); // CuboidMesh Transform - Qt3D::QScaleTransform *cuboidScale = new Qt3D::QScaleTransform(); - Qt3D::QTranslateTransform *cuboidTranslation = new Qt3D::QTranslateTransform(); - Qt3D::QTransform *cuboidTransforms = new Qt3D::QTransform(); + Qt3DCore::QScaleTransform *cuboidScale = new Qt3DCore::QScaleTransform(); + Qt3DCore::QTranslateTransform *cuboidTranslation = new Qt3DCore::QTranslateTransform(); + Qt3DCore::QTransform *cuboidTransforms = new Qt3DCore::QTransform(); cuboidScale->setScale3D(QVector3D(4.0f, 4.0f, 4.0f)); cuboidTranslation->setTranslation(QVector3D(0.9f, -0.9f, 0.0f)); @@ -130,7 +130,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity) cuboidMaterial->setDiffuse(QColor(QRgb(0x665423))); //Cuboid - m_cuboidEntity = new Qt3D::QEntity(m_rootEntity); + m_cuboidEntity = new Qt3DCore::QEntity(m_rootEntity); m_cuboidEntity->addComponent(cuboid); m_cuboidEntity->addComponent(cuboidMaterial); m_cuboidEntity->addComponent(cuboidTransforms); @@ -142,9 +142,9 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity) sphereMesh->setRadius(2); // Sphere mesh transform - Qt3D::QScaleTransform *sphereScale = new Qt3D::QScaleTransform(); - Qt3D::QTranslateTransform *sphereTranslation = new Qt3D::QTranslateTransform(); - Qt3D::QTransform *sphereTransforms = new Qt3D::QTransform(); + Qt3DCore::QScaleTransform *sphereScale = new Qt3DCore::QScaleTransform(); + Qt3DCore::QTranslateTransform *sphereTranslation = new Qt3DCore::QTranslateTransform(); + Qt3DCore::QTransform *sphereTransforms = new Qt3DCore::QTransform(); sphereScale->setScale3D(QVector3D(1.3f, 1.3f, 1.3f)); sphereTranslation->setTranslation(QVector3D(-2.9f, -2.9f, 0.0f)); @@ -156,7 +156,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity) sphereMaterial->setDiffuse(QColor(QRgb(0xa69929))); // Sphere - m_sphereEntity = new Qt3D::QEntity(m_rootEntity); + m_sphereEntity = new Qt3DCore::QEntity(m_rootEntity); m_sphereEntity->addComponent(sphereMesh); m_sphereEntity->addComponent(sphereMaterial); m_sphereEntity->addComponent(sphereTransforms); diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h index c85e3e4fb..f108298ac 100644 --- a/examples/qt3d/basicshapes-cpp/scenemodifier.h +++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h @@ -56,7 +56,7 @@ class SceneModifier : public QObject Q_OBJECT public: - explicit SceneModifier(Qt3D::QEntity *rootEntity); + explicit SceneModifier(Qt3DCore::QEntity *rootEntity); ~SceneModifier(); public slots: @@ -66,12 +66,12 @@ public slots: void enableSphere(bool enabled); private: - Qt3D::QEntity *m_rootEntity; + Qt3DCore::QEntity *m_rootEntity; Qt3DRender::QTorusMesh *m_torus; - Qt3D::QEntity *m_cylinderEntity; - Qt3D::QEntity *m_torusEntity; - Qt3D::QEntity *m_cuboidEntity; - Qt3D::QEntity *m_sphereEntity; + Qt3DCore::QEntity *m_cylinderEntity; + Qt3DCore::QEntity *m_torusEntity; + Qt3DCore::QEntity *m_cuboidEntity; + Qt3DCore::QEntity *m_sphereEntity; }; #endif // SCENEMODIFIER_H diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp index ed45906d6..9c1dd91a4 100644 --- a/examples/qt3d/bigmodel-qml/main.cpp +++ b/examples/qt3d/bigmodel-qml/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp index 3b6bc28dc..ceedf91a7 100644 --- a/examples/qt3d/bigscene-cpp/main.cpp +++ b/examples/qt3d/bigscene-cpp/main.cpp @@ -57,7 +57,7 @@ #include #include -using namespace Qt3D; +using namespace Qt3DCore; using namespace Qt3DRender; int main(int ac, char **av) @@ -65,7 +65,7 @@ int main(int ac, char **av) QGuiApplication app(ac, av); Window view; - Qt3D::QAspectEngine engine; + Qt3DCore::QAspectEngine engine; engine.registerAspect(new Qt3DRender::QRenderAspect()); Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); @@ -100,7 +100,7 @@ int main(int ac, char **av) // Scene for (int i = 0; i < max; i++) { QEntity *e = new QEntity(); - Qt3D::QTransform *transform = new Qt3D::QTransform(); + Qt3DCore::QTransform *transform = new Qt3DCore::QTransform(); QTranslateTransform *translation = new QTranslateTransform(); QRotateTransform *rotateX = new QRotateTransform(); QRotateTransform *rotateZ = new QRotateTransform(); diff --git a/examples/qt3d/bigscene-instanced-qml/main.cpp b/examples/qt3d/bigscene-instanced-qml/main.cpp index 79f5bfdb4..44a5d672b 100644 --- a/examples/qt3d/bigscene-instanced-qml/main.cpp +++ b/examples/qt3d/bigscene-instanced-qml/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/clip-planes-qml/main.cpp b/examples/qt3d/clip-planes-qml/main.cpp index 63c21475e..ac3da63cc 100644 --- a/examples/qt3d/clip-planes-qml/main.cpp +++ b/examples/qt3d/clip-planes-qml/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp index cb2127b14..7d2bbeb78 100644 --- a/examples/qt3d/cpp_example/main.cpp +++ b/examples/qt3d/cpp_example/main.cpp @@ -72,7 +72,7 @@ int main(int ac, char **av) QGuiApplication app(ac, av); Window view; - Qt3D::QAspectEngine engine; + Qt3DCore::QAspectEngine engine; engine.registerAspect(new Qt3DRender::QRenderAspect()); Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); @@ -83,10 +83,10 @@ int main(int ac, char **av) engine.setData(data); // Root entity - Qt3D::QEntity *rootEntity = new Qt3D::QEntity(); + Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); rootEntity->setObjectName(QStringLiteral("rootEntity")); // Torus - Qt3D::QEntity *torusEntity = new Qt3D::QEntity(rootEntity); + Qt3DCore::QEntity *torusEntity = new Qt3DCore::QEntity(rootEntity); // Torus shape data Qt3DRender::QTorusMesh *torus = new Qt3DRender::QTorusMesh(); @@ -96,9 +96,9 @@ int main(int ac, char **av) torusEntity->addComponent(torus); // TorusMesh Transform - Qt3D::QTranslateTransform *torusTranslation = new Qt3D::QTranslateTransform(); - Qt3D::QRotateTransform *torusRotation = new Qt3D::QRotateTransform(); - Qt3D::QTransform *torusTransforms = new Qt3D::QTransform(); + Qt3DCore::QTranslateTransform *torusTranslation = new Qt3DCore::QTranslateTransform(); + Qt3DCore::QRotateTransform *torusRotation = new Qt3DCore::QRotateTransform(); + Qt3DCore::QTransform *torusTransforms = new Qt3DCore::QTransform(); torusTranslation->setTranslation(QVector3D(-5.0f, 3.5f, 2.0f)); torusRotation->setAxis(QVector3D(1, 0, 0)); @@ -108,11 +108,11 @@ int main(int ac, char **av) torusEntity->addComponent(torusTransforms); // Scene file - Qt3D::QEntity *sceneEntity = new Qt3D::QEntity(rootEntity); + Qt3DCore::QEntity *sceneEntity = new Qt3DCore::QEntity(rootEntity); Qt3DRender::QSceneLoader *scene = new Qt3DRender::QSceneLoader(); scene->setObjectName(QStringLiteral("scene")); - Qt3D::QTransform *sceneTransform = new Qt3D::QTransform(); - Qt3D::QTranslateTransform *sceneTranslateTransform = new Qt3D::QTranslateTransform(); + Qt3DCore::QTransform *sceneTransform = new Qt3DCore::QTransform(); + Qt3DCore::QTranslateTransform *sceneTranslateTransform = new Qt3DCore::QTranslateTransform(); sceneTranslateTransform->setDx(2.5); sceneTranslateTransform->setDy(0.5); sceneTranslateTransform->setDz(-10); @@ -123,7 +123,7 @@ int main(int ac, char **av) sceneEntity->addComponent(scene); // Camera - Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(rootEntity); + Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity); cameraEntity->setObjectName(QStringLiteral("cameraEntity")); cameraEntity->lens()->setPerspectiveProjection(60.0f, 16.0f/9.0f, 0.1f, 1000.0f); diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp index 6b6bd5c1b..665446669 100644 --- a/examples/qt3d/custom-mesh-cpp/main.cpp +++ b/examples/qt3d/custom-mesh-cpp/main.cpp @@ -67,7 +67,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::QAspectEngine engine; + Qt3DCore::QAspectEngine engine; engine.registerAspect(new Qt3DRender::QRenderAspect()); Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); @@ -78,10 +78,10 @@ int main(int argc, char* argv[]) engine.setData(data); // Root entity - Qt3D::QEntity *rootEntity = new Qt3D::QEntity(); + Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); // Camera - Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(rootEntity); + Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity); cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f); cameraEntity->setPosition(QVector3D(0, 0, -40.0f)); @@ -100,11 +100,11 @@ int main(int argc, char* argv[]) Qt3DRender::QMaterial *material = new Qt3DRender::QPerVertexColorMaterial(rootEntity); // Torus - Qt3D::QEntity *customMeshEntity = new Qt3D::QEntity(rootEntity); + Qt3DCore::QEntity *customMeshEntity = new Qt3DCore::QEntity(rootEntity); // Transform - Qt3D::QTransform *transform = new Qt3D::QTransform; - Qt3D::QScaleTransform *scaleTransform = new Qt3D::QScaleTransform; + Qt3DCore::QTransform *transform = new Qt3DCore::QTransform; + Qt3DCore::QScaleTransform *scaleTransform = new Qt3DCore::QScaleTransform; scaleTransform->setScale(8.0f); transform->addTransform(scaleTransform); diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp index 35b0be402..028834779 100644 --- a/examples/qt3d/cylinder-cpp/main.cpp +++ b/examples/qt3d/cylinder-cpp/main.cpp @@ -66,7 +66,7 @@ int main(int argc, char **argv) QGuiApplication app(argc, argv); Window view; - Qt3D::QAspectEngine engine; + Qt3DCore::QAspectEngine engine; engine.registerAspect(new Qt3DRender::QRenderAspect()); Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); @@ -77,10 +77,10 @@ int main(int argc, char **argv) engine.setData(data); // Root entity - Qt3D::QEntity *rootEntity = new Qt3D::QEntity(); + Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); // Camera - Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(rootEntity); + Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity); cameraEntity->setObjectName(QStringLiteral("cameraEntity")); cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f); @@ -108,9 +108,9 @@ int main(int argc, char **argv) cylinder->setSlices(20); // CylinderMesh Transform - Qt3D::QScaleTransform *cylinderScale = new Qt3D::QScaleTransform(); - Qt3D::QRotateTransform *cylinderRotation = new Qt3D::QRotateTransform(); - Qt3D::QTransform *cylinderTransforms = new Qt3D::QTransform(); + Qt3DCore::QScaleTransform *cylinderScale = new Qt3DCore::QScaleTransform(); + Qt3DCore::QRotateTransform *cylinderRotation = new Qt3DCore::QRotateTransform(); + Qt3DCore::QTransform *cylinderTransforms = new Qt3DCore::QTransform(); cylinderScale->setScale3D(QVector3D(1.5f, 1.5f, 1.5f)); cylinderRotation->setAngleDeg(45.0f); @@ -120,7 +120,7 @@ int main(int argc, char **argv) cylinderTransforms->addTransform(cylinderRotation); // Cylinder - Qt3D::QEntity *cylinderEntity = new Qt3D::QEntity(rootEntity); + Qt3DCore::QEntity *cylinderEntity = new Qt3DCore::QEntity(rootEntity); cylinderEntity->addComponent(cylinder); cylinderEntity->addComponent(cylinderTransforms); diff --git a/examples/qt3d/cylinder-qml/main.cpp b/examples/qt3d/cylinder-qml/main.cpp index d484de44e..d28d9c68b 100644 --- a/examples/qt3d/cylinder-qml/main.cpp +++ b/examples/qt3d/cylinder-qml/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp index 29330968b..f22966f48 100644 --- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp +++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp @@ -37,7 +37,7 @@ #include "deferredrenderer.h" -DeferredRenderer::DeferredRenderer(Qt3D::QNode *parent) +DeferredRenderer::DeferredRenderer(Qt3DCore::QNode *parent) : Qt3DRender::QViewport(parent) , m_sceneFilter(new Qt3DRender::QLayerFilter(this)) , m_screenQuadFilter(new Qt3DRender::QLayerFilter(this)) @@ -52,7 +52,7 @@ DeferredRenderer::DeferredRenderer(Qt3D::QNode *parent) m_clearScreenQuad->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer); } -void DeferredRenderer::setSceneCamera(Qt3D::QEntity *camera) +void DeferredRenderer::setSceneCamera(Qt3DCore::QEntity *camera) { m_sceneCameraSelector->setCamera(camera); } diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h index 201614173..0f75d669d 100644 --- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h +++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h @@ -48,9 +48,9 @@ class DeferredRenderer : public Qt3DRender::QViewport { public: - explicit DeferredRenderer(Qt3D::QNode *parent = 0); + explicit DeferredRenderer(Qt3DCore::QNode *parent = 0); - void setSceneCamera(Qt3D::QEntity *camera); + void setSceneCamera(Qt3DCore::QEntity *camera); void setGBuffer(Qt3DRender::QRenderTarget *gBuffer); void setGeometryPassCriteria(QList criteria); void setFinalPassCriteria(QList criteria); diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp index d12cc1450..9be53d6a1 100644 --- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp +++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp @@ -40,7 +40,7 @@ #include #include -FinalEffect::FinalEffect(Qt3D::QNode *parent) +FinalEffect::FinalEffect(Qt3DCore::QNode *parent) : Qt3DRender::QEffect(parent) , m_gl3Technique(new Qt3DRender::QTechnique()) , m_gl2Technique(new Qt3DRender::QTechnique()) diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.h b/examples/qt3d/deferred-renderer-cpp/finaleffect.h index 9bd48cd9d..e99276c1b 100644 --- a/examples/qt3d/deferred-renderer-cpp/finaleffect.h +++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.h @@ -43,7 +43,7 @@ class FinalEffect : public Qt3DRender::QEffect { public: - explicit FinalEffect(Qt3D::QNode *parent = 0); + explicit FinalEffect(Qt3DCore::QNode *parent = 0); QList passCriteria() const; inline Qt3DRender::QTechnique *gl3Technique() const { return m_gl3Technique; } diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp index ab59cf692..cf268dcb8 100644 --- a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp +++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp @@ -36,7 +36,7 @@ #include "gbuffer.h" -GBuffer::GBuffer(Qt3D::QNode *parent) +GBuffer::GBuffer(Qt3DCore::QNode *parent) : Qt3DRender::QRenderTarget(parent) { const Qt3DRender::QAbstractTextureProvider::TextureFormat formats[AttachmentsCount] = { diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.h b/examples/qt3d/deferred-renderer-cpp/gbuffer.h index 0f7d20c8f..86412c482 100644 --- a/examples/qt3d/deferred-renderer-cpp/gbuffer.h +++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.h @@ -44,7 +44,7 @@ class GBuffer : public Qt3DRender::QRenderTarget { public: - explicit GBuffer(Qt3D::QNode *parent = 0); + explicit GBuffer(Qt3DCore::QNode *parent = 0); enum Attachments { Color = 0, diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp index b82353dc1..625c320c9 100644 --- a/examples/qt3d/deferred-renderer-cpp/main.cpp +++ b/examples/qt3d/deferred-renderer-cpp/main.cpp @@ -73,7 +73,7 @@ int main(int ac, char **av) view.registerAspect(input); // Root entity - Qt3D::QEntity *rootEntity = new Qt3D::QEntity(); + Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); rootEntity->setObjectName(QStringLiteral("rootEntity")); // Shared Components @@ -103,12 +103,12 @@ int main(int ac, char **av) rootEntity->addComponent(light1); // Scene Camera - Qt3D::QCamera *camera = view.defaultCamera(); + Qt3DCore::QCamera *camera = view.defaultCamera(); camera->setFieldOfView(45.0f); camera->setNearPlane(0.01f); camera->setFarPlane(1000.0f); - camera->setProjectionType(Qt3D::QCameraLens::PerspectiveProjection); + camera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection); camera->setPosition(QVector3D(10.0f, 10.0f, -25.0f)); camera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f)); @@ -132,13 +132,13 @@ int main(int ac, char **av) view.setFrameGraph(frameGraph); // Scene Content - Qt3D::QEntity *sphereOne = new Qt3D::QEntity(rootEntity); + Qt3DCore::QEntity *sphereOne = new Qt3DCore::QEntity(rootEntity); Qt3DRender::QMaterial *sphereOneMaterial = new Qt3DRender::QMaterial(); sphereOneMaterial->setEffect(sceneEffect); sphereOneMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("meshColor"), QColor(Qt::blue))); - Qt3D::QTranslateTransform *sphereOneTranslate = new Qt3D::QTranslateTransform(); + Qt3DCore::QTranslateTransform *sphereOneTranslate = new Qt3DCore::QTranslateTransform(); sphereOneTranslate->setDx(-10.0f); sphereOneTranslate->setDy(0.0f); sphereOneTranslate->setDz(25.0f); @@ -147,13 +147,13 @@ int main(int ac, char **av) light2->setColor(Qt::white); light2->setIntensity(1.5f); - sphereOne->addComponent(new Qt3D::QTransform(sphereOneTranslate)); + sphereOne->addComponent(new Qt3DCore::QTransform(sphereOneTranslate)); sphereOne->addComponent(sphereOneMaterial); sphereOne->addComponent(sphereMesh); sphereOne->addComponent(sceneLayer); sphereOne->addComponent(light2); - Qt3D::QEntity *sphereTwo = new Qt3D::QEntity(rootEntity); + Qt3DCore::QEntity *sphereTwo = new Qt3DCore::QEntity(rootEntity); Qt3DRender::QMaterial *sphereTwoMaterial = new Qt3DRender::QMaterial(); sphereTwoMaterial->setEffect(sceneEffect); sphereTwoMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("meshColor"), QColor(Qt::yellow))); @@ -168,7 +168,7 @@ int main(int ac, char **av) sphereTwo->addComponent(light3); // Screen Quad - Qt3D::QEntity *screenQuad = new Qt3D::QEntity(rootEntity); + Qt3DCore::QEntity *screenQuad = new Qt3DCore::QEntity(rootEntity); Qt3DRender::QMaterial *screenQuadMaterial = new Qt3DRender::QMaterial(); screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("position"), gBuffer->positionTexture())); screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("normal"), gBuffer->normalTexture())); @@ -183,12 +183,12 @@ int main(int ac, char **av) finalEffect->gl2Technique()->addParameter(new Qt3DRender::QParameter(QStringLiteral("pointLights"), QVariant::fromValue(lightsData))); screenQuadMaterial->setEffect(finalEffect); - Qt3D::QRotateTransform *screenPlaneRotation = new Qt3D::QRotateTransform(); + Qt3DCore::QRotateTransform *screenPlaneRotation = new Qt3DCore::QRotateTransform(); screenPlaneRotation->setAngleDeg(90); screenPlaneRotation->setAxis(QVector3D(1.0f, 0.0f, 0.0f)); screenQuad->addComponent(quadLayer); - screenQuad->addComponent(new Qt3D::QTransform(screenPlaneRotation)); + screenQuad->addComponent(new Qt3DCore::QTransform(screenPlaneRotation)); screenQuad->addComponent(screenQuadMaterial); screenQuad->addComponent(planeMesh); diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp index 5186d0f1b..9090ba11b 100644 --- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp +++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp @@ -36,7 +36,7 @@ #include "pointlightblock.h" -PointLightBlock::PointLightBlock(Qt3D::QNode *parent) +PointLightBlock::PointLightBlock(Qt3DCore::QNode *parent) : Qt3DRender::QShaderData(parent) { diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h index 6e8d3639f..1364189c2 100644 --- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h +++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h @@ -44,7 +44,7 @@ class PointLightBlock : public Qt3DRender::QShaderData Q_OBJECT Q_PROPERTY(QList lights READ lights NOTIFY lightsChanged) public: - explicit PointLightBlock(Qt3D::QNode *parent = 0); + explicit PointLightBlock(Qt3DCore::QNode *parent = 0); ~PointLightBlock(); QList lights() const; diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp index a4c208905..99517c68d 100644 --- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp +++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp @@ -40,7 +40,7 @@ #include #include -SceneEffect::SceneEffect(Qt3D::QNode *parent) +SceneEffect::SceneEffect(Qt3DCore::QNode *parent) : Qt3DRender::QEffect(parent) , m_gl3Technique(new Qt3DRender::QTechnique()) , m_gl2Technique(new Qt3DRender::QTechnique()) diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h index 9f88aef31..6d17c8de5 100644 --- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h +++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h @@ -43,7 +43,7 @@ class SceneEffect : public Qt3DRender::QEffect { public: - explicit SceneEffect(Qt3D::QNode *parent = 0); + explicit SceneEffect(Qt3DCore::QNode *parent = 0); QList passCriteria() const; diff --git a/examples/qt3d/deferred-renderer-qml/main.cpp b/examples/qt3d/deferred-renderer-qml/main.cpp index 23853de6c..2276f3ad5 100644 --- a/examples/qt3d/deferred-renderer-qml/main.cpp +++ b/examples/qt3d/deferred-renderer-qml/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.cpp b/examples/qt3d/dynamicscene-cpp/boxentity.cpp index 9b35c2316..c6f1df33c 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.cpp +++ b/examples/qt3d/dynamicscene-cpp/boxentity.cpp @@ -39,9 +39,9 @@ #include BoxEntity::BoxEntity(QNode *parent) - : Qt3D::QEntity(parent) - , m_transform(new Qt3D::QTransform()) - , m_translate(new Qt3D::QTranslateTransform()) + : Qt3DCore::QEntity(parent) + , m_transform(new Qt3DCore::QTransform()) + , m_translate(new Qt3DCore::QTranslateTransform()) , m_mesh(new Qt3DRender::QCuboidMesh()) , m_material(new Qt3DRender::QPhongMaterial()) , m_angle(0.0f) diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.h b/examples/qt3d/dynamicscene-cpp/boxentity.h index ab5b15aac..dd2a3e1ac 100644 --- a/examples/qt3d/dynamicscene-cpp/boxentity.h +++ b/examples/qt3d/dynamicscene-cpp/boxentity.h @@ -44,7 +44,7 @@ #include #include -class BoxEntity : public Qt3D::QEntity +class BoxEntity : public Qt3DCore::QEntity { Q_OBJECT @@ -72,9 +72,9 @@ Q_SIGNALS: private: void updateTransformation(); - Qt3D::QTransform *m_transform; - Qt3D::QTranslateTransform *m_translate; - Qt3D::QScaleTransform *m_scale; + Qt3DCore::QTransform *m_transform; + Qt3DCore::QTranslateTransform *m_translate; + Qt3DCore::QScaleTransform *m_scale; Qt3DRender::QCuboidMesh *m_mesh; Qt3DRender::QPhongMaterial *m_material; float m_angle; diff --git a/examples/qt3d/dynamicscene-cpp/examplescene.cpp b/examples/qt3d/dynamicscene-cpp/examplescene.cpp index 7bfb98f33..81f09b7da 100644 --- a/examples/qt3d/dynamicscene-cpp/examplescene.cpp +++ b/examples/qt3d/dynamicscene-cpp/examplescene.cpp @@ -40,8 +40,8 @@ #include #include -ExampleScene::ExampleScene(Qt3D::QNode *parent) - : Qt3D::QEntity(parent) +ExampleScene::ExampleScene(Qt3DCore::QNode *parent) + : Qt3DCore::QEntity(parent) , m_timer(new QTimer(this)) , m_even(true) { diff --git a/examples/qt3d/dynamicscene-cpp/examplescene.h b/examples/qt3d/dynamicscene-cpp/examplescene.h index 79351fe3e..66ebb1b75 100644 --- a/examples/qt3d/dynamicscene-cpp/examplescene.h +++ b/examples/qt3d/dynamicscene-cpp/examplescene.h @@ -45,12 +45,12 @@ QT_BEGIN_NAMESPACE class QTimer; QT_END_NAMESPACE -class ExampleScene : public Qt3D::QEntity +class ExampleScene : public Qt3DCore::QEntity { Q_OBJECT public: - explicit ExampleScene(Qt3D::QNode *parent = 0); + explicit ExampleScene(Qt3DCore::QNode *parent = 0); ~ExampleScene(); private Q_SLOTS: diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp index 948252790..9248c8800 100644 --- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp +++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp @@ -36,7 +36,7 @@ #include "forwardrenderer.h" -ForwardRenderer::ForwardRenderer(Qt3D::QNode *parent) +ForwardRenderer::ForwardRenderer(Qt3DCore::QNode *parent) : Qt3DRender::QFrameGraph(parent) , m_viewport(new Qt3DRender::QViewport()) , m_cameraSelector(new Qt3DRender::QCameraSelector()) @@ -50,7 +50,7 @@ ForwardRenderer::ForwardRenderer(Qt3D::QNode *parent) setActiveFrameGraph(m_viewport); } -void ForwardRenderer::setCamera(Qt3D::QEntity *camera) +void ForwardRenderer::setCamera(Qt3DCore::QEntity *camera) { m_cameraSelector->setCamera(camera); } diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h index 6df489e29..bcaed64d9 100644 --- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h +++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h @@ -45,9 +45,9 @@ class ForwardRenderer : public Qt3DRender::QFrameGraph { public: - ForwardRenderer(Qt3D::QNode *parent); + ForwardRenderer(Qt3DCore::QNode *parent); - void setCamera(Qt3D::QEntity *camera); + void setCamera(Qt3DCore::QEntity *camera); private: Qt3DRender::QViewport *m_viewport; diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp index 72c302ba1..78cdb379e 100644 --- a/examples/qt3d/dynamicscene-cpp/main.cpp +++ b/examples/qt3d/dynamicscene-cpp/main.cpp @@ -54,7 +54,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::QAspectEngine engine; + Qt3DCore::QAspectEngine engine; engine.registerAspect(new Qt3DRender::QRenderAspect()); Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); @@ -67,8 +67,8 @@ int main(int argc, char* argv[]) ExampleScene *sceneRoot = new ExampleScene(); // Scene Camera - Qt3D::QCamera *basicCamera = new Qt3D::QCamera(sceneRoot); - basicCamera->setProjectionType(Qt3D::QCameraLens::PerspectiveProjection); + Qt3DCore::QCamera *basicCamera = new Qt3DCore::QCamera(sceneRoot); + basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection); basicCamera->setAspectRatio(view.width() / view.height()); basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f)); basicCamera->setViewCenter(QVector3D(0.0f, 3.5f, 0.0f)); diff --git a/examples/qt3d/enabled-qml/main.cpp b/examples/qt3d/enabled-qml/main.cpp index 40e119231..b2ba61324 100644 --- a/examples/qt3d/enabled-qml/main.cpp +++ b/examples/qt3d/enabled-qml/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->initialize(); QVariantMap data; diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp index c32850a20..7d85b0ad6 100644 --- a/examples/qt3d/gltf/main.cpp +++ b/examples/qt3d/gltf/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/gooch-qml/main.cpp b/examples/qt3d/gooch-qml/main.cpp index 7d5e65a85..e945f254c 100644 --- a/examples/qt3d/gooch-qml/main.cpp +++ b/examples/qt3d/gooch-qml/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/keyboardinput-qml/main.cpp b/examples/qt3d/keyboardinput-qml/main.cpp index 9239c9b7e..7efb66471 100644 --- a/examples/qt3d/keyboardinput-qml/main.cpp +++ b/examples/qt3d/keyboardinput-qml/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/loader-qml/main.cpp b/examples/qt3d/loader-qml/main.cpp index 79f5bfdb4..44a5d672b 100644 --- a/examples/qt3d/loader-qml/main.cpp +++ b/examples/qt3d/loader-qml/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/materials-cpp/barrel.cpp b/examples/qt3d/materials-cpp/barrel.cpp index c89b58d52..fc86a9ab2 100644 --- a/examples/qt3d/materials-cpp/barrel.cpp +++ b/examples/qt3d/materials-cpp/barrel.cpp @@ -57,7 +57,7 @@ const char *bumpsName[] = { "hard_bumps" }; -Barrel::Barrel(Qt3D::QNode *parent) +Barrel::Barrel(Qt3DCore::QNode *parent) : RenderableEntity(parent) , m_bumps(NoBumps) , m_diffuseColor(Red) diff --git a/examples/qt3d/materials-cpp/barrel.h b/examples/qt3d/materials-cpp/barrel.h index 0a8b81bde..c439d1a85 100644 --- a/examples/qt3d/materials-cpp/barrel.h +++ b/examples/qt3d/materials-cpp/barrel.h @@ -44,7 +44,7 @@ class Barrel : public RenderableEntity { public: - Barrel(Qt3D::QNode *parent = 0); + Barrel(Qt3DCore::QNode *parent = 0); ~Barrel(); enum DiffuseColor { diff --git a/examples/qt3d/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp index df1384486..81d0ab0d2 100644 --- a/examples/qt3d/materials-cpp/houseplant.cpp +++ b/examples/qt3d/materials-cpp/houseplant.cpp @@ -53,8 +53,8 @@ const char *plantNames[] = { }; -HousePlant::HousePlant(Qt3D::QNode *parent) - : Qt3D::QEntity(parent) +HousePlant::HousePlant(Qt3DCore::QNode *parent) + : Qt3DCore::QEntity(parent) , m_pot(new RenderableEntity(this)) , m_plant(new RenderableEntity(m_pot)) , m_cover(new RenderableEntity(m_pot)) diff --git a/examples/qt3d/materials-cpp/houseplant.h b/examples/qt3d/materials-cpp/houseplant.h index 36cb6ca23..a49326dbd 100644 --- a/examples/qt3d/materials-cpp/houseplant.h +++ b/examples/qt3d/materials-cpp/houseplant.h @@ -43,11 +43,11 @@ #include #include -class HousePlant : public Qt3D::QEntity +class HousePlant : public Qt3DCore::QEntity { Q_OBJECT public: - explicit HousePlant(Qt3D::QNode *parent = 0); + explicit HousePlant(Qt3DCore::QNode *parent = 0); ~HousePlant(); enum PotShape { diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp index f18f1f32a..b2e08b7fa 100644 --- a/examples/qt3d/materials-cpp/main.cpp +++ b/examples/qt3d/materials-cpp/main.cpp @@ -60,7 +60,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::QAspectEngine engine; + Qt3DCore::QAspectEngine engine; engine.registerAspect(new Qt3DRender::QRenderAspect()); Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; engine.registerAspect(input); @@ -71,11 +71,11 @@ int main(int argc, char* argv[]) engine.setData(data); // Scene Root - Qt3D::QEntity *sceneRoot = new Qt3D::QEntity(); + Qt3DCore::QEntity *sceneRoot = new Qt3DCore::QEntity(); // Scene Camera - Qt3D::QCamera *basicCamera = new Qt3D::QCamera(sceneRoot); - basicCamera->setProjectionType(Qt3D::QCameraLens::PerspectiveProjection); + Qt3DCore::QCamera *basicCamera = new Qt3DCore::QCamera(sceneRoot); + basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection); basicCamera->setAspectRatio(view.width() / view.height()); basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f)); basicCamera->setViewCenter(QVector3D(0.0f, 3.5f, 0.0f)); diff --git a/examples/qt3d/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp index 3a06bded7..b8a400232 100644 --- a/examples/qt3d/materials-cpp/planeentity.cpp +++ b/examples/qt3d/materials-cpp/planeentity.cpp @@ -41,12 +41,12 @@ #include #include -PlaneEntity::PlaneEntity(Qt3D::QNode *parent) - : Qt3D::QEntity(new Qt3D::QEntity(parent)) +PlaneEntity::PlaneEntity(Qt3DCore::QNode *parent) + : Qt3DCore::QEntity(new Qt3DCore::QEntity(parent)) , m_mesh(new Qt3DRender::QPlaneMesh()) - , m_transform(new Qt3D::QTransform()) - , m_scaleTransform(new Qt3D::QScaleTransform()) - , m_translateTransform(new Qt3D::QTranslateTransform()) + , m_transform(new Qt3DCore::QTransform()) + , m_scaleTransform(new Qt3DCore::QScaleTransform()) + , m_translateTransform(new Qt3DCore::QTranslateTransform()) { m_transform->addTransform(m_translateTransform); m_transform->addTransform(m_scaleTransform); @@ -58,12 +58,12 @@ PlaneEntity::~PlaneEntity() { } -Qt3D::QScaleTransform *PlaneEntity::scaleTransform() const +Qt3DCore::QScaleTransform *PlaneEntity::scaleTransform() const { return m_scaleTransform; } -Qt3D::QTranslateTransform *PlaneEntity::translateTransform() const +Qt3DCore::QTranslateTransform *PlaneEntity::translateTransform() const { return m_translateTransform; } diff --git a/examples/qt3d/materials-cpp/planeentity.h b/examples/qt3d/materials-cpp/planeentity.h index 48639b306..1b6f49d69 100644 --- a/examples/qt3d/materials-cpp/planeentity.h +++ b/examples/qt3d/materials-cpp/planeentity.h @@ -43,21 +43,21 @@ #include #include -class PlaneEntity : public Qt3D::QEntity +class PlaneEntity : public Qt3DCore::QEntity { public: - PlaneEntity(Qt3D::QNode *parent = 0); + PlaneEntity(Qt3DCore::QNode *parent = 0); ~PlaneEntity(); - Qt3D::QScaleTransform *scaleTransform() const; - Qt3D::QTranslateTransform *translateTransform() const; + Qt3DCore::QScaleTransform *scaleTransform() const; + Qt3DCore::QTranslateTransform *translateTransform() const; Qt3DRender::QPlaneMesh *mesh() const; private: Qt3DRender::QPlaneMesh *m_mesh; - Qt3D::QTransform *m_transform; - Qt3D::QScaleTransform *m_scaleTransform; - Qt3D::QTranslateTransform *m_translateTransform; + Qt3DCore::QTransform *m_transform; + Qt3DCore::QScaleTransform *m_scaleTransform; + Qt3DCore::QTranslateTransform *m_translateTransform; }; #endif // PLANEENTITY_H diff --git a/examples/qt3d/materials-cpp/renderableentity.cpp b/examples/qt3d/materials-cpp/renderableentity.cpp index 2e463a607..1d100c686 100644 --- a/examples/qt3d/materials-cpp/renderableentity.cpp +++ b/examples/qt3d/materials-cpp/renderableentity.cpp @@ -36,13 +36,13 @@ #include "renderableentity.h" -RenderableEntity::RenderableEntity(Qt3D::QNode *parent) - : Qt3D::QEntity(parent) +RenderableEntity::RenderableEntity(Qt3DCore::QNode *parent) + : Qt3DCore::QEntity(parent) , m_mesh(new Qt3DRender::QMesh()) - , m_transform(new Qt3D::QTransform()) - , m_rotateTransform(new Qt3D::QRotateTransform()) - , m_scaleTransform(new Qt3D::QScaleTransform()) - , m_translateTransform(new Qt3D::QTranslateTransform()) + , m_transform(new Qt3DCore::QTransform()) + , m_rotateTransform(new Qt3DCore::QRotateTransform()) + , m_scaleTransform(new Qt3DCore::QScaleTransform()) + , m_translateTransform(new Qt3DCore::QTranslateTransform()) { m_transform->addTransform(m_rotateTransform); m_transform->addTransform(m_scaleTransform); @@ -61,17 +61,17 @@ Qt3DRender::QMesh *RenderableEntity::mesh() const return m_mesh; } -Qt3D::QScaleTransform *RenderableEntity::scaleTransform() const +Qt3DCore::QScaleTransform *RenderableEntity::scaleTransform() const { return m_scaleTransform; } -Qt3D::QTranslateTransform *RenderableEntity::translateTransform() const +Qt3DCore::QTranslateTransform *RenderableEntity::translateTransform() const { return m_translateTransform; } -Qt3D::QRotateTransform *RenderableEntity::rotateTransform() const +Qt3DCore::QRotateTransform *RenderableEntity::rotateTransform() const { return m_rotateTransform; } diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h index 216ad843f..4a6397f9d 100644 --- a/examples/qt3d/materials-cpp/renderableentity.h +++ b/examples/qt3d/materials-cpp/renderableentity.h @@ -44,23 +44,23 @@ #include #include -class RenderableEntity : public Qt3D::QEntity +class RenderableEntity : public Qt3DCore::QEntity { public: - RenderableEntity(Qt3D::QNode *parent = 0); + RenderableEntity(Qt3DCore::QNode *parent = 0); ~RenderableEntity(); Qt3DRender::QMesh *mesh() const; - Qt3D::QScaleTransform *scaleTransform() const; - Qt3D::QTranslateTransform *translateTransform() const; - Qt3D::QRotateTransform *rotateTransform() const; + Qt3DCore::QScaleTransform *scaleTransform() const; + Qt3DCore::QTranslateTransform *translateTransform() const; + Qt3DCore::QRotateTransform *rotateTransform() const; private: Qt3DRender::QMesh *m_mesh; - Qt3D::QTransform *m_transform; - Qt3D::QRotateTransform *m_rotateTransform; - Qt3D::QScaleTransform *m_scaleTransform; - Qt3D::QTranslateTransform *m_translateTransform; + Qt3DCore::QTransform *m_transform; + Qt3DCore::QRotateTransform *m_rotateTransform; + Qt3DCore::QScaleTransform *m_scaleTransform; + Qt3DCore::QTranslateTransform *m_translateTransform; }; #endif // RENDERABLEENTITY_H diff --git a/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp b/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp index 833d82d37..b27abcd36 100644 --- a/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp +++ b/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp @@ -36,7 +36,7 @@ #include "rotatingtrefoilknot.h" -RotatingTrefoilKnot::RotatingTrefoilKnot(Qt3D::QNode *parent) +RotatingTrefoilKnot::RotatingTrefoilKnot(Qt3DCore::QNode *parent) : TrefoilKnot(parent) , m_thetaAnimation(new QPropertyAnimation(this)) , m_phiAnimation(new QPropertyAnimation(this)) diff --git a/examples/qt3d/materials-cpp/rotatingtrefoilknot.h b/examples/qt3d/materials-cpp/rotatingtrefoilknot.h index 231ce5270..397aa1705 100644 --- a/examples/qt3d/materials-cpp/rotatingtrefoilknot.h +++ b/examples/qt3d/materials-cpp/rotatingtrefoilknot.h @@ -43,7 +43,7 @@ class RotatingTrefoilKnot : public TrefoilKnot { public: - explicit RotatingTrefoilKnot(Qt3D::QNode *parent = 0); + explicit RotatingTrefoilKnot(Qt3DCore::QNode *parent = 0); ~RotatingTrefoilKnot(); private: diff --git a/examples/qt3d/materials-cpp/trefoilknot.cpp b/examples/qt3d/materials-cpp/trefoilknot.cpp index d71c9944d..610a972bd 100644 --- a/examples/qt3d/materials-cpp/trefoilknot.cpp +++ b/examples/qt3d/materials-cpp/trefoilknot.cpp @@ -36,14 +36,14 @@ #include "trefoilknot.h" -TrefoilKnot::TrefoilKnot(Qt3D::QNode *parent) - : Qt3D::QEntity(parent) +TrefoilKnot::TrefoilKnot(Qt3DCore::QNode *parent) + : Qt3DCore::QEntity(parent) , m_mesh(new Qt3DRender::QMesh()) - , m_transform(new Qt3D::QTransform()) - , m_scaleTransform(new Qt3D::QScaleTransform()) - , m_xaxisRotation(new Qt3D::QRotateTransform()) - , m_yaxisRotation(new Qt3D::QRotateTransform()) - , m_translateTransform(new Qt3D::QTranslateTransform()) + , m_transform(new Qt3DCore::QTransform()) + , m_scaleTransform(new Qt3DCore::QScaleTransform()) + , m_xaxisRotation(new Qt3DCore::QRotateTransform()) + , m_yaxisRotation(new Qt3DCore::QRotateTransform()) + , m_translateTransform(new Qt3DCore::QTranslateTransform()) { m_mesh->setSource(QUrl("qrc:/assets/obj/trefoil.obj")); m_xaxisRotation->setAxis(QVector3D(1.0f, 0.0f, 0.0f)); @@ -62,22 +62,22 @@ TrefoilKnot::~TrefoilKnot() { } -Qt3D::QScaleTransform *TrefoilKnot::scaleTransform() const +Qt3DCore::QScaleTransform *TrefoilKnot::scaleTransform() const { return m_scaleTransform; } -Qt3D::QRotateTransform *TrefoilKnot::xaxisRotateTransform() const +Qt3DCore::QRotateTransform *TrefoilKnot::xaxisRotateTransform() const { return m_xaxisRotation; } -Qt3D::QRotateTransform *TrefoilKnot::yaxisRotateTransform() const +Qt3DCore::QRotateTransform *TrefoilKnot::yaxisRotateTransform() const { return m_yaxisRotation; } -Qt3D::QTranslateTransform *TrefoilKnot::translateTransform() const +Qt3DCore::QTranslateTransform *TrefoilKnot::translateTransform() const { return m_translateTransform; } diff --git a/examples/qt3d/materials-cpp/trefoilknot.h b/examples/qt3d/materials-cpp/trefoilknot.h index 6beda9cd1..bac6e59b0 100644 --- a/examples/qt3d/materials-cpp/trefoilknot.h +++ b/examples/qt3d/materials-cpp/trefoilknot.h @@ -44,24 +44,24 @@ #include #include -class TrefoilKnot : public Qt3D::QEntity +class TrefoilKnot : public Qt3DCore::QEntity { public: - explicit TrefoilKnot(Qt3D::QNode *parent = 0); + explicit TrefoilKnot(Qt3DCore::QNode *parent = 0); ~TrefoilKnot(); - Qt3D::QScaleTransform *scaleTransform() const; - Qt3D::QRotateTransform *xaxisRotateTransform() const; - Qt3D::QRotateTransform *yaxisRotateTransform() const; - Qt3D::QTranslateTransform *translateTransform() const; + Qt3DCore::QScaleTransform *scaleTransform() const; + Qt3DCore::QRotateTransform *xaxisRotateTransform() const; + Qt3DCore::QRotateTransform *yaxisRotateTransform() const; + Qt3DCore::QTranslateTransform *translateTransform() const; private: Qt3DRender::QMesh *m_mesh; - Qt3D::QTransform *m_transform; - Qt3D::QScaleTransform *m_scaleTransform; - Qt3D::QRotateTransform *m_xaxisRotation; - Qt3D::QRotateTransform *m_yaxisRotation; - Qt3D::QTranslateTransform *m_translateTransform; + Qt3DCore::QTransform *m_transform; + Qt3DCore::QScaleTransform *m_scaleTransform; + Qt3DCore::QRotateTransform *m_xaxisRotation; + Qt3DCore::QRotateTransform *m_yaxisRotation; + Qt3DCore::QTranslateTransform *m_translateTransform; }; #endif // TREFOILKNOT_H diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp index 7fdc5ceed..e40da9894 100644 --- a/examples/qt3d/materials/main.cpp +++ b/examples/qt3d/materials/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/mouseinput-qml/main.cpp b/examples/qt3d/mouseinput-qml/main.cpp index 70e76e944..7dcb541b1 100644 --- a/examples/qt3d/mouseinput-qml/main.cpp +++ b/examples/qt3d/mouseinput-qml/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/multiviewport/main.cpp b/examples/qt3d/multiviewport/main.cpp index 857ea6ac5..e9a741d9c 100644 --- a/examples/qt3d/multiviewport/main.cpp +++ b/examples/qt3d/multiviewport/main.cpp @@ -45,7 +45,7 @@ int main(int ac, char **av) { QGuiApplication app(ac, av); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/plasma/main.cpp b/examples/qt3d/plasma/main.cpp index 3b0a8b4e3..f89c4f298 100644 --- a/examples/qt3d/plasma/main.cpp +++ b/examples/qt3d/plasma/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); diff --git a/examples/qt3d/playground-qml/main.cpp b/examples/qt3d/playground-qml/main.cpp index bb78f738a..4e93fd1bf 100644 --- a/examples/qt3d/playground-qml/main.cpp +++ b/examples/qt3d/playground-qml/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/shadow-map-qml/main.cpp b/examples/qt3d/shadow-map-qml/main.cpp index 9c10c866e..fd296aa62 100644 --- a/examples/qt3d/shadow-map-qml/main.cpp +++ b/examples/qt3d/shadow-map-qml/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; view.resize(1600, 800); engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp index 67d4fcbda..73c29c8f4 100644 --- a/examples/qt3d/simple-cpp/main.cpp +++ b/examples/qt3d/simple-cpp/main.cpp @@ -68,10 +68,10 @@ int main(int argc, char* argv[]) view.registerAspect(input); // Root entity - Qt3D::QEntity *rootEntity = new Qt3D::QEntity(); + Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity(); // Camera - Qt3D::QCamera *cameraEntity = view.defaultCamera(); + Qt3DCore::QCamera *cameraEntity = view.defaultCamera(); cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f); cameraEntity->setPosition(QVector3D(0, 0, -40.0f)); @@ -83,18 +83,18 @@ int main(int argc, char* argv[]) Qt3DRender::QMaterial *material = new Qt3DRender::QPhongMaterial(rootEntity); // Torus - Qt3D::QEntity *torusEntity = new Qt3D::QEntity(rootEntity); + Qt3DCore::QEntity *torusEntity = new Qt3DCore::QEntity(rootEntity); Qt3DRender::QTorusMesh *torusMesh = new Qt3DRender::QTorusMesh; torusMesh->setRadius(5); torusMesh->setMinorRadius(1); torusMesh->setRings(100); torusMesh->setSlices(20); - Qt3D::QTransform *torusTransform = new Qt3D::QTransform; - Qt3D::QScaleTransform *torusScaleTransform = new Qt3D::QScaleTransform; + Qt3DCore::QTransform *torusTransform = new Qt3DCore::QTransform; + Qt3DCore::QScaleTransform *torusScaleTransform = new Qt3DCore::QScaleTransform; torusScaleTransform->setScale3D(QVector3D(1.5, 1, 0.5)); - Qt3D::QRotateTransform *torusRotateTransform = new Qt3D::QRotateTransform; + Qt3DCore::QRotateTransform *torusRotateTransform = new Qt3DCore::QRotateTransform; torusRotateTransform->setAxis(QVector3D(1, 0, 0)); torusRotateTransform->setAngleDeg(45); @@ -107,15 +107,15 @@ int main(int argc, char* argv[]) torusEntity->addComponent(material); // Sphere - Qt3D::QEntity *sphereEntity = new Qt3D::QEntity(rootEntity); + Qt3DCore::QEntity *sphereEntity = new Qt3DCore::QEntity(rootEntity); Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh; sphereMesh->setRadius(3); - Qt3D::QTransform *sphereTransform = new Qt3D::QTransform; - Qt3D::QTranslateTransform *sphereTranslateTransform = new Qt3D::QTranslateTransform; + Qt3DCore::QTransform *sphereTransform = new Qt3DCore::QTransform; + Qt3DCore::QTranslateTransform *sphereTranslateTransform = new Qt3DCore::QTranslateTransform; sphereTranslateTransform->setTranslation(QVector3D(20, 0, 0)); - Qt3D::QRotateTransform *sphereRotateTransform = new Qt3D::QRotateTransform; + Qt3DCore::QRotateTransform *sphereRotateTransform = new Qt3DCore::QRotateTransform; QPropertyAnimation *sphereRotateTransformAnimation = new QPropertyAnimation(sphereRotateTransform); sphereRotateTransformAnimation->setTargetObject(sphereRotateTransform); sphereRotateTransformAnimation->setPropertyName("angle"); diff --git a/examples/qt3d/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp index 79f5bfdb4..44a5d672b 100644 --- a/examples/qt3d/simple-qml/main.cpp +++ b/examples/qt3d/simple-qml/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/simple-shaders-qml/main.cpp b/examples/qt3d/simple-shaders-qml/main.cpp index d3a49ea9b..e8d7a8565 100644 --- a/examples/qt3d/simple-shaders-qml/main.cpp +++ b/examples/qt3d/simple-shaders-qml/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/skybox/main.cpp b/examples/qt3d/skybox/main.cpp index 6dcecff5d..d09bea087 100644 --- a/examples/qt3d/skybox/main.cpp +++ b/examples/qt3d/skybox/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp index 038a77571..231702d4b 100644 --- a/examples/qt3d/tessellation-modes/main.cpp +++ b/examples/qt3d/tessellation-modes/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp index a3ee77d29..42583c92d 100644 --- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp +++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp @@ -44,7 +44,7 @@ class TessellatedGeometry : public Qt3DRender::QGeometry { Q_OBJECT public: - TessellatedGeometry(Qt3D::QNode *parent = Q_NULLPTR) + TessellatedGeometry(Qt3DCore::QNode *parent = Q_NULLPTR) : Qt3DRender::QGeometry(parent) , m_positionAttribute(new Qt3DRender::QAttribute(this)) , m_vertexBuffer(new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, this)) @@ -80,7 +80,7 @@ private: Qt3DRender::QBuffer *m_vertexBuffer; }; -TessellatedQuadMesh::TessellatedQuadMesh(Qt3D::QNode *parent) +TessellatedQuadMesh::TessellatedQuadMesh(Qt3DCore::QNode *parent) : Qt3DRender::QGeometryRenderer(parent) { setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches); diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h index 5f34e2400..8b1276af8 100644 --- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h +++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h @@ -43,7 +43,7 @@ class TessellatedQuadMesh : public Qt3DRender::QGeometryRenderer { Q_OBJECT public: - explicit TessellatedQuadMesh(Qt3D::QNode *parent = 0); + explicit TessellatedQuadMesh(Qt3DCore::QNode *parent = 0); ~TessellatedQuadMesh(); }; diff --git a/examples/qt3d/torus-qml/main.cpp b/examples/qt3d/torus-qml/main.cpp index d76264d7b..d2537bd8d 100644 --- a/examples/qt3d/torus-qml/main.cpp +++ b/examples/qt3d/torus-qml/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/transparency-qml/main.cpp b/examples/qt3d/transparency-qml/main.cpp index 6f5ffd6b4..6cce64b3a 100644 --- a/examples/qt3d/transparency-qml/main.cpp +++ b/examples/qt3d/transparency-qml/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); engine.aspectEngine()->initialize(); diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp index fb2f499f1..aaebf9182 100644 --- a/examples/qt3d/wave/main.cpp +++ b/examples/qt3d/wave/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/examples/qt3d/wireframe/main.cpp b/examples/qt3d/wireframe/main.cpp index f561cb52b..eb7827bcb 100644 --- a/examples/qt3d/wireframe/main.cpp +++ b/examples/qt3d/wireframe/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); diff --git a/src/collision/qabstractcollider.cpp b/src/collision/qabstractcollider.cpp index 7544cdcdf..8a549f8a6 100644 --- a/src/collision/qabstractcollider.cpp +++ b/src/collision/qabstractcollider.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCollision { /*! - \class Qt3D::QAbstractColliderPrivate + \class Qt3DCore::QAbstractColliderPrivate \internal */ QAbstractColliderPrivate::QAbstractColliderPrivate() diff --git a/src/collision/qabstractcollider.h b/src/collision/qabstractcollider.h index b11eb1c9f..e788c7b39 100644 --- a/src/collision/qabstractcollider.h +++ b/src/collision/qabstractcollider.h @@ -47,7 +47,7 @@ namespace Qt3DCollision { class QAbstractColliderPrivate; class QCollisionEvent; -class QT3DCOLLISIONSHARED_EXPORT QAbstractCollider : public Qt3D::QComponent +class QT3DCOLLISIONSHARED_EXPORT QAbstractCollider : public Qt3DCore::QComponent { Q_OBJECT diff --git a/src/collision/qabstractcollider_p.h b/src/collision/qabstractcollider_p.h index f2d355226..3fe9ca92d 100644 --- a/src/collision/qabstractcollider_p.h +++ b/src/collision/qabstractcollider_p.h @@ -56,7 +56,7 @@ namespace Qt3DCollision { class QAbstractCollider; -class QAbstractColliderPrivate : public Qt3D::QComponentPrivate +class QAbstractColliderPrivate : public Qt3DCore::QComponentPrivate { public: QAbstractColliderPrivate(); diff --git a/src/collision/qboxcollider.cpp b/src/collision/qboxcollider.cpp index d911cae6b..abb70908f 100644 --- a/src/collision/qboxcollider.cpp +++ b/src/collision/qboxcollider.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCollision { /*! - \class Qt3D::QBoxColliderPrivate + \class Qt3DCore::QBoxColliderPrivate \internal */ QBoxColliderPrivate::QBoxColliderPrivate() @@ -53,7 +53,7 @@ QBoxColliderPrivate::QBoxColliderPrivate() } /*! - \class Qt3D::QBoxCollider + \class Qt3DCore::QBoxCollider \inmodule Qt3DCollision \since 5.5 \brief Represents a box used for collision detection @@ -62,7 +62,7 @@ QBoxColliderPrivate::QBoxColliderPrivate() /*! \qmltype BoxCollider \inqmlmodule Qt3D.Collision - \instantiates Qt3D::QBoxCollider + \instantiates Qt3DCore::QBoxCollider \inherits Component3D \since 5.5 */ diff --git a/src/collision/qcapsulecollider.cpp b/src/collision/qcapsulecollider.cpp index c7caefd84..3c1a5f45e 100644 --- a/src/collision/qcapsulecollider.cpp +++ b/src/collision/qcapsulecollider.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCollision { /*! - \class Qt3D::QCapsuleColliderPrivate + \class Qt3DCore::QCapsuleColliderPrivate \internal */ QCapsuleColliderPrivate::QCapsuleColliderPrivate() @@ -55,7 +55,7 @@ QCapsuleColliderPrivate::QCapsuleColliderPrivate() } /*! - \class Qt3D::QCapsuleCollider + \class Qt3DCore::QCapsuleCollider \inmodule Qt3DCollision \since 5.5 \brief Represents a capsule used for collision detection @@ -64,7 +64,7 @@ QCapsuleColliderPrivate::QCapsuleColliderPrivate() /*! \qmltype CapsuleCollider \inqmlmodule Qt3D.Collision - \instantiates Qt3D::QCapsuleCollider + \instantiates Qt3DCore::QCapsuleCollider \inherits Component3D \since 5.5 */ diff --git a/src/collision/qcollisionaspect.cpp b/src/collision/qcollisionaspect.cpp index 408431ea3..3224d185a 100644 --- a/src/collision/qcollisionaspect.cpp +++ b/src/collision/qcollisionaspect.cpp @@ -49,16 +49,16 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DCollision { /*! - \class Qt3D::QCollisionAspectPrivate + \class Qt3DCore::QCollisionAspectPrivate \internal */ QCollisionAspectPrivate::QCollisionAspectPrivate() - : Qt3D::QAbstractAspectPrivate() + : QAbstractAspectPrivate() , m_time(0) { m_aspectType = QAbstractAspect::AspectCollision; @@ -82,36 +82,36 @@ void QCollisionAspect::registerBackendTypes() //registerBackendType(QBackendNodeFunctorPtr(new Collision::SphereColliderFunctor(d_func()->m_manager.data()))); } -QVector QCollisionAspect::jobsToExecute(qint64 time) +QVector QCollisionAspect::jobsToExecute(qint64 time) { Q_D(QCollisionAspect); d->m_time = time; // Create jobs that will get exectued by the threadpool - QVector jobs; + QVector jobs; return jobs; } -void QCollisionAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e) +void QCollisionAspect::sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = e.staticCast(); + QScenePropertyChangePtr propertyChange = e.staticCast(); QNodePtr nodePtr = propertyChange->value().value(); QNode *n = nodePtr.data(); QNodeVisitor visitor; visitor.traverse(n, this, &QCollisionAspect::visitNode); } -void QCollisionAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e) +void QCollisionAspect::sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) { - QScenePropertyChangePtr propertyChange = e.staticCast(); - QNodePtr nodePtr = propertyChange->value().value(); + QScenePropertyChangePtr propertyChange = e.staticCast(); + QNodePtr nodePtr = propertyChange->value().value(); QNode *n = nodePtr.data(); QAbstractAspect::clearBackendNode(n); } -void QCollisionAspect::setRootEntity(Qt3D::QEntity *rootObject) +void QCollisionAspect::setRootEntity(Qt3DCore::QEntity *rootObject) { - Qt3D::QNodeVisitor visitor; + Qt3DCore::QNodeVisitor visitor; visitor.traverse(rootObject, this, &QCollisionAspect::visitNode); } @@ -124,12 +124,12 @@ void QCollisionAspect::onCleanup() { } -void QCollisionAspect::visitNode(Qt3D::QNode *node) +void QCollisionAspect::visitNode(Qt3DCore::QNode *node) { QAbstractAspect::createBackendNode(node); } -} // Qt3D +} // Qt3DCollision QT_END_NAMESPACE diff --git a/src/collision/qcollisionaspect.h b/src/collision/qcollisionaspect.h index 5095b18ba..36f79c68b 100644 --- a/src/collision/qcollisionaspect.h +++ b/src/collision/qcollisionaspect.h @@ -46,26 +46,26 @@ namespace Qt3DCollision { class QCollisionAspectPrivate; -class QT3DCOLLISIONSHARED_EXPORT QCollisionAspect : public Qt3D::QAbstractAspect +class QT3DCOLLISIONSHARED_EXPORT QCollisionAspect : public Qt3DCore::QAbstractAspect { Q_OBJECT public: explicit QCollisionAspect(QObject *parent = 0); - QVector jobsToExecute(qint64 time) Q_DECL_OVERRIDE; + QVector jobsToExecute(qint64 time) Q_DECL_OVERRIDE; - void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; protected: void registerBackendTypes(); private: - void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE; + void setRootEntity(Qt3DCore::QEntity *rootObject) Q_DECL_OVERRIDE; void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE; void onCleanup() Q_DECL_OVERRIDE; - void visitNode(Qt3D::QNode *node); + void visitNode(Qt3DCore::QNode *node); Q_DECLARE_PRIVATE(QCollisionAspect) QCollisionAspect(QCollisionAspectPrivate &dd, QObject *parent); diff --git a/src/collision/qcollisionaspect_p.h b/src/collision/qcollisionaspect_p.h index 7f7797f4b..3a6733fd8 100644 --- a/src/collision/qcollisionaspect_p.h +++ b/src/collision/qcollisionaspect_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCollision { -class QCollisionAspectPrivate : public Qt3D::QAbstractAspectPrivate +class QCollisionAspectPrivate : public Qt3DCore::QAbstractAspectPrivate { QCollisionAspectPrivate(); diff --git a/src/collision/qspherecollider.cpp b/src/collision/qspherecollider.cpp index c968494aa..67bcdc1bf 100644 --- a/src/collision/qspherecollider.cpp +++ b/src/collision/qspherecollider.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCollision { /*! - \class Qt3D::QSphereColliderPrivate + \class Qt3DCore::QSphereColliderPrivate \internal */ QSphereColliderPrivate::QSphereColliderPrivate() @@ -53,7 +53,7 @@ QSphereColliderPrivate::QSphereColliderPrivate() } /*! - \class Qt3D::QSphereCollider + \class Qt3DCore::QSphereCollider \inmodule Qt3DCollision \since 5.5 \brief Represents a sphere used for collision detection @@ -62,7 +62,7 @@ QSphereColliderPrivate::QSphereColliderPrivate() /*! \qmltype SphereCollider \inqmlmodule Qt3D.Collision - \instantiates Qt3D::QSphereCollider + \instantiates Qt3DCore::QSphereCollider \inherits Component3D \since 5.5 */ diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index 02d8cb16f..806886ad5 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -50,10 +50,10 @@ static QByteArray className(const QMetaObject &obj) return QByteArray::fromRawData(obj.className(), int(strlen(obj.className()))); } -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractAspectPrivate + \class Qt3DCore::QAbstractAspectPrivate \internal */ QAbstractAspectPrivate::QAbstractAspectPrivate() @@ -71,7 +71,7 @@ QAbstractAspectPrivate *QAbstractAspectPrivate::get(QAbstractAspect *aspect) } /*! - \class Qt3D::QAbstractAspect + \class Qt3DCore::QAbstractAspect \inmodule Qt3DCore \brief QAbstractAspect is the base class for aspects that provide a vertical slice of behavior. */ @@ -203,6 +203,6 @@ void QAbstractAspect::onShutdown() { } -} // of namespace Qt3D +} // of namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index 12d5044a1..cd162dfd2 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTASPECT_H -#define QT3D_QABSTRACTASPECT_H +#ifndef QT3DCORE_QABSTRACTASPECT_H +#define QT3DCORE_QABSTRACTASPECT_H #include #include @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectManager; class QNode; @@ -118,8 +118,8 @@ void QAbstractAspect::registerBackendType(const QBackendNodeFunctorPtr &functor) registerBackendType(Frontend::staticMetaObject, functor); } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_ABSTRACTASPECT_H +#endif // QT3DCORE_ABSTRACTASPECT_H diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h index 77f9d2f02..5676cc8ce 100644 --- a/src/core/aspects/qabstractaspect_p.h +++ b/src/core/aspects/qabstractaspect_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTASPECT_P_H -#define QT3D_QABSTRACTASPECT_P_H +#ifndef QT3DCORE_QABSTRACTASPECT_P_H +#define QT3DCORE_QABSTRACTASPECT_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAspect; class QEntity; @@ -84,4 +84,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTASPECT_P_H +#endif // QT3DCORE_QABSTRACTASPECT_P_H diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index 9871f558d..6a0836294 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -55,10 +55,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAspectEnginePrivate + \class Qt3DCore::QAspectEnginePrivate \internal */ QAspectEnginePrivate::QAspectEnginePrivate() @@ -66,11 +66,11 @@ QAspectEnginePrivate::QAspectEnginePrivate() , m_postman(Q_NULLPTR) , m_scene(Q_NULLPTR) { - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); } /*! @@ -146,10 +146,10 @@ void QAspectEngine::initialize() QChangeArbiter::createUnmanagedThreadLocalChangeQueue(arbiter); QMetaObject::invokeMethod(arbiter, "setPostman", - Q_ARG(Qt3D::QAbstractPostman*, d->m_postman)); + Q_ARG(Qt3DCore::QAbstractPostman*, d->m_postman)); QMetaObject::invokeMethod(arbiter, "setScene", - Q_ARG(Qt3D::QScene*, d->m_scene)); + Q_ARG(Qt3DCore::QScene*, d->m_scene)); } void QAspectEngine::shutdown() @@ -202,7 +202,7 @@ void QAspectEngine::registerAspect(QAbstractAspect *aspect) QMetaObject::invokeMethod(d->m_aspectThread->aspectManager(), "registerAspect", Qt::BlockingQueuedConnection, - Q_ARG(Qt3D::QAbstractAspect *, aspect)); + Q_ARG(Qt3DCore::QAbstractAspect *, aspect)); } /*! @@ -256,7 +256,7 @@ void QAspectEngine::setRootEntity(QEntity *root) QMetaObject::invokeMethod(d->m_aspectThread->aspectManager(), "setRootEntity", Qt::BlockingQueuedConnection, - Q_ARG(Qt3D::QEntity *, root)); + Q_ARG(Qt3DCore::QEntity *, root)); qCDebug(Aspects) << "Done setting scene root on aspect manager"; } @@ -278,6 +278,6 @@ void QAspectEngine::setAspectFactory(const QAspectFactory &factory) d->m_factory = factory; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h index cdbb01a30..e9e768add 100644 --- a/src/core/aspects/qaspectengine.h +++ b/src/core/aspects/qaspectengine.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTENGINE_H -#define QT3D_QASPECTENGINE_H +#ifndef QT3DCORE_QASPECTENGINE_H +#define QT3DCORE_QASPECTENGINE_H #include #include @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAspect; class QAspectThread; @@ -81,9 +81,9 @@ private: void initNodeTree(QNode *node); }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTENGINE_H +#endif // QT3DCORE_QASPECTENGINE_H diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h index a8409f2c0..0439058d1 100644 --- a/src/core/aspects/qaspectengine_p.h +++ b/src/core/aspects/qaspectengine_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTENGINE_P_H -#define QT3D_QASPECTENGINE_P_H +#ifndef QT3DCORE_QASPECTENGINE_P_H +#define QT3DCORE_QASPECTENGINE_P_H // // W A R N I N G @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QEntity; class QNode; @@ -85,4 +85,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QASPECTENGINE_P_H +#endif // QT3DCORE_QASPECTENGINE_P_H diff --git a/src/core/aspects/qaspectfactory.cpp b/src/core/aspects/qaspectfactory.cpp index 04e902acf..673ff5bdd 100644 --- a/src/core/aspects/qaspectfactory.cpp +++ b/src/core/aspects/qaspectfactory.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { typedef QHash defaultFactories_t; Q_GLOBAL_STATIC(defaultFactories_t, defaultFactories) @@ -55,7 +55,7 @@ QT3DCORESHARED_EXPORT void qt3d_QAspectFactoryPrivate_addDefaultFactory(const QS } /*! - \class Qt3D::QAspectFactoryPrivate + \class Qt3DCore::QAspectFactoryPrivate \internal */ QAspectFactoryPrivate::QAspectFactoryPrivate() @@ -103,6 +103,6 @@ QAbstractAspect *QAspectFactory::createAspect(const QString &aspect, QObject *pa } } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/aspects/qaspectfactory.h b/src/core/aspects/qaspectfactory.h index 938e8a967..9280c5340 100644 --- a/src/core/aspects/qaspectfactory.h +++ b/src/core/aspects/qaspectfactory.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTFACTORY_H -#define QT3D_QASPECTFACTORY_H +#ifndef QT3DCORE_QASPECTFACTORY_H +#define QT3DCORE_QASPECTFACTORY_H #include #include @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QObject; -namespace Qt3D { +namespace Qt3DCore { class QAbstractAspect; class QAspectFactoryPrivate; @@ -85,20 +85,20 @@ private: QSharedDataPointer d; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE #define QT3D_REGISTER_NAMESPACED_ASPECT(name, AspectNamespace, AspectType) \ QT_BEGIN_NAMESPACE \ - namespace Qt3D { \ + namespace Qt3DCore { \ QT3DCORESHARED_EXPORT void qt3d_QAspectFactoryPrivate_addDefaultFactory(const QString &, QAspectFactory::CreateFunction); \ } \ QT_END_NAMESPACE \ namespace { \ void qt3d_ ## AspectType ## _registerFunction() \ { \ - using namespace QT_PREPEND_NAMESPACE(Qt3D); \ + using namespace QT_PREPEND_NAMESPACE(Qt3DCore); \ qt3d_QAspectFactoryPrivate_addDefaultFactory(QStringLiteral(name), &QAspectFactory::functionHelper); \ } \ \ @@ -108,4 +108,4 @@ QT_END_NAMESPACE #define QT3D_REGISTER_ASPECT(name, AspectType) \ QT3D_REGISTER_NAMESPACED_ASPECT(name, , AspectType) -#endif // QT3D_QASPECTFACTORY_H +#endif // QT3DCORE_QASPECTFACTORY_H diff --git a/src/core/aspects/qaspectfactory_p.h b/src/core/aspects/qaspectfactory_p.h index 7e105fe09..dfe7ccd9e 100644 --- a/src/core/aspects/qaspectfactory_p.h +++ b/src/core/aspects/qaspectfactory_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTFACTORY_P_H -#define QT3D_QASPECTFACTORY_P_H +#ifndef QT3DCORE_QASPECTFACTORY_P_H +#define QT3DCORE_QASPECTFACTORY_P_H // // W A R N I N G @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectFactory; @@ -72,4 +72,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QASPECTFACTORY_P_H +#endif // QT3DCORE_QASPECTFACTORY_P_H diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp index e6752f19c..0c5940ce5 100644 --- a/src/core/aspects/qaspectmanager.cpp +++ b/src/core/aspects/qaspectmanager.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QAspectManager::QAspectManager(QObject *parent) : QObject(parent) @@ -106,7 +106,7 @@ void QAspectManager::shutdown() // Aspects must be deleted in the Thread they were created in } -void QAspectManager::setRootEntity(Qt3D::QEntity *root) +void QAspectManager::setRootEntity(Qt3DCore::QEntity *root) { qCDebug(Aspects) << Q_FUNC_INFO; @@ -261,7 +261,7 @@ QServiceLocator *QAspectManager::serviceLocator() const return m_serviceLocator.data(); } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h index bdf8b9233..8c1e372af 100644 --- a/src/core/aspects/qaspectmanager_p.h +++ b/src/core/aspects/qaspectmanager_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTMANAGER_P_H -#define QT3D_QASPECTMANAGER_P_H +#ifndef QT3DCORE_QASPECTMANAGER_P_H +#define QT3DCORE_QASPECTMANAGER_P_H // // W A R N I N G @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QSurface; -namespace Qt3D { +namespace Qt3DCore { class QNode; class QEntity; @@ -83,9 +83,9 @@ public Q_SLOTS: void initialize(); void shutdown(); - void setRootEntity(Qt3D::QEntity *root); + void setRootEntity(Qt3DCore::QEntity *root); void setData(const QVariantMap &data); - void registerAspect(Qt3D::QAbstractAspect *aspect); + void registerAspect(Qt3DCore::QAbstractAspect *aspect); QVariantMap data() const; void exec(); @@ -109,8 +109,8 @@ private: QSemaphore m_waitForEndOfExecLoop; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTMANAGER_P_H +#endif // QT3DCORE_QASPECTMANAGER_P_H diff --git a/src/core/aspects/qaspectthread.cpp b/src/core/aspects/qaspectthread.cpp index 0b1a969d3..67ce4cf20 100644 --- a/src/core/aspects/qaspectthread.cpp +++ b/src/core/aspects/qaspectthread.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QAspectThread::QAspectThread(QObject *parent) : QThread(parent), @@ -87,6 +87,6 @@ void QAspectThread::run() qCDebug(Aspects) << "Exiting void QAspectThread::run()"; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/aspects/qaspectthread.h b/src/core/aspects/qaspectthread.h index 8d32e28bd..7bb48771e 100644 --- a/src/core/aspects/qaspectthread.h +++ b/src/core/aspects/qaspectthread.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QASPECTTHREAD_H -#define QT3D_QASPECTTHREAD_H +#ifndef QT3DCORE_QASPECTTHREAD_H +#define QT3DCORE_QASPECTTHREAD_H #include #include @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectManager; @@ -66,8 +66,8 @@ private: QSemaphore m_semaphore; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QASPECTTHREAD_H +#endif // QT3DCORE_QASPECTTHREAD_H diff --git a/src/core/bounds/qaxisalignedboundingbox.cpp b/src/core/bounds/qaxisalignedboundingbox.cpp index 21bb55bb4..afd21348c 100644 --- a/src/core/bounds/qaxisalignedboundingbox.cpp +++ b/src/core/bounds/qaxisalignedboundingbox.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { void QAxisAlignedBoundingBox::update(const QVector &points) { @@ -89,6 +89,6 @@ QDebug operator<<(QDebug dbg, const QAxisAlignedBoundingBox &c) return dbg; } -} //namespace Qt3D +} //namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/bounds/qaxisalignedboundingbox.h b/src/core/bounds/qaxisalignedboundingbox.h index c05917cf2..bf25fada3 100644 --- a/src/core/bounds/qaxisalignedboundingbox.h +++ b/src/core/bounds/qaxisalignedboundingbox.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QAXISALIGNEDBOUNDINGBOX_H -#define QT3D_QAXISALIGNEDBOUNDINGBOX_H +#ifndef QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H +#define QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H #include @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QDebug; -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QAxisAlignedBoundingBox { @@ -148,8 +148,8 @@ inline bool intersects(const QAxisAlignedBoundingBox &a, return true; } -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_QAXISALIGNEDBOUNDINGBOX_H +#endif // QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H diff --git a/src/core/core-components/qcamera.cpp b/src/core/core-components/qcamera.cpp index 9450ccf5b..5f7b2ef9a 100644 --- a/src/core/core-components/qcamera.cpp +++ b/src/core/core-components/qcamera.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QCameraPrivate + \class Qt3DCore::QCameraPrivate \internal */ QCameraPrivate::QCameraPrivate() @@ -55,7 +55,7 @@ QCameraPrivate::QCameraPrivate() /*! \qmltype Camera - \instantiates Qt3D::QCamera + \instantiates Qt3DCore::QCamera \inherits Entity \inqmlmodule Qt3D \since 5.5 @@ -256,7 +256,7 @@ void QCamera::setProjectionType(QCameraLens::ProjectionType type) } /*! - \qmlproperty enumeration Qt3D::Camera::projectionType + \qmlproperty enumeration Qt3DCore::Camera::projectionType Holds the type of the camera projection (orthogonal or perspective). @@ -277,7 +277,7 @@ void QCamera::setNearPlane(float nearPlane) } /*! - \qmlproperty float Qt3D::Camera::nearPlane + \qmlproperty float Qt3DCore::Camera::nearPlane */ float QCamera::nearPlane() const @@ -293,7 +293,7 @@ void QCamera::setFarPlane(float farPlane) } /*! - \qmlproperty float Qt3D::Camera::farPlane + \qmlproperty float Qt3DCore::Camera::farPlane */ float QCamera::farPlane() const @@ -309,7 +309,7 @@ void QCamera::setFieldOfView(float fieldOfView) } /*! - \qmlproperty float Qt3D::Camera::fieldOfView + \qmlproperty float Qt3DCore::Camera::fieldOfView */ float QCamera::fieldOfView() const @@ -325,7 +325,7 @@ void QCamera::setAspectRatio(float aspectRatio) } /*! - \qmlproperty float Qt3D::Camera::aspectRatio + \qmlproperty float Qt3DCore::Camera::aspectRatio */ float QCamera::aspectRatio() const @@ -341,7 +341,7 @@ void QCamera::setLeft(float left) } /*! - \qmlproperty float Qt3D::Camera::left + \qmlproperty float Qt3DCore::Camera::left */ float QCamera::left() const @@ -357,7 +357,7 @@ void QCamera::setRight(float right) } /*! - \qmlproperty float Qt3D::Camera::right + \qmlproperty float Qt3DCore::Camera::right */ float QCamera::right() const @@ -373,7 +373,7 @@ void QCamera::setBottom(float bottom) } /*! - \qmlproperty float Qt3D::Camera::bottom + \qmlproperty float Qt3DCore::Camera::bottom */ float QCamera::bottom() const @@ -389,7 +389,7 @@ void QCamera::setTop(float top) } /*! - \qmlproperty float Qt3D::Camera::top + \qmlproperty float Qt3DCore::Camera::top */ float QCamera::top() const @@ -399,7 +399,7 @@ float QCamera::top() const } /*! - \qmlproperty matrix4x4 Qt3D::Camera::projectionMatrix + \qmlproperty matrix4x4 Qt3DCore::Camera::projectionMatrix \readonly */ @@ -416,7 +416,7 @@ void QCamera::setPosition(const QVector3D &position) } /*! - \qmlproperty vector3d Qt3D::Camera::position + \qmlproperty vector3d Qt3DCore::Camera::position */ QVector3D QCamera::position() const @@ -433,7 +433,7 @@ void QCamera::setUpVector(const QVector3D &upVector) } /*! - \qmlproperty vector3d Qt3D::Camera::upVector + \qmlproperty vector3d Qt3DCore::Camera::upVector */ QVector3D QCamera::upVector() const @@ -449,7 +449,7 @@ void QCamera::setViewCenter(const QVector3D &viewCenter) } /*! - \qmlproperty vector3d Qt3D::Camera::viewCenter + \qmlproperty vector3d Qt3DCore::Camera::viewCenter */ QVector3D QCamera::viewCenter() const @@ -459,7 +459,7 @@ QVector3D QCamera::viewCenter() const } /*! - \qmlproperty matrix4x4 Qt3D::Camera::matrix + \qmlproperty matrix4x4 Qt3DCore::Camera::matrix */ QMatrix4x4 QCamera::matrix() const { diff --git a/src/core/core-components/qcamera.h b/src/core/core-components/qcamera.h index e3d6b2e31..9832aa5f9 100644 --- a/src/core/core-components/qcamera.h +++ b/src/core/core-components/qcamera.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERA_H -#define QT3D_CAMERA_H +#ifndef QT3DCORE_CAMERA_H +#define QT3DCORE_CAMERA_H #include #include @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QLookAtTransform; class QTransform; @@ -55,7 +55,7 @@ class QT3DCORESHARED_EXPORT QCamera : public QEntity { Q_OBJECT // CameraLens - Q_PROPERTY(Qt3D::QCameraLens::ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionTypeChanged) + Q_PROPERTY(Qt3DCore::QCameraLens::ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionTypeChanged) Q_PROPERTY(float nearPlane READ nearPlane WRITE setNearPlane NOTIFY nearPlaneChanged) Q_PROPERTY(float farPlane READ farPlane WRITE setFarPlane NOTIFY farPlaneChanged) Q_PROPERTY(float fieldOfView READ fieldOfView WRITE setFieldOfView NOTIFY fieldOfViewChanged) @@ -167,8 +167,8 @@ protected: QCamera(QCameraPrivate &dd, QNode *parent = 0); }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_CAMERA_H +#endif // QT3DCORE_CAMERA_H diff --git a/src/core/core-components/qcamera_p.h b/src/core/core-components/qcamera_p.h index d16ba647f..12eef5b35 100644 --- a/src/core/core-components/qcamera_p.h +++ b/src/core/core-components/qcamera_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERA_P_H -#define QT3D_CAMERA_P_H +#ifndef QT3DCORE_CAMERA_P_H +#define QT3DCORE_CAMERA_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QCameraPrivate : public QEntityPrivate { @@ -69,8 +69,8 @@ public: QLookAtTransform *m_lookAt; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_CAMERA_P_H +#endif // QT3DCORE_CAMERA_P_H diff --git a/src/core/core-components/qcameralens.cpp b/src/core/core-components/qcameralens.cpp index 239fe2904..206745c28 100644 --- a/src/core/core-components/qcameralens.cpp +++ b/src/core/core-components/qcameralens.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QCameraLensPrivate + \class Qt3DCore::QCameraLensPrivate \internal */ QCameraLensPrivate::QCameraLensPrivate() @@ -87,10 +87,10 @@ void QCameraLens::copy(const QNode *ref) d_func()->m_projectionMatrix = lens->d_func()->m_projectionMatrix; } -/*! \class Qt3D::QCameraLens +/*! \class Qt3DCore::QCameraLens * \inmodule Qt3DCore * - * \brief Qt3D::QCameraLens specifies the projection matrix that will be used to + * \brief Qt3DCore::QCameraLens specifies the projection matrix that will be used to * define a Camera for a 3D scene. * * \since 5.5 @@ -105,8 +105,8 @@ QCameraLens::QCameraLens(QCameraLensPrivate &dd, QNode *parent) /*! * Sets the lens' projection type \a projectionType. * - * \note Qt3D::QCameraLens::Frustum and - * Qt3D::QCameraLens::PerspectiveProjection are two different ways of + * \note Qt3DCore::QCameraLens::Frustum and + * Qt3DCore::QCameraLens::PerspectiveProjection are two different ways of * specifying the same projection. */ void QCameraLens::setProjectionType(QCameraLens::ProjectionType projectionType) @@ -239,7 +239,7 @@ float QCameraLens::farPlane() const * a projection matrix update. * * \note this has no effect if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setFieldOfView(float fieldOfView) { @@ -255,7 +255,7 @@ void QCameraLens::setFieldOfView(float fieldOfView) * Returns the projection's field of view in degrees. * * \note: The return value may be undefined if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::fieldOfView() const { @@ -268,7 +268,7 @@ float QCameraLens::fieldOfView() const * matrix update. * * \note this has no effect if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setAspectRatio(float aspectRatio) { @@ -284,7 +284,7 @@ void QCameraLens::setAspectRatio(float aspectRatio) * Returns the projection's aspect ratio. * * \note: The return value may be undefined if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::aspectRatio() const { @@ -297,7 +297,7 @@ float QCameraLens::aspectRatio() const * triggers a projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setLeft(float left) { @@ -313,7 +313,7 @@ void QCameraLens::setLeft(float left) * Returns the lower left window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::left() const { @@ -326,7 +326,7 @@ float QCameraLens::left() const * a projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setRight(float right) { @@ -342,7 +342,7 @@ void QCameraLens::setRight(float right) * Returns the upper right window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::right() const { @@ -355,7 +355,7 @@ float QCameraLens::right() const * projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setBottom(float bottom) { @@ -371,7 +371,7 @@ void QCameraLens::setBottom(float bottom) * Returns the bottom window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::bottom() const { @@ -384,7 +384,7 @@ float QCameraLens::bottom() const * projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setTop(float top) { @@ -400,7 +400,7 @@ void QCameraLens::setTop(float top) * Returns the bottom window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::top() const { @@ -421,14 +421,14 @@ QMatrix4x4 QCameraLens::projectionMatrix() const /*! \qmltype CameraLens - \instantiates Qt3D::QCameraLens + \instantiates Qt3DCore::QCameraLens \inqmlmodule Qt3D \inherits Component3D \since 5.5 */ /*! - \qmlproperty enumeration Qt3D::CameraLens::projectionType + \qmlproperty enumeration Qt3DCore::CameraLens::projectionType Holds the type of the camera projection (orthogonal or perspective). @@ -437,39 +437,39 @@ QMatrix4x4 QCameraLens::projectionMatrix() const */ /*! - \qmlproperty float Qt3D::CameraLens::nearPlane + \qmlproperty float Qt3DCore::CameraLens::nearPlane */ /*! - \qmlproperty float Qt3D::CameraLens::farPlane + \qmlproperty float Qt3DCore::CameraLens::farPlane */ /*! - \qmlproperty float Qt3D::CameraLens::fieldOfView + \qmlproperty float Qt3DCore::CameraLens::fieldOfView */ /*! - \qmlproperty float Qt3D::CameraLens::aspectRatio + \qmlproperty float Qt3DCore::CameraLens::aspectRatio */ /*! - \qmlproperty float Qt3D::CameraLens::left + \qmlproperty float Qt3DCore::CameraLens::left */ /*! - \qmlproperty float Qt3D::CameraLens::right + \qmlproperty float Qt3DCore::CameraLens::right */ /*! - \qmlproperty float Qt3D::CameraLens::bottom + \qmlproperty float Qt3DCore::CameraLens::bottom */ /*! - \qmlproperty float Qt3D::CameraLens::top + \qmlproperty float Qt3DCore::CameraLens::top */ /*! - \qmlproperty matrix4x4 Qt3D::CameraLens::projectionMatrix + \qmlproperty matrix4x4 Qt3DCore::CameraLens::projectionMatrix \readonly */ diff --git a/src/core/core-components/qcameralens.h b/src/core/core-components/qcameralens.h index 7ec77adf7..7877b3a13 100644 --- a/src/core/core-components/qcameralens.h +++ b/src/core/core-components/qcameralens.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERALENS_H -#define QT3D_CAMERALENS_H +#ifndef QT3DCORE_CAMERALENS_H +#define QT3DCORE_CAMERALENS_H #include #include @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QCameraLensPrivate; diff --git a/src/core/core-components/qcameralens_p.h b/src/core/core-components/qcameralens_p.h index 94d08c45a..b7ed7e9a8 100644 --- a/src/core/core-components/qcameralens_p.h +++ b/src/core/core-components/qcameralens_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERALENS_P_H -#define QT3D_CAMERALENS_P_H +#ifndef QT3DCORE_CAMERALENS_P_H +#define QT3DCORE_CAMERALENS_P_H // // W A R N I N G @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QCameraLensPrivate : public QComponentPrivate { @@ -122,8 +122,8 @@ private: } }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_CAMERALENS_P_H +#endif // QT3DCORE_CAMERALENS_P_H diff --git a/src/core/corelogging.cpp b/src/core/corelogging.cpp index fe9de5dcc..a9917d90c 100644 --- a/src/core/corelogging.cpp +++ b/src/core/corelogging.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { Q_LOGGING_CATEGORY(Nodes, "Qt3D.Core.Nodes") Q_LOGGING_CATEGORY(Aspects, "Qt3D.Core.Aspects") diff --git a/src/core/corelogging_p.h b/src/core/corelogging_p.h index adca1cee6..7b944bb50 100644 --- a/src/core/corelogging_p.h +++ b/src/core/corelogging_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CORELOGGING_P_H -#define QT3D_CORELOGGING_P_H +#ifndef QT3DCORE_CORELOGGING_P_H +#define QT3DCORE_CORELOGGING_P_H // // W A R N I N G @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { Q_DECLARE_LOGGING_CATEGORY(Resources) Q_DECLARE_LOGGING_CATEGORY(Nodes) @@ -64,4 +64,4 @@ Q_DECLARE_LOGGING_CATEGORY(ChangeArbiter) QT_END_NAMESPACE -#endif // QT3D_CORELOGGING_P_H +#endif // QT3DCORE_CORELOGGING_P_H diff --git a/src/core/io/qabstractattribute.cpp b/src/core/io/qabstractattribute.cpp index 728a31a49..56563e01e 100644 --- a/src/core/io/qabstractattribute.cpp +++ b/src/core/io/qabstractattribute.cpp @@ -42,10 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractAttributePrivate + \class Qt3DCore::QAbstractAttributePrivate \internal */ QAbstractAttributePrivate::QAbstractAttributePrivate() @@ -69,7 +69,7 @@ QAbstractAttribute::QAbstractAttribute(QNode *parent) QAbstractAttribute::~QAbstractAttribute() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QAbstractAttribute subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QAbstractAttribute subclass didn't call QNode::cleanup in its destructor"); } QAbstractAttribute::QAbstractAttribute(QAbstractBuffer *buf, DataType type, uint dataSize, uint count, uint offset, uint stride, QNode *parent) diff --git a/src/core/io/qabstractattribute.h b/src/core/io/qabstractattribute.h index f1f157b57..cf23812d1 100644 --- a/src/core/io/qabstractattribute.h +++ b/src/core/io/qabstractattribute.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTATTRIBUTE_H -#define QT3D_QABSTRACTATTRIBUTE_H +#ifndef QT3DCORE_QABSTRACTATTRIBUTE_H +#define QT3DCORE_QABSTRACTATTRIBUTE_H #include #include @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractBuffer; class QAbstractAttributePrivate; @@ -53,7 +53,7 @@ typedef QSharedPointer QAbstractBufferPtr; class QT3DCORESHARED_EXPORT QAbstractAttribute : public QNode { Q_OBJECT - Q_PROPERTY(Qt3D::QAbstractBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged) + Q_PROPERTY(Qt3DCore::QAbstractBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(DataType dataType READ dataType WRITE setDataType NOTIFY dataTypeChanged) Q_PROPERTY(uint dataSize READ dataSize WRITE setDataSize NOTIFY dataSizeChanged) @@ -138,4 +138,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTATTRIBUTE_H +#endif // QT3DCORE_QABSTRACTATTRIBUTE_H diff --git a/src/core/io/qabstractattribute_p.h b/src/core/io/qabstractattribute_p.h index b825aebbe..88cc945e1 100644 --- a/src/core/io/qabstractattribute_p.h +++ b/src/core/io/qabstractattribute_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTATTRIBUTE_P_H -#define QT3D_QABSTRACTATTRIBUTE_P_H +#ifndef QT3DCORE_QABSTRACTATTRIBUTE_P_H +#define QT3DCORE_QABSTRACTATTRIBUTE_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractAttribute; @@ -81,4 +81,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTATTRIBUTE_P_H +#endif // QT3DCORE_QABSTRACTATTRIBUTE_P_H diff --git a/src/core/io/qabstractbuffer.cpp b/src/core/io/qabstractbuffer.cpp index 7089b5a91..c53904747 100644 --- a/src/core/io/qabstractbuffer.cpp +++ b/src/core/io/qabstractbuffer.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QAbstractBufferPrivate + \class Qt3DCore::QAbstractBufferPrivate \internal */ @@ -58,7 +58,7 @@ QAbstractBuffer::QAbstractBuffer(QNode *parent) QAbstractBuffer::~QAbstractBuffer() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QAbstractBuffer subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QAbstractBuffer subclass didn't call QNode::cleanup in its destructor"); } /*! \internal */ diff --git a/src/core/io/qabstractbuffer.h b/src/core/io/qabstractbuffer.h index 8b68b0e04..2a2120ec4 100644 --- a/src/core/io/qabstractbuffer.h +++ b/src/core/io/qabstractbuffer.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTBUFFER_H -#define QT3D_QABSTRACTBUFFER_H +#ifndef QT3DCORE_QABSTRACTBUFFER_H +#define QT3DCORE_QABSTRACTBUFFER_H #include #include @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractBufferPrivate; @@ -76,4 +76,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTBUFFER_H +#endif // QT3DCORE_QABSTRACTBUFFER_H diff --git a/src/core/io/qabstractbuffer_p.h b/src/core/io/qabstractbuffer_p.h index d48b31c95..375d96d54 100644 --- a/src/core/io/qabstractbuffer_p.h +++ b/src/core/io/qabstractbuffer_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTBUFFER_P_H -#define QT3D_QABSTRACTBUFFER_P_H +#ifndef QT3DCORE_QABSTRACTBUFFER_P_H +#define QT3DCORE_QABSTRACTBUFFER_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAbstractBuffer; @@ -72,4 +72,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTBUFFER_P_H +#endif // QT3DCORE_QABSTRACTBUFFER_P_H diff --git a/src/core/io/qurlhelper.cpp b/src/core/io/qurlhelper.cpp index c930f2059..fab671b94 100644 --- a/src/core/io/qurlhelper.cpp +++ b/src/core/io/qurlhelper.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { QString QUrlHelper::urlToLocalFileOrQrc(const QUrl &url) { diff --git a/src/core/io/qurlhelper_p.h b/src/core/io/qurlhelper_p.h index 27c8a674c..9bc6b5dfe 100644 --- a/src/core/io/qurlhelper_p.h +++ b/src/core/io/qurlhelper_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QURLHELPER_P_H -#define QT3D_QURLHELPER_P_H +#ifndef QT3DCORE_QURLHELPER_P_H +#define QT3DCORE_QURLHELPER_P_H // // W A R N I N G @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QUrlHelper { @@ -65,4 +65,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QURLHELPER_P_H +#endif // QT3DCORE_QURLHELPER_P_H diff --git a/src/core/jobs/dependencyhandler.cpp b/src/core/jobs/dependencyhandler.cpp index a805638fe..d39b04ba4 100644 --- a/src/core/jobs/dependencyhandler.cpp +++ b/src/core/jobs/dependencyhandler.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { namespace { template