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/plugins | |
| 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/plugins')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpparser.cpp | 14 |
1 files changed, 7 insertions, 7 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); |