Texture renamed to QTexture

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

3 files changed, 10 insertions, 11 deletions

diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp b/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp
index 9308efeb7..a175cbef3 100644
--- a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include "quick3dmaterial.h"
-#include <QDebug>
-#include <Qt3DRenderer/texture.h>
+#include <Qt3DRenderer/qtexture.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
index 0301a2d0d..2cbd338a9 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
@@ -54,8 +54,8 @@ namespace Quick {
 Quick3DTexture::Quick3DTexture(QObject *parent)
     : QObject(parent)
 {
-    parentTexture()->setTarget(Texture::Target2D);
-    parentTexture()->setFormat(Texture::RGBA8_UNorm);
+    parentTexture()->setTarget(QTexture::Target2D);
+    parentTexture()->setFormat(QTexture::RGBA8_UNorm);
 }
 
 QUrl Quick3DTexture::source() const
@@ -73,8 +73,8 @@ void Quick3DTexture::setSource(QUrl arg)
             QImage img;
             if (img.load(source)) {
                 parentTexture()->setFormat(img.hasAlphaChannel() ?
-                                                       Texture::RGBA8_UNorm :
-                                                       Texture::RGB8_UNorm);
+                                                       QTexture::RGBA8_UNorm :
+                                                       QTexture::RGB8_UNorm);
                 parentTexture()->setFromQImage(img);
             }
             else {
@@ -90,13 +90,13 @@ void Quick3DTexture::setSource(QUrl arg)
 
 void Quick3DTexture::setRectangle(bool r)
 {
-    parentTexture()->setTarget(r ? Texture::TargetRectangle :
-                                   Texture::Target2D);
+    parentTexture()->setTarget(r ? QTexture::TargetRectangle :
+                                   QTexture::Target2D);
 }
 
 bool Quick3DTexture::isRectangle() const
 {
-    return (parentTexture()->target() == Texture::TargetRectangle);
+    return (parentTexture()->target() == QTexture::TargetRectangle);
 }
 
 } // Quick
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.h b/src/quick3d/quick3drenderer/items/quick3dtexture.h
index b8673dcea..1ab75f994 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.h
+++ b/src/quick3d/quick3drenderer/items/quick3dtexture.h
@@ -44,7 +44,7 @@
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DQuick/quick3dnode.h>
-#include <Qt3DRenderer/texture.h>
+#include <Qt3DRenderer/qtexture.h>
 
 #include <QUrl>
 
@@ -77,7 +77,7 @@ Q_SIGNALS:
 
 private:
     QUrl m_source;
-    inline Qt3D::Texture *parentTexture() const { return qobject_cast<Qt3D::Texture *>(parent()); }
+    inline Qt3D::QTexture *parentTexture() const { return qobject_cast<Qt3D::QTexture *>(parent()); }
 };
 
 } // Quick