diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-15 12:11:00 +0100 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-17 09:17:34 +0000 |
| commit | 8ef01dadfde7ad5bbe0bc42f145aa18d557d0c7a (patch) | |
| tree | 7e90457c1cdc37d589bc6e46d7f1575901fe4e11 /src/render/jobs | |
| parent | 3369e293d9dda79d767a6269838a61f6340ede48 (diff) | |
Move services() and jobManager() to the pimpl
This way we avoid leaking private types through public API.
Change-Id: Ifb30d7e57d8b995bba8cf9a95ae77f8d7818d79a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/jobs')
| -rw-r--r-- | src/render/jobs/pickboundingvolumejob.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp index d58141022..1191464ff 100644 --- a/src/render/jobs/pickboundingvolumejob.cpp +++ b/src/render/jobs/pickboundingvolumejob.cpp @@ -50,6 +50,7 @@ #include <Qt3DRender/private/triangleboundingvolume_p.h> #include <Qt3DRender/private/qraycastingservice_p.h> #include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DCore/private/qabstractaspect_p.h> #include <Qt3DCore/private/qservicelocator_p.h> #include <Qt3DCore/qray3d.h> #include <QSurface> @@ -239,12 +240,14 @@ void PickBoundingVolumeJob::run() if (m_mouseEvents.empty()) return; - QAbstractCollisionQueryService *rayCasting = m_renderer->renderAspect()->services()->service<QAbstractCollisionQueryService> + Qt3DCore::QServiceLocator *services + = Qt3DCore::QAbstractAspectPrivate::get(m_renderer->renderAspect())->services(); + QAbstractCollisionQueryService *rayCasting = services->service<QAbstractCollisionQueryService> (Qt3DCore::QServiceLocator::CollisionService); if (rayCasting == Q_NULLPTR) { Qt3DRender::QRayCastingService *rayCastingService = new QRayCastingService(); - m_renderer->renderAspect()->services()->registerServiceProvider(Qt3DCore::QServiceLocator::CollisionService, rayCastingService); + services->registerServiceProvider(Qt3DCore::QServiceLocator::CollisionService, rayCastingService); rayCasting = rayCastingService; } |