diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-03 16:15:20 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-07 09:43:29 +0000 |
| commit | e57b18e25f26642deaf224ffd8454ba556e8a1e5 (patch) | |
| tree | fa3bed57f98cafd87522f46ee73b078a4dab1957 /src/render/texture/texture_p.h | |
| parent | 544567054ebc9f9fdc3a152581a45697c7a3b5d2 (diff) | |
Rename QTextureDataFunctor to QTextureImageDataGenerator
Task-number: QTBUG-51447
Change-Id: I3cb1cd3e2e225288e781c04f274518dde483a69a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/texture/texture_p.h')
| -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 29bc27f61..89c53b5e3 100644 --- a/src/render/texture/texture_p.h +++ b/src/render/texture/texture_p.h @@ -113,7 +113,7 @@ public: inline QAbstractTextureProvider::Target target() const { return m_target; } inline bool isAutoMipMapGenerationEnabled() const { return m_generateMipMaps; } - inline QTextureDataFunctorPtr dataFunctor() const { return m_dataFunctor; } + inline QTextureImageDataGeneratorPtr dataGenerator() const { return m_dataFunctor; } void setTextureDataHandle(HTextureData handle) { m_textureDataHandle = handle; } private: @@ -141,7 +141,7 @@ private: QAbstractTextureProvider::ComparisonFunction m_comparisonFunction; QAbstractTextureProvider::ComparisonMode m_comparisonMode; - QTextureDataFunctorPtr m_dataFunctor; + QTextureImageDataGeneratorPtr m_dataFunctor; HTextureData m_textureDataHandle; QVector<HTextureImage> m_textureImages; |