diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-09 10:21:55 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-09 12:24:02 +0200 |
commit | 994b476562c0f526833d0f61a3196d3f81c9c736 (patch) | |
tree | 8452d7d642e525392576505ec63634a5b4fa872b /src/render/frontend/qrenderaspect.cpp | |
parent | 39d0041f15601cee499c959702b004cbd721bed9 (diff) |
Use QList instead of QVector in render
Use list-initialization.
Task-number: QTBUG-84469
Change-Id: I826450646fc3c7118cae49c22a28058f47770e13
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qrenderaspect.cpp')
-rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index 8f30d46f0..bd6d7d831 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -208,7 +208,7 @@ QString dumpNode(const Qt3DCore::QEntity *n) { return formatNode(n); } -QString dumpNodeFilters(const QString &filterType, const QVector<Qt3DRender::QFilterKey*> &filters) { +QString dumpNodeFilters(const QString &filterType, const QList<Qt3DRender::QFilterKey *> &filters) { QString res; QStringList kv; @@ -335,7 +335,7 @@ QRenderAspectPrivate::~QRenderAspectPrivate() QRenderAspectPrivate *QRenderAspectPrivate::findPrivate(Qt3DCore::QAspectEngine *engine) { - const QVector<QAbstractAspect*> aspects = engine->aspects(); + const QList<QAbstractAspect *> aspects = engine->aspects(); for (QAbstractAspect* aspect : aspects) { QRenderAspect *renderAspect = qobject_cast<QRenderAspect *>(aspect); if (renderAspect) @@ -686,7 +686,7 @@ std::vector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) d->m_updateLevelOfDetailJob->setFrameGraphRoot(d->m_renderer->frameGraphRoot()); // Launch skeleton loader jobs once all loading jobs have completed. - const QVector<Render::HSkeleton> skeletonsToLoad = + const QList<Render::HSkeleton> skeletonsToLoad = manager->skeletonManager()->takeDirtySkeletons(Render::SkeletonManager::SkeletonDataDirty); for (const auto &skeletonHandle : skeletonsToLoad) { auto loadSkeletonJob = Render::LoadSkeletonJobPtr::create(skeletonHandle); @@ -879,7 +879,7 @@ void QRenderAspect::onUnregistered() std::vector<Qt3DCore::QAspectJobPtr> QRenderAspectPrivate::createGeometryRendererJobs() const { Render::GeometryRendererManager *geomRendererManager = m_nodeManagers->geometryRendererManager(); - const QVector<QNodeId> dirtyGeometryRenderers = geomRendererManager->dirtyGeometryRenderers(); + const QList<QNodeId> dirtyGeometryRenderers = geomRendererManager->dirtyGeometryRenderers(); std::vector<QAspectJobPtr> dirtyGeometryRendererJobs; dirtyGeometryRendererJobs.reserve(dirtyGeometryRenderers.size()); @@ -990,9 +990,9 @@ void QRenderAspectPrivate::loadRenderPlugin(const QString &pluginName) } } -QVector<QString> QRenderAspectPrivate::m_pluginConfig; +QList<QString> QRenderAspectPrivate::m_pluginConfig; QMutex QRenderAspectPrivate::m_pluginLock; -QVector<QRenderAspectPrivate *> QRenderAspectPrivate::m_instances; +QList<QRenderAspectPrivate *> QRenderAspectPrivate::m_instances; void QRenderAspectPrivate::configurePlugin(const QString &plugin) { |