Enable updating of XmlListModel from Qml.

Made the fetch() method a slot so it will be accessible from QML.

3 files changed, 15 insertions, 4 deletions

diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp
index badc6fb..af72ecc 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/extra/qmlxmllistmodel.cpp
@@ -239,12 +239,15 @@ void QmlXmlListModel::classComplete()
 void QmlXmlListModel::fetch()
 {
     Q_D(QmlXmlListModel);
+
+    //clear existing data
+    d->size = 0;
+    int count = d->data.count();
+    d->data.clear();
+    emit itemsRemoved(0, count);
+
     if (d->src.isEmpty()) {
         qWarning() << "Can't fetch empty src string";
-        //clear existing data?
-        //int count = d->data.count();
-        //d->data.clear();
-        //emit itemsRemoved(0, count);
         return;
     }
 
diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h
index d06cabf..acc54a9 100644
--- a/src/declarative/extra/qmlxmllistmodel.h
+++ b/src/declarative/extra/qmlxmllistmodel.h
@@ -116,6 +116,8 @@ public:
     void setNamespaceDeclarations(const QString&);
 
     virtual void classComplete();
+
+public Q_SLOTS:
     void fetch();
 
 protected:
diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp
index 810a359..ca6379f 100644
--- a/src/declarative/fx/qfxpathview.cpp
+++ b/src/declarative/fx/qfxpathview.cpp
@@ -699,6 +699,12 @@ void QFxPathView::itemsRemoved(int modelIndex, int count)
         d->regenerate();
     }
 
+    if (d->model->count() == 0) {
+        d->currentIndex == -1;
+        d->moveOffset.setValue(0);
+        return;
+    }
+
     // make sure the current item is still at the snap position
     if (d->currentIndex >= d->model->count())
         d->currentIndex = d->model->count() - 1;