summaryrefslogtreecommitdiffstats
path: root/src/render/texture/texturedatamanager_p.h
diff options
context:
space:
mode:
authorFranck Arrecot <franck.arrecot@kdab.com>2016-03-03 16:15:20 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-03-07 09:43:29 +0000
commite57b18e25f26642deaf224ffd8454ba556e8a1e5 (patch)
treefa3bed57f98cafd87522f46ee73b078a4dab1957 /src/render/texture/texturedatamanager_p.h
parent544567054ebc9f9fdc3a152581a45697c7a3b5d2 (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/texturedatamanager_p.h')
-rw-r--r--src/render/texture/texturedatamanager_p.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/texture/texturedatamanager_p.h b/src/render/texture/texturedatamanager_p.h
index 8e151d50d..27e294108 100644
--- a/src/render/texture/texturedatamanager_p.h
+++ b/src/render/texture/texturedatamanager_p.h
@@ -65,8 +65,8 @@ namespace Qt3DRender {
namespace Render {
-typedef QPair<QTextureDataFunctorPtr, QVector<HTextureImage> > FunctorImageHandlesPair;
-typedef QPair<QTextureDataFunctorPtr, HTextureData> FunctorTextureDataPair;
+typedef QPair<QTextureImageDataGeneratorPtr, QVector<HTextureImage> > FunctorImageHandlesPair;
+typedef QPair<QTextureImageDataGeneratorPtr, HTextureData> FunctorTextureDataPair;
class TextureDataManager : public Qt3DCore::QResourceManager<QTexImageData,
Qt3DCore::QNodeId,
@@ -80,11 +80,11 @@ public:
QVector<Qt3DCore::QNodeId> texturesPending();
- HTextureData textureDataFromFunctor(const QTextureDataFunctorPtr &functor) const;
- void addTextureDataForFunctor(HTextureData textureDataHandle, const QTextureDataFunctorPtr &functor);
- void removeTextureDataFunctor(const QTextureDataFunctorPtr &functor);
+ HTextureData textureDataFromFunctor(const QTextureImageDataGeneratorPtr &functor) const;
+ void addTextureDataForFunctor(HTextureData textureDataHandle, const QTextureImageDataGeneratorPtr &functor);
+ void removeTextureDataFunctor(const QTextureImageDataGeneratorPtr &functor);
- void assignFunctorToTextureImage(const QTextureDataFunctorPtr &functor, HTextureImage imageHandle);
+ void assignFunctorToTextureImage(const QTextureImageDataGeneratorPtr &functor, HTextureImage imageHandle);
QMutex *mutex() const;
void cleanup();