QTexture renamed to QAbstractTextureProvider

This is done prior to the whole texture API refactoring.

Doc was also added, might need improvement later on but a base is present at
least.

Change-Id: I75589f14dfbfba7bc4250b2e0960670e020ed38a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index 3c1dab23b..ea11e3b15 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -593,7 +593,7 @@ void AssimpParser::loadMesh(uint meshIndex)
 void AssimpParser::loadEmbeddedTexture(uint textureIndex)
 {
     aiTexture *assimpTexture = m_scene->m_aiScene->mTextures[textureIndex];
-    QTexture *texture = new QTexture(QTexture::Target2D);
+    QAbstractTextureProvider *texture = new QAbstractTextureProvider(QAbstractTextureProvider::Target2D);
     TexImageDataPtr textureData(new TexImageData(0, 0));
 
     bool isCompressed = assimpTexture->mHeight == 0;
@@ -773,7 +773,7 @@ void AssimpParser::copyMaterialTextures(QMaterial *material, aiMaterial *assimpM
             // Load texture if not already loaded
             bool textureLoaded = true;
             if (!m_scene->m_materialTextures.contains(fullPath)) {
-                QTexture *tex = new QTexture(QTexture::Target2D);
+                QAbstractTextureProvider *tex = new QAbstractTextureProvider(QAbstractTextureProvider::Target2D);
                 QImage textureImage;
                 if (!textureImage.load(fullPath) || !textureImage.isNull()) {
                     tex->setFromQImage(textureImage);
diff --git a/src/plugins/sceneparsers/assimp/assimpparser_p.h b/src/plugins/sceneparsers/assimp/assimpparser_p.h
index ce9d61c9f..76be4d2d9 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser_p.h
+++ b/src/plugins/sceneparsers/assimp/assimpparser_p.h
@@ -66,7 +66,7 @@ class QMaterial;
 class QShaderProgram;
 class QEffect;
 class QCamera;
-class QTexture;
+class QAbstractTextureProvider;
 class QMesh;
 class AssimpMesh;
 
@@ -132,8 +132,8 @@ private :
         QMap<uint, AssimpMesh *> m_meshes;
         QMap<uint, QMaterial*> m_materials;
         QMap<uint, QEffect *> m_effects;
-        QMap<uint, QTexture*> m_embeddedTextures;
-        QMap<QString, QTexture*> m_materialTextures;
+        QMap<uint, QAbstractTextureProvider *> m_embeddedTextures;
+        QMap<QString, QAbstractTextureProvider *> m_materialTextures;
         QMap<aiNode*, QEntity*> m_cameras;
         QHash<aiTextureType, QString> m_textureToParameterName;
 //    QMap<aiNode*, Light*> m_lights;