summaryrefslogtreecommitdiffstats
path: root/src/render/texture/qabstracttextureprovider.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/qabstracttextureprovider.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/qabstracttextureprovider.h')
-rw-r--r--src/render/texture/qabstracttextureprovider.h6
1 files changed, 3 insertions, 3 deletions
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);