More explicit QUrl <-> QString conversion.

5 files changed, 9 insertions, 10 deletions

diff --git a/src/declarative/fx/qfxanimatedimageitem.cpp b/src/declarative/fx/qfxanimatedimageitem.cpp
index 604481c..d22959a 100644
--- a/src/declarative/fx/qfxanimatedimageitem.cpp
+++ b/src/declarative/fx/qfxanimatedimageitem.cpp
@@ -152,7 +152,7 @@ int QFxAnimatedImageItem::frameCount() const
     return d->_movie->frameCount();
 }
 
-void QFxAnimatedImageItem::setSource(const QString &url)
+void QFxAnimatedImageItem::setSource(const QUrl &url)
 {
     Q_D(QFxAnimatedImageItem);
     if (url == d->url)
diff --git a/src/declarative/fx/qfxanimatedimageitem.h b/src/declarative/fx/qfxanimatedimageitem.h
index a0d14c4..5d115d7 100644
--- a/src/declarative/fx/qfxanimatedimageitem.h
+++ b/src/declarative/fx/qfxanimatedimageitem.h
@@ -73,7 +73,7 @@ public:
     int frameCount() const;
 
     // Extends QFxImage's src property*/
-    virtual void setSource(const QString&);
+    virtual void setSource(const QUrl&);
 
 Q_SIGNALS:
     void playingChanged();
diff --git a/src/declarative/fx/qfxhighlightfilter.cpp b/src/declarative/fx/qfxhighlightfilter.cpp
index 3d5f413..2c6fb0a 100644
--- a/src/declarative/fx/qfxhighlightfilter.cpp
+++ b/src/declarative/fx/qfxhighlightfilter.cpp
@@ -58,7 +58,6 @@ public:
     QFxHighlightFilterPrivate()
         : xOffset(0), yOffset(0), tiled(false) {}
 
-    QString source;
     QUrl url;
     int xOffset;
     int yOffset;
@@ -130,7 +129,7 @@ QFxHighlightFilter::~QFxHighlightFilter()
 */
 QUrl QFxHighlightFilter::source() const
 {
-    return d->source;
+    return d->url;
 }
 
 void QFxHighlightFilter::imageLoaded()
@@ -140,7 +139,7 @@ void QFxHighlightFilter::imageLoaded()
     if (!img.isNull()) 
         d->tex.setImage(img.toImage());
 #endif
-    emit sourceChanged(d->source);
+    emit sourceChanged(d->url);
     update();
 }
 
@@ -158,7 +157,7 @@ void QFxHighlightFilter::setSource(const QUrl &f)
     if (!f.isEmpty())
         QFxPixmap::get(qmlEngine(this), d->url, this, SLOT(imageLoaded()));
     else
-        emit sourceChanged(d->source);
+        emit sourceChanged(d->url);
 }
 
 /*!
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 648b0fb..079d691 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -901,11 +901,11 @@ void QFxItem::qmlLoaded()
         QFxItem *qmlChild = qobject_cast<QFxItem *>(obj);
         if (qmlChild) {
             qmlChild->setItemParent(this);
-            d->_qmlChildren.insert(d->_qml, qmlChild);
+            d->_qmlChildren.insert(d->_qml.toString(), qmlChild);
             d->qmlItem = qmlChild;
         } else {
             delete qmlChild;
-            d->_qml = QString();
+            d->_qml = QUrl();
         }
         delete d->_qmlcomp;
         d->_qmlcomp = 0;
@@ -1962,7 +1962,7 @@ void QFxItem::newChild(const QString &type)
 {
     Q_D(QFxItem);
 
-    QUrl url = qmlContext(this)->resolvedUri(type);
+    QUrl url = qmlContext(this)->resolvedUri(QUrl(type));
     if (url.isEmpty())
         return;
 
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index d15502b..dc7f60e 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -1065,7 +1065,7 @@ QFxWebView *QFxWebPage::view()
 
 QObject *QFxWebPage::createPlugin(const QString &, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
 {
-    QUrl comp = qmlContext(view())->resolvedUri(url.toString());
+    QUrl comp = qmlContext(view())->resolvedUri(url);
     return new QWidget_Dummy_Plugin(comp,view(),paramNames,paramValues);
 }