summaryrefslogtreecommitdiffstats
path: root/src/plugins/renderers/rhi/textures/texture_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/renderers/rhi/textures/texture_p.h')
-rw-r--r--src/plugins/renderers/rhi/textures/texture_p.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/renderers/rhi/textures/texture_p.h b/src/plugins/renderers/rhi/textures/texture_p.h
index c78bc1c1b..e2378e42b 100644
--- a/src/plugins/renderers/rhi/textures/texture_p.h
+++ b/src/plugins/renderers/rhi/textures/texture_p.h
@@ -137,7 +137,7 @@ public:
inline TextureParameters parameters() const { return m_parameters; }
inline QTextureGeneratorPtr textureGenerator() const { return m_dataFunctor; }
inline int sharedTextureId() const { return m_sharedTextureId; }
- inline QVector<Image> images() const { return m_images; }
+ inline const std::vector<Image> &images() const { return m_images; }
inline QSize size() const { return QSize(m_properties.width, m_properties.height); }
inline QRhiTexture *getRhiTexture() const { return m_rhi; }
@@ -176,7 +176,7 @@ public:
bool isDirty() const { return m_dirtyFlags != None; }
bool hasTextureData() const { return !m_textureData.isNull(); }
- bool hasImagesData() const { return !m_imageData.isEmpty(); }
+ bool hasImagesData() const { return !m_imageData.empty(); }
QFlags<DirtyFlag> dirtyFlags() const { return m_dirtyFlags; }
@@ -191,12 +191,12 @@ public:
void setParameters(const TextureParameters &params);
void setProperties(const TextureProperties &props);
- void setImages(const QVector<Image> &images);
+ void setImages(const std::vector<Image> &images);
void setGenerator(const QTextureGeneratorPtr &generator);
void setSharedTextureId(int textureId);
void addTextureDataUpdates(const QVector<QTextureDataUpdate> &updates);
- QVector<QTextureDataUpdate> textureDataUpdates() const { return m_pendingTextureDataUpdates; }
+ const std::vector<QTextureDataUpdate> &textureDataUpdates() const { return m_pendingTextureDataUpdates; }
QTextureGeneratorPtr dataGenerator() const { return m_dataFunctor; }
private:
@@ -228,12 +228,12 @@ private:
QTextureGeneratorPtr m_dataFunctor;
QTextureGenerator *m_pendingDataFunctor;
- QVector<Image> m_images;
+ std::vector<Image> m_images;
// cache actual image data generated by the functors
QTextureDataPtr m_textureData;
- QVector<QTextureImageDataPtr> m_imageData;
- QVector<QTextureDataUpdate> m_pendingTextureDataUpdates;
+ std::vector<QTextureImageDataPtr> m_imageData;
+ std::vector<QTextureDataUpdate> m_pendingTextureDataUpdates;
int m_sharedTextureId;
bool m_externalRendering;