Make scene parsers operate on URLs instead of raw filenames

This way they are compatible with how mesh and texture source URLs
are handled.

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

3 files changed, 9 insertions, 8 deletions

diff --git a/src/render/frontend/qabstractsceneloader.cpp b/src/render/frontend/qabstractsceneloader.cpp
index 0b7c1b0a6..9e0b06aec 100644
--- a/src/render/frontend/qabstractsceneloader.cpp
+++ b/src/render/frontend/qabstractsceneloader.cpp
@@ -70,18 +70,18 @@ void QAbstractSceneLoader::copy(const QNode *ref)
     d_func()->m_source = s->d_func()->m_source;
 }
 
-QString QAbstractSceneLoader::source() const
+QUrl QAbstractSceneLoader::source() const
 {
     Q_D(const QAbstractSceneLoader);
     return d->m_source;
 }
 
-void QAbstractSceneLoader::setSource(QString arg)
+void QAbstractSceneLoader::setSource(const QUrl &arg)
 {
     Q_D(QAbstractSceneLoader);
     if (d->m_source != arg) {
         d->m_source = arg;
-        emit sourceChanged(arg);
+        emit sourceChanged();
     }
 }
 
diff --git a/src/render/frontend/qabstractsceneloader.h b/src/render/frontend/qabstractsceneloader.h
index e96b75638..d5e08aa35 100644
--- a/src/render/frontend/qabstractsceneloader.h
+++ b/src/render/frontend/qabstractsceneloader.h
@@ -40,6 +40,7 @@
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DCore/qscenechange.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
+#include <QUrl>
 
 QT_BEGIN_NAMESPACE
 
@@ -53,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public QComponent
 {
     Q_OBJECT
     Q_ENUMS(Status)
-    Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 public:
     explicit QAbstractSceneLoader(QNode *parent = 0);
@@ -64,8 +65,8 @@ public:
         Error
     };
 
-    QString source() const;
-    void setSource(QString arg);
+    QUrl source() const;
+    void setSource(const QUrl &arg);
 
     Status status() const;
     void setStatus(Status status);
@@ -73,7 +74,7 @@ public:
     virtual void sceneChangeEvent(const QSceneChangePtr &change) = 0;
 
 Q_SIGNALS:
-    void sourceChanged(QString arg);
+    void sourceChanged();
     void statusChanged();
 
 protected:
diff --git a/src/render/frontend/qabstractsceneloader_p.h b/src/render/frontend/qabstractsceneloader_p.h
index dfe3b515e..b9586fcf7 100644
--- a/src/render/frontend/qabstractsceneloader_p.h
+++ b/src/render/frontend/qabstractsceneloader_p.h
@@ -57,7 +57,7 @@ public:
 
     Q_DECLARE_PUBLIC(QAbstractSceneLoader)
 
-    QString m_source;
+    QUrl m_source;
     QAbstractSceneLoader::Status m_status;
 };