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/textureimage.cpp | |
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/textureimage.cpp')
-rw-r--r-- | src/render/texture/textureimage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; } } |