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>

3 files changed, 41 insertions, 41 deletions

diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 15b36b56b..0e6624c31 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -180,7 +180,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
 
     // Textures
     qmlRegisterType<Qt3D::QTextureWrapMode>(uri, 2, 0, "WrapMode");//, QStringLiteral("QTextureWrapMode cannot be created from QML"));
-    qmlRegisterUncreatableType<Qt3D::QTexture>(uri, 2, 0, "Texture", QStringLiteral("Texture should be created from one of the subclasses"));
+    qmlRegisterUncreatableType<Qt3D::QAbstractTextureProvider>(uri, 2, 0, "Texture", QStringLiteral("Texture should be created from one of the subclasses"));
     qmlRegisterType<Qt3D::Render::Quick::Quick3DTexture1D>(uri, 2, 0, "Texture1D");
     qmlRegisterType<Qt3D::Render::Quick::Quick3DTexture1DArray>(uri, 2, 0, "Texture1DArray");
     qmlRegisterExtendedType<Qt3D::Render::Quick::Quick3DTexture2D, Qt3D::Render::Quick::Quick3DTexture2DExtension>(uri, 2, 0, "Texture2D");
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
index 45484e25b..a93bde00c 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
@@ -51,57 +51,57 @@ namespace Render {
 namespace Quick {
 
 Quick3DTexture1D::Quick3DTexture1D(QNode *parent)
-    : QTexture(Target1D, parent)
+    : QAbstractTextureProvider(Target1D, parent)
 {
 }
 
 Quick3DTexture1DArray::Quick3DTexture1DArray(QNode *parent)
-    : QTexture(Target1DArray, parent)
+    : QAbstractTextureProvider(Target1DArray, parent)
 {
 }
 
 Quick3DTexture2D::Quick3DTexture2D(QNode *parent)
-    : QTexture(Target2D, parent)
+    : QAbstractTextureProvider(Target2D, parent)
 {
 }
 
 Quick3DTexture2DArray::Quick3DTexture2DArray(QNode *parent)
-    : QTexture(Target2DArray, parent)
+    : QAbstractTextureProvider(Target2DArray, parent)
 {
 }
 
 Quick3DTexture3D::Quick3DTexture3D(QNode *parent)
-    : QTexture(Target3D, parent)
+    : QAbstractTextureProvider(Target3D, parent)
 {
 }
 
 Quick3DTextureCubeMap::Quick3DTextureCubeMap(QNode *parent)
-    : QTexture(TargetCubeMap, parent)
+    : QAbstractTextureProvider(TargetCubeMap, parent)
 {
 }
 
 Quick3DTextureCubeMapArray::Quick3DTextureCubeMapArray(QNode *parent)
-    : QTexture(TargetCubeMapArray, parent)
+    : QAbstractTextureProvider(TargetCubeMapArray, parent)
 {
 }
 
 Quick3DTexture2DMultisample::Quick3DTexture2DMultisample(QNode *parent)
-    : QTexture(Target2DMultisample, parent)
+    : QAbstractTextureProvider(Target2DMultisample, parent)
 {
 }
 
 Quick3DTexture2DMultisampleArray::Quick3DTexture2DMultisampleArray(QNode *parent)
-    : QTexture(Target2DMultisampleArray, parent)
+    : QAbstractTextureProvider(Target2DMultisampleArray, parent)
 {
 }
 
 Quick3DTextureRectangle::Quick3DTextureRectangle(QNode *parent)
-    : QTexture(TargetRectangle, parent)
+    : QAbstractTextureProvider(TargetRectangle, parent)
 {
 }
 
 Quick3DTextureBuffer::Quick3DTextureBuffer(QNode *parent)
-    : QTexture(TargetBuffer, parent)
+    : QAbstractTextureProvider(TargetBuffer, parent)
 {
 }
 
@@ -126,8 +126,8 @@ void Quick3DTexture2DExtension::setSource(QUrl arg)
             QImage img;
             if (img.load(source)) {
                 parentTexture()->setFormat(img.hasAlphaChannel() ?
-                                               QTexture::RGBA8_UNorm :
-                                               QTexture::RGB8_UNorm);
+                                               QAbstractTextureProvider::RGBA8_UNorm :
+                                               QAbstractTextureProvider::RGB8_UNorm);
                 parentTexture()->setFromQImage(img);
             }
             else {
@@ -173,7 +173,7 @@ void Quick3DTextureCubeMapExtension::setPositiveX(const QUrl &positiveX)
     if (positiveX != m_positiveX) {
         m_positiveX = positiveX;
         emit positiveXChanged();
-        loadFace(positiveX, QTexture::CubeMapPositiveX);
+        loadFace(positiveX, QAbstractTextureProvider::CubeMapPositiveX);
     }
 }
 
@@ -182,7 +182,7 @@ void Quick3DTextureCubeMapExtension::setPositiveY(const QUrl &positiveY)
     if (positiveY != m_positiveY) {
         m_positiveY = positiveY;
         emit positiveYChanged();
-        loadFace(positiveY, QTexture::CubeMapPositiveY);
+        loadFace(positiveY, QAbstractTextureProvider::CubeMapPositiveY);
     }
 }
 
@@ -191,7 +191,7 @@ void Quick3DTextureCubeMapExtension::setPositiveZ(const QUrl &positiveZ)
     if (positiveZ != m_positiveZ) {
         m_positiveZ = positiveZ;
         emit positiveZChanged();
-        loadFace(positiveZ, QTexture::CubeMapPositiveZ);
+        loadFace(positiveZ, QAbstractTextureProvider::CubeMapPositiveZ);
     }
 }
 
@@ -200,7 +200,7 @@ void Quick3DTextureCubeMapExtension::setNegativeX(const QUrl &negativeX)
     if (negativeX != m_negativeX) {
         m_negativeX = negativeX;
         emit negativeXChanged();
-        loadFace(negativeX, QTexture::CubeMapNegativeX);
+        loadFace(negativeX, QAbstractTextureProvider::CubeMapNegativeX);
     }
 }
 
@@ -209,7 +209,7 @@ void Quick3DTextureCubeMapExtension::setNegativeY(const QUrl &negativeY)
     if (negativeY != m_negativeY) {
         m_negativeY = negativeY;
         emit negativeYChanged();
-        loadFace(negativeY, QTexture::CubeMapNegativeY);
+        loadFace(negativeY, QAbstractTextureProvider::CubeMapNegativeY);
     }
 }
 
@@ -218,7 +218,7 @@ void Quick3DTextureCubeMapExtension::setNegativeZ(const QUrl &negativeZ)
     if (negativeZ != m_negativeZ) {
         m_negativeZ = negativeZ;
         emit negativeZChanged();
-        loadFace(negativeZ, QTexture::CubeMapNegativeZ);
+        loadFace(negativeZ, QAbstractTextureProvider::CubeMapNegativeZ);
     }
 }
 
@@ -257,12 +257,12 @@ QUrl Quick3DTextureCubeMapExtension::negativeZ() const
     return m_negativeZ;
 }
 
-void Quick3DTextureCubeMapExtension::loadFace(const QUrl &faceUrl, QTexture::CubeMapFace face)
+void Quick3DTextureCubeMapExtension::loadFace(const QUrl &faceUrl, QAbstractTextureProvider::CubeMapFace face)
 {
     if (faceUrl.isLocalFile() || faceUrl.scheme() == QStringLiteral("qrc")) {
         QString source = faceUrl.toString().replace(QStringLiteral("qrc"), QStringLiteral(""));
         QImage img;
-        parentTexture()->setStatus(QTexture::Loading);
+        parentTexture()->setStatus(QAbstractTextureProvider::Loading);
         if (img.load(source)) {
             TexImageDataPtr dataPtr(new TexImageData(0, 0));
 
@@ -271,21 +271,21 @@ void Quick3DTextureCubeMapExtension::loadFace(const QUrl &faceUrl, QTexture::Cub
                 parentTexture()->setHeight(img.height());
             if (parentTexture()->width() != img.width())
                 parentTexture()->setWidth(img.width());
-            QTexture::TextureFormat format = img.hasAlphaChannel() ?
-                        QTexture::RGBA8_UNorm :
-                        QTexture::RGB8_UNorm;
+            QAbstractTextureProvider::TextureFormat format = img.hasAlphaChannel() ?
+                        QAbstractTextureProvider::RGBA8_UNorm :
+                        QAbstractTextureProvider::RGB8_UNorm;
             if (format != parentTexture()->format())
                 parentTexture()->setFormat(format);
             dataPtr->setImage(img);
             parentTexture()->addImageData(dataPtr);
-            parentTexture()->setStatus(QTexture::Loaded);
+            parentTexture()->setStatus(QAbstractTextureProvider::Loaded);
         }
         else {
             qWarning() << "Failed to load image : " << source;
-            parentTexture()->setStatus(QTexture::Error);
+            parentTexture()->setStatus(QAbstractTextureProvider::Error);
         }
     } else {
-        parentTexture()->setStatus(QTexture::Error);
+        parentTexture()->setStatus(QAbstractTextureProvider::Error);
         qWarning() << "implement loading from remote URLs";
     }
 }
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.h b/src/quick3d/quick3drenderer/items/quick3dtexture.h
index fc4d8cb18..ef055692b 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.h
+++ b/src/quick3d/quick3drenderer/items/quick3dtexture.h
@@ -56,42 +56,42 @@ namespace Render {
 
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture1D : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture1D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
     explicit Quick3DTexture1D(QNode *parent = 0);
 };
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture1DArray : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture1DArray : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
     explicit Quick3DTexture1DArray(QNode *parent = 0);
 };
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture2D : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture2D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
     explicit Quick3DTexture2D(QNode *parent = 0);
 };
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture2DArray : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture2DArray : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
     explicit Quick3DTexture2DArray(QNode *parent = 0);
 };
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture3D : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture3D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
     explicit Quick3DTexture3D(QNode *parent = 0);
 };
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureCubeMap : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureCubeMap : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -100,35 +100,35 @@ public:
     friend class Quick3DTextureCubeMapExtension;
 };
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureCubeMapArray : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureCubeMapArray : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
     explicit Quick3DTextureCubeMapArray(QNode *parent = 0);
 };
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture2DMultisample : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture2DMultisample : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
     explicit Quick3DTexture2DMultisample(QNode *parent = 0);
 };
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture2DMultisampleArray : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTexture2DMultisampleArray : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
     explicit Quick3DTexture2DMultisampleArray(QNode *parent = 0);
 };
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureRectangle : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureRectangle : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
     explicit Quick3DTextureRectangle(QNode *parent = 0);
 };
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureBuffer : public QTexture
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureBuffer : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -150,7 +150,7 @@ Q_SIGNALS:
 
 private:
     QUrl m_source;
-    inline Qt3D::QTexture *parentTexture() const { return qobject_cast<Qt3D::QTexture *>(parent()); }
+    inline Qt3D::QAbstractTextureProvider *parentTexture() const { return qobject_cast<Qt3D::QAbstractTextureProvider *>(parent()); }
 };
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureCubeMapExtension : public QObject
@@ -202,7 +202,7 @@ private:
     QUrl m_source;
 
     inline Quick3DTextureCubeMap *parentTexture() { return qobject_cast<Quick3DTextureCubeMap *>(parent()); }
-    void loadFace(const QUrl &faceUrl, QTexture::CubeMapFace face);
+    void loadFace(const QUrl &faceUrl, QAbstractTextureProvider::CubeMapFace face);
 };
 
 } // Quick