diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2020-06-29 16:46:59 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2020-07-03 14:05:35 +0200 |
commit | 914752257634dede18cc5079f2a506b699744058 (patch) | |
tree | 00ea67c3d0fc11b9688472061b7d870f9860534e /src/render/renderstates | |
parent | 7beecb9913b25c4e7629cffad3389faea5608762 (diff) |
GraphicsHelpers/GLShader: switch to std::vector
Change-Id: I8be6695e0c52dfbe353cd381d94548aba1c7da82
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render/renderstates')
-rw-r--r-- | src/render/renderstates/renderstateset.cpp | 2 | ||||
-rw-r--r-- | src/render/renderstates/renderstateset_p.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp index 5b9c4e8b5..1d0dce4c8 100644 --- a/src/render/renderstates/renderstateset.cpp +++ b/src/render/renderstates/renderstateset.cpp @@ -105,7 +105,7 @@ StateMaskSet RenderStateSet::stateMask() const void RenderStateSet::merge(const RenderStateSet *other) { m_stateMask |= other->stateMask(); - const QVector<StateVariant> otherStates = other->states(); + const std::vector<StateVariant> &otherStates = other->states(); // We only add states which are new (different type) for (const StateVariant &otherState : otherStates) { diff --git a/src/render/renderstates/renderstateset_p.h b/src/render/renderstates/renderstateset_p.h index 667c2614d..8442ea357 100644 --- a/src/render/renderstates/renderstateset_p.h +++ b/src/render/renderstates/renderstateset_p.h @@ -91,8 +91,8 @@ public: StateMaskSet stateMask() const; void merge(const RenderStateSet *other); - const QVector<StateVariant>& states() const noexcept { return m_states; } - QVector<StateVariant>& states() noexcept { return m_states; } + const std::vector<StateVariant>& states() const noexcept { return m_states; } + std::vector<StateVariant>& states() noexcept { return m_states; } bool canAddStateOfType(StateMask type) const; @@ -109,7 +109,7 @@ private: private: StateMaskSet m_stateMask; - QVector<StateVariant> m_states; + std::vector<StateVariant> m_states; }; template<> |