Rename QTextureDataFunctor to QTextureImageDataGenerator

Task-number: QTBUG-51447
Change-Id: I3cb1cd3e2e225288e781c04f274518dde483a69a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

16 files changed, 60 insertions, 60 deletions

diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index 20a2c4525..b8cb00d7b 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -263,7 +263,7 @@ class AssimpRawTextureImage : public QAbstractTextureImage
 public:
     explicit AssimpRawTextureImage(QNode *parent = 0);
 
-    QTextureDataFunctorPtr dataFunctor() const Q_DECL_FINAL;
+    QTextureImageDataGeneratorPtr dataGenerator() const Q_DECL_FINAL;
 
     void setData(const QByteArray &data);
 
@@ -271,13 +271,13 @@ private:
     QByteArray m_data;
     QT3D_CLONEABLE(AssimpRawTextureImage)
 
-    class AssimpRawTextureImageFunctor : public QTextureDataFunctor
+    class AssimpRawTextureImageFunctor : public QTextureImageDataGenerator
     {
     public:
         explicit AssimpRawTextureImageFunctor(const QByteArray &data);
 
         QTexImageDataPtr operator()() Q_DECL_FINAL;
-        bool operator ==(const QTextureDataFunctor &other) const Q_DECL_FINAL;
+        bool operator ==(const QTextureImageDataGenerator &other) const Q_DECL_FINAL;
 
         QT3D_FUNCTOR(AssimpRawTextureImageFunctor)
     private:
@@ -882,9 +882,9 @@ AssimpRawTextureImage::AssimpRawTextureImage(QNode *parent)
 {
 }
 
-QTextureDataFunctorPtr AssimpRawTextureImage::dataFunctor() const
+QTextureImageDataGeneratorPtr AssimpRawTextureImage::dataGenerator() const
 {
-    return QTextureDataFunctorPtr(new AssimpRawTextureImageFunctor(m_data));
+    return QTextureImageDataGeneratorPtr(new AssimpRawTextureImageFunctor(m_data));
 }
 
 void AssimpRawTextureImage::setData(const QByteArray &data)
@@ -896,7 +896,7 @@ void AssimpRawTextureImage::setData(const QByteArray &data)
 }
 
 AssimpRawTextureImage::AssimpRawTextureImageFunctor::AssimpRawTextureImageFunctor(const QByteArray &data)
-    : QTextureDataFunctor()
+    : QTextureImageDataGenerator()
     , m_data(data)
 {
 }
@@ -908,7 +908,7 @@ QTexImageDataPtr AssimpRawTextureImage::AssimpRawTextureImageFunctor::operator()
     return dataPtr;
 }
 
-bool AssimpRawTextureImage::AssimpRawTextureImageFunctor::operator ==(const QTextureDataFunctor &other) const
+bool AssimpRawTextureImage::AssimpRawTextureImageFunctor::operator ==(const QTextureImageDataGenerator &other) const
 {
     const AssimpRawTextureImageFunctor *otherFunctor = functor_cast<AssimpRawTextureImageFunctor>(&other);
     return (otherFunctor != Q_NULLPTR && otherFunctor->m_data == m_data);
diff --git a/src/render/jobs/loadtexturedatajob.cpp b/src/render/jobs/loadtexturedatajob.cpp
index 10eafb121..c4ec99601 100644
--- a/src/render/jobs/loadtexturedatajob.cpp
+++ b/src/render/jobs/loadtexturedatajob.cpp
@@ -60,7 +60,7 @@ LoadTextureDataJob::~LoadTextureDataJob()
 {
 }
 
-static QPair<HTextureData, QTexImageData *> textureDataFromFunctor(TextureDataManager *textureDataManager, QTextureDataFunctorPtr functor)
+static QPair<HTextureData, QTexImageData *> textureDataFromGenerator(TextureDataManager *textureDataManager, QTextureImageDataGeneratorPtr generator)
 {
     HTextureData textureDataHandle;
     QTexImageData *data = Q_NULLPTR;
@@ -69,13 +69,13 @@ static QPair<HTextureData, QTexImageData *> textureDataFromFunctor(TextureDataMa
     // We don't want to take the chance of having two jobs uploading the same functor
     // because of sync issues
 
-    textureDataHandle = textureDataManager->textureDataFromFunctor(functor);
+    textureDataHandle = textureDataManager->textureDataFromFunctor(generator);
 
     // Texture data handle isn't null == there's already a matching TextureData
     if (!textureDataHandle.isNull()) {
         data = textureDataManager->data(textureDataHandle);
     } else {
-        QTexImageDataPtr dataPtr = functor->operator ()();
+        QTexImageDataPtr dataPtr = generator->operator ()();
         if (dataPtr.isNull()) {
             qCDebug(Jobs) << Q_FUNC_INFO << "Texture has no raw data";
         } else {
@@ -83,7 +83,7 @@ static QPair<HTextureData, QTexImageData *> textureDataFromFunctor(TextureDataMa
             textureDataHandle = textureDataManager->acquire();
             data = textureDataManager->data(textureDataHandle);
             *data = *(dataPtr.data());
-            textureDataManager->addTextureDataForFunctor(textureDataHandle, functor);
+            textureDataManager->addTextureDataForFunctor(textureDataHandle, generator);
         }
     }
 
@@ -98,10 +98,10 @@ void LoadTextureDataJob::run()
     TextureDataManager *textureDataManager = m_manager->manager<QTexImageData, TextureDataManager>();
 
     if (txt != Q_NULLPTR) {
-        if (txt->dataFunctor()) {
-            QTextureDataFunctorPtr functor = txt->dataFunctor();
+        if (txt->dataGenerator()) {
+            QTextureImageDataGeneratorPtr generator = txt->dataGenerator();
 
-            QPair<HTextureData, QTexImageData *> handleData = textureDataFromFunctor(textureDataManager, functor);
+            QPair<HTextureData, QTexImageData *> handleData = textureDataFromGenerator(textureDataManager, generator);
 
             HTextureData textureDataHandle = handleData.first;
             QTexImageData *data = handleData.second;
@@ -123,10 +123,10 @@ void LoadTextureDataJob::run()
         // Load update each TextureImage
         Q_FOREACH (HTextureImage texImgHandle, txt->textureImages()) {
             TextureImage *texImg = m_manager->textureImageManager()->data(texImgHandle);
-            if (texImg != Q_NULLPTR && texImg->isDirty() && !texImg->dataFunctor().isNull()) {
-                QTextureDataFunctorPtr functor = texImg->dataFunctor();
+            if (texImg != Q_NULLPTR && texImg->isDirty() && !texImg->dataGenerator().isNull()) {
+                QTextureImageDataGeneratorPtr generator = texImg->dataGenerator();
 
-                QPair<HTextureData, QTexImageData *> handleData = textureDataFromFunctor(textureDataManager, functor);
+                QPair<HTextureData, QTexImageData *> handleData = textureDataFromGenerator(textureDataManager, generator);
 
                 HTextureData textureDataHandle = handleData.first;
                 QTexImageData *data = handleData.second;
@@ -135,7 +135,7 @@ void LoadTextureDataJob::run()
 
                 // Update HTextureImage Functor to release TextureData when needed
                 TextureDataManager *textureDataManager = m_manager->manager<QTexImageData, TextureDataManager>();
-                textureDataManager->assignFunctorToTextureImage(functor, texImgHandle);
+                textureDataManager->assignFunctorToTextureImage(generator, texImgHandle);
 
                 // Set texture size of texture if the first layer / level / face has a valid size
                 // otherwise assume the size was set on the texture itself
diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp
index 3e40789f0..bc3f9fe6f 100644
--- a/src/render/texture/qabstracttextureimage.cpp
+++ b/src/render/texture/qabstracttextureimage.cpp
@@ -68,7 +68,7 @@ namespace Qt3DRender {
     QAbstractTextureProvider. It contains the necessary information: mipmap
     level, layer, cube face load at the proper place data into an OpenGL texture.
 
-    The actual data is provided through a QTextureDataFunctor that will be
+    The actual data is provided through a QTextureImageDataGenerator that will be
     executed by Aspect jobs in the backend. QAbstractTextureImage should be
     subclassed to provide a functor and eventual additional properties needed by
     the functor to load actual data.
@@ -196,7 +196,7 @@ void QAbstractTextureImage::update()
     if (d->m_changeArbiter != Q_NULLPTR) {
         QScenePropertyChangePtr change(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, id()));
         change->setPropertyName("dataFunctor");
-        change->setValue(QVariant::fromValue(dataFunctor()));
+        change->setValue(QVariant::fromValue(dataGenerator()));
         d->notifyObservers(change);
     }
 }
diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h
index c46e9e511..24a99e0fe 100644
--- a/src/render/texture/qabstracttextureimage.h
+++ b/src/render/texture/qabstracttextureimage.h
@@ -51,15 +51,15 @@ namespace Qt3DRender {
 // We might also get rid of the layer, face, mipmap level from
 // TexImageDataPtr and store that in the functor directly
 // or use the QTextureImage instead
-class QT3DRENDERSHARED_EXPORT QTextureDataFunctor : public QAbstractFunctor
+class QT3DRENDERSHARED_EXPORT QTextureImageDataGenerator : public QAbstractFunctor
 {
 public:
-    virtual ~QTextureDataFunctor() {}
+    virtual ~QTextureImageDataGenerator() {}
     virtual QTexImageDataPtr operator()() = 0;
-    virtual bool operator ==(const QTextureDataFunctor &other) const = 0;
+    virtual bool operator ==(const QTextureImageDataGenerator &other) const = 0;
 };
 
-typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr;
+typedef QSharedPointer<QTextureImageDataGenerator> QTextureImageDataGeneratorPtr;
 
 class QAbstractTextureImagePrivate;
 
@@ -78,7 +78,7 @@ public:
     QAbstractTextureProvider::CubeMapFace face() const;
 
     void update();
-    virtual QTextureDataFunctorPtr dataFunctor() const = 0;
+    virtual QTextureImageDataGeneratorPtr dataGenerator() const = 0;
 
 public Q_SLOTS:
     void setMipLevel(int level);
@@ -102,6 +102,6 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3DRender::QTextureDataFunctorPtr)
+Q_DECLARE_METATYPE(Qt3DRender::QTextureImageDataGeneratorPtr)
 
 #endif // QT3DRENDER_QABSTRACTTEXTUREIMAGE_H
diff --git a/src/render/texture/qabstracttextureprovider.cpp b/src/render/texture/qabstracttextureprovider.cpp
index 97bf648a1..2bb17c864 100644
--- a/src/render/texture/qabstracttextureprovider.cpp
+++ b/src/render/texture/qabstracttextureprovider.cpp
@@ -528,7 +528,7 @@ QAbstractTextureProvider::ComparisonMode QAbstractTextureProvider::comparisonMod
     return d->m_comparisonMode;
 }
 
-QTextureDataFunctorPtr QAbstractTextureProvider::dataFunctor() const
+QTextureImageDataGeneratorPtr QAbstractTextureProvider::dataGenerator() const
 {
     Q_D(const QAbstractTextureProvider);
     return d->m_dataFunctor;
diff --git a/src/render/texture/qabstracttextureprovider.h b/src/render/texture/qabstracttextureprovider.h
index 3b5cefc77..ed5023b29 100644
--- a/src/render/texture/qabstracttextureprovider.h
+++ b/src/render/texture/qabstracttextureprovider.h
@@ -51,9 +51,9 @@ namespace Qt3DRender {
 class QAbstractTextureProviderPrivate;
 class QTextureWrapMode;
 class QAbstractTextureImage;
-class QTextureDataFunctor;
+class QTextureImageDataGenerator;
 
-typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr;
+typedef QSharedPointer<QTextureImageDataGenerator> QTextureImageDataGeneratorPtr;
 
 class QT3DRENDERSHARED_EXPORT QAbstractTextureProvider : public Qt3DCore::QNode
 {
@@ -295,7 +295,7 @@ public:
     int depth() const;
     int maximumLayers() const;
     bool isUnique() const;
-    QTextureDataFunctorPtr dataFunctor() const;
+    QTextureImageDataGeneratorPtr dataGenerator() const;
 
 public Q_SLOTS:
     void setFormat(TextureFormat format);
diff --git a/src/render/texture/qabstracttextureprovider_p.h b/src/render/texture/qabstracttextureprovider_p.h
index edea99d23..ec73f99b3 100644
--- a/src/render/texture/qabstracttextureprovider_p.h
+++ b/src/render/texture/qabstracttextureprovider_p.h
@@ -85,7 +85,7 @@ public :
     int m_maximumLayers;
     bool m_unique;
 
-    QTextureDataFunctorPtr m_dataFunctor;
+    QTextureImageDataGeneratorPtr m_dataFunctor;
 };
 
 } // QT3D
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index f1c881d20..4053dee7b 100644
--- a/src/render/texture/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
@@ -132,12 +132,12 @@ void QTextureImage::setSource(const QUrl &source)
 }
 
 /*!
-    Returns the Qt3DRender::QTextureDataFunctorPtr functor to be used by the
+    Returns the Qt3DRender::QTextureImageDataGeneratorPtr functor to be used by the
     backend to load the texture image data into an OpenGL texture object.
  */
-QTextureDataFunctorPtr QTextureImage::dataFunctor() const
+QTextureImageDataGeneratorPtr QTextureImage::dataGenerator() const
 {
-    return QTextureDataFunctorPtr(new QImageTextureDataFunctor(source()));
+    return QTextureImageDataGeneratorPtr(new QImageTextureDataFunctor(source()));
 }
 
 /*!
diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h
index dfd1cea2a..7dfb517cc 100644
--- a/src/render/texture/qtextureimage.h
+++ b/src/render/texture/qtextureimage.h
@@ -60,7 +60,7 @@ public:
 
     QUrl source() const;
 
-    QTextureDataFunctorPtr dataFunctor() const Q_DECL_OVERRIDE;
+    QTextureImageDataGeneratorPtr dataGenerator() const Q_DECL_OVERRIDE;
 
 public Q_SLOTS:
     void setSource(const QUrl &source);
diff --git a/src/render/texture/qtextureimage_p.h b/src/render/texture/qtextureimage_p.h
index f538b36ef..8bef112ca 100644
--- a/src/render/texture/qtextureimage_p.h
+++ b/src/render/texture/qtextureimage_p.h
@@ -58,11 +58,11 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QImageTextureDataFunctor : public QTextureDataFunctor
+class QImageTextureDataFunctor : public QTextureImageDataGenerator
 {
 public:
     QImageTextureDataFunctor(const QUrl &url)
-        : QTextureDataFunctor()
+        : QTextureImageDataGenerator()
         , m_url(url)
     {}
 
@@ -88,7 +88,7 @@ public:
         return dataPtr;
     }
 
-    bool operator ==(const QTextureDataFunctor &other) const Q_DECL_FINAL
+    bool operator ==(const QTextureImageDataGenerator &other) const Q_DECL_FINAL
     {
         const QImageTextureDataFunctor *otherFunctor = functor_cast<QImageTextureDataFunctor>(&other);
         return (otherFunctor != Q_NULLPTR && otherFunctor->m_url == m_url);
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index 64841a87a..676db4bf4 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -148,7 +148,7 @@ void Texture::updateFromPeer(Qt3DCore::QNode *peer)
         m_comparisonMode = texture->comparisonMode();
         m_layers = texture->maximumLayers();
         m_unique = texture->isUnique();
-        m_dataFunctor = texture->dataFunctor();
+        m_dataFunctor = texture->dataGenerator();
 
         if (m_dataFunctor)
             addToPendingTextureJobs();
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;
diff --git a/src/render/texture/texturedatamanager.cpp b/src/render/texture/texturedatamanager.cpp
index 4f4e6e877..dd9ca38d1 100644
--- a/src/render/texture/texturedatamanager.cpp
+++ b/src/render/texture/texturedatamanager.cpp
@@ -69,7 +69,7 @@ QVector<Qt3DCore::QNodeId> TextureDataManager::texturesPending()
 }
 
 // Called from LoadMeshDataJob threads
-HTextureData TextureDataManager::textureDataFromFunctor(const QTextureDataFunctorPtr &functor) const
+HTextureData TextureDataManager::textureDataFromFunctor(const QTextureImageDataGeneratorPtr &functor) const
 {
     QMutexLocker lock(&m_mutex);
     for (int i = 0, m = m_textureDataFunctors.size(); i < m; ++i) {
@@ -80,14 +80,14 @@ HTextureData TextureDataManager::textureDataFromFunctor(const QTextureDataFuncto
 }
 
 // Called from LoadMeshDataJob threads
-void TextureDataManager::addTextureDataForFunctor(HTextureData textureDataHandle, const QTextureDataFunctorPtr &functor)
+void TextureDataManager::addTextureDataForFunctor(HTextureData textureDataHandle, const QTextureImageDataGeneratorPtr &functor)
 {
     QMutexLocker lock(&m_mutex);
     m_textureDataFunctors.push_back(qMakePair(functor, textureDataHandle));
 }
 
 // Called from LoadMeshDataJob threads
-void TextureDataManager::removeTextureDataFunctor(const QTextureDataFunctorPtr &functor)
+void TextureDataManager::removeTextureDataFunctor(const QTextureImageDataGeneratorPtr &functor)
 {
     QMutexLocker lock(&m_mutex);
     for (int i = 0, m = m_textureDataFunctors.size(); i < m; ++i) {
@@ -99,16 +99,16 @@ void TextureDataManager::removeTextureDataFunctor(const QTextureDataFunctorPtr &
 }
 
 // Called from LoadMeshDataJob threads
-void TextureDataManager::assignFunctorToTextureImage(const QTextureDataFunctorPtr &newFunctor, HTextureImage imageHandle)
+void TextureDataManager::assignFunctorToTextureImage(const QTextureImageDataGeneratorPtr &newFunctor, HTextureImage imageHandle)
 {
     QMutexLocker lock(&m_mutex);
-    QVector<QPair<QTextureDataFunctorPtr, QVector<HTextureImage> > >::iterator it = m_texturesImagesPerFunctor.begin();
+    QVector<QPair<QTextureImageDataGeneratorPtr, QVector<HTextureImage> > >::iterator it = m_texturesImagesPerFunctor.begin();
 
     bool newFunctorAlreadyExists = false;
     bool oldFunctorWasRemoved = false;
     while (it != m_texturesImagesPerFunctor.end()) {
-        QPair<QTextureDataFunctorPtr, QVector<HTextureImage> > &entry = *it;
-        QTextureDataFunctorPtr functor = entry.first;
+        QPair<QTextureImageDataGeneratorPtr, QVector<HTextureImage> > &entry = *it;
+        QTextureImageDataGeneratorPtr functor = entry.first;
         QVector<HTextureImage> &imageHandles = entry.second;
         const bool functorMatchesNewFunctor = (*functor == *newFunctor);
         bool removed = false;
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();
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index a6ed8cb0a..2dcfec0bb 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -68,7 +68,7 @@ void TextureImage::cleanup()
     m_mipLevel = 0;
     m_dirty = true;
     m_face = QAbstractTextureProvider::CubeMapPositiveX;
-    m_functor.reset();
+    m_generator.reset();
     m_textureManager = Q_NULLPTR;
     m_textureImageManager = Q_NULLPTR;
     m_textureDataManager = Q_NULLPTR;
@@ -82,7 +82,7 @@ void TextureImage::updateFromPeer(Qt3DCore::QNode *peer)
     m_layer = textureImage->layer();
     m_mipLevel = textureImage->mipLevel();
     m_face = textureImage->face();
-    m_functor = textureImage->dataFunctor();
+    m_generator = textureImage->dataGenerator();
     // Notify the Texture that we are one of its TextureImage
     if (!peer->parentNode()) {
         qWarning() << "Not QAbstractTextureProvider parent found";
@@ -112,7 +112,7 @@ void TextureImage::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
             m_face = static_cast<QAbstractTextureProvider::CubeMapFace>(propertyChange->value().toInt());
             m_dirty = true;
         } else if (propertyChange->propertyName() == QByteArrayLiteral("dataFunctor")) {
-            m_functor = propertyChange->value().value<QTextureDataFunctorPtr>();
+            m_generator = propertyChange->value().value<QTextureImageDataGeneratorPtr>();
             m_dirty = true;
         }
     }
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index a2cb28ddc..6a9a24a3a 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -93,17 +93,17 @@ public:
     void unsetDirty();
 
     inline bool isDirty() const { return m_dirty; }
-    inline QTextureDataFunctorPtr textureDataFunctor() const { return m_functor; }
+    inline QTextureImageDataGeneratorPtr textureDataGenerator() const { return m_generator; }
 
     void setTextureDataHandle(HTextureData handle);
 
     inline HTextureData textureDataHandle() const { return m_textureDataHandle; }
-    inline QTextureDataFunctorPtr dataFunctor() const { return m_functor; }
+    inline QTextureImageDataGeneratorPtr dataGenerator() const { return m_generator; }
 
 private:
     void updateDNA();
 
-    QTextureDataFunctorPtr m_functor;
+    QTextureImageDataGeneratorPtr m_generator;
     HTextureData m_textureDataHandle;
     TextureManager *m_textureManager;
     TextureImageManager *m_textureImageManager;