diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-03-30 15:38:23 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-31 09:34:34 +0000 |
commit | ed6dcaff6a287703d4ad6b7415ec3f27d7ddee15 (patch) | |
tree | e2fc66265660111992ca496e19be51e7f648d1e0 /src/render/framegraph/rendertargetselectornode.cpp | |
parent | acbdd47ccccc854024bfa501231cdc1c02c2b336 (diff) |
Prefer QVector to QList
Also make some functions inline whilst we are touching them anyway.
Change-Id: If44398d56a82e42689f26f22f0e07dba229529c6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/framegraph/rendertargetselectornode.cpp')
-rw-r--r-- | src/render/framegraph/rendertargetselectornode.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp index ae24a417e..e892c3ccd 100644 --- a/src/render/framegraph/rendertargetselectornode.cpp +++ b/src/render/framegraph/rendertargetselectornode.cpp @@ -66,7 +66,7 @@ void RenderTargetSelector::updateFromPeer(Qt3DCore::QNode *peer) if (selector->target() != Q_NULLPTR) m_renderTargetUuid = selector->target()->id(); setEnabled(selector->isEnabled()); - m_outputs = selector->outputs(); + m_outputs = selector->outputs().toVector(); } void RenderTargetSelector::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) @@ -75,7 +75,7 @@ void RenderTargetSelector::initializeFromPeer(const Qt3DCore::QNodeCreatedChange const auto &data = typedChange->data; setEnabled(change->isNodeEnabled()); m_renderTargetUuid = data.targetId; - m_outputs = data.outputs.toList(); + m_outputs = data.outputs; } void RenderTargetSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) @@ -88,21 +88,11 @@ void RenderTargetSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) else if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) setEnabled(propertyChange->value().toBool()); else if (propertyChange->propertyName() == QByteArrayLiteral("outputs")) - m_outputs = propertyChange->value().value<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >(); + m_outputs = propertyChange->value().value<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >().toVector(); markDirty(AbstractRenderer::AllDirty); } } -Qt3DCore::QNodeId RenderTargetSelector::renderTargetUuid() const -{ - return m_renderTargetUuid; -} - -QList<QRenderTargetOutput::AttachmentPoint> RenderTargetSelector::outputs() const -{ - return m_outputs; -} - } // namespace Render } // namespace Qt3DRender |