diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2020-07-06 08:43:10 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2020-07-07 17:57:43 +0200 |
commit | ee6b0094a1b8f750b0be19fd6372ff85261750b0 (patch) | |
tree | 1107d6a5dd1c65bfab80569218f4d443398cd19c /src/render | |
parent | e5e7073c9750fe7a29d02011ffc98299bcee811c (diff) |
GLTexture: change internals to use std::vector
Change-Id: If680702aed4544395866a7b376db920561bf16cc
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/texture/texture_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h index 379b4439c..a19ad8581 100644 --- a/src/render/texture/texture_p.h +++ b/src/render/texture/texture_p.h @@ -159,7 +159,7 @@ public: void cleanup(); void addTextureDataUpdate(const QTextureDataUpdate &update); - QVector<QTextureDataUpdate> takePendingTextureDataUpdates() { return std::move(m_pendingTextureDataUpdates); } + std::vector<QTextureDataUpdate> &&takePendingTextureDataUpdates() { return std::move(m_pendingTextureDataUpdates); } void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override; @@ -181,7 +181,7 @@ private: Qt3DCore::QNodeIdVector m_textureImageIds; QMutex m_flagsMutex; - QVector<QTextureDataUpdate> m_pendingTextureDataUpdates; + std::vector<QTextureDataUpdate> m_pendingTextureDataUpdates; }; class Q_AUTOTEST_EXPORT TextureFunctor : public Qt3DCore::QBackendNodeMapper |