Remove leftover QtScript code from ListModel

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index d4af0b1..8659c5b 100644 (file)
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -52,7 +52,6 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qstack.h>
 #include <QXmlStreamReader>
-#include <QtScript/qscriptvalueiterator.h>
 
 Q_DECLARE_METATYPE(QListModelInterface *)
 
@@ -1036,7 +1035,7 @@ bool QDeclarativeListModelParser::definesEmptyList(const QString &s)
 */
 
 FlatListModel::FlatListModel(QDeclarativeListModel *base)
-: m_engine(0), m_listModel(base), m_scriptClass(0), m_parentAgent(0)
+: m_engine(0), m_listModel(base), m_parentAgent(0)
 {
 }
 
@@ -1259,82 +1258,6 @@ void FlatNodeData::removeData(QV8ListModelResource *data)
     objects.remove(data);
 }
 
-
-#if 0
-FlatListScriptClass::FlatListScriptClass(FlatListModel *model, QScriptEngine *seng)
-    : QScriptDeclarativeClass(seng),
-      m_model(model)
-{
-}
-
-QScriptDeclarativeClass::Value FlatListScriptClass::property(Object *obj, const Identifier &name)
-{
-    FlatNodeObjectData *objData = static_cast<FlatNodeObjectData*>(obj);
-    if (!objData->nodeData) // item at this index has been deleted
-        return QScriptDeclarativeClass::Value(engine(), engine()->undefinedValue());
-
-    int index = objData->nodeData->index;
-    QString propName = toString(name);
-    int role = m_model->m_strings.value(propName, -1);
-
-    if (role >= 0 && index >=0 ) {
-        const QHash<int, QVariant> &row = m_model->m_values[index];
-        QScriptValue sv = engine()->toScriptValue<QVariant>(row[role]);
-        return QScriptDeclarativeClass::Value(engine(), sv);
-    }
-
-    return QScriptDeclarativeClass::Value(engine(), engine()->undefinedValue());
-}
-
-void FlatListScriptClass::setProperty(Object *obj, const Identifier &name, const QScriptValue &value)
-{
-    if (!value.isVariant() && !value.isRegExp() && !value.isDate() && value.isObject()) {
-        qmlInfo(m_model->m_listModel) << "Cannot add list-type data when modifying or after modification from a worker script";
-        return;
-    }
-
-    FlatNodeObjectData *objData = static_cast<FlatNodeObjectData*>(obj);
-    if (!objData->nodeData) // item at this index has been deleted
-        return;
-
-    int index = objData->nodeData->index;
-    QString propName = toString(name);
-
-    int role = m_model->m_strings.value(propName, -1);
-    if (role >= 0 && index >= 0) {
-        QHash<int, QVariant> &row = m_model->m_values[index];
-        row[role] = value.toVariant();
-
-        QList<int> roles;
-        roles << role;
-        if (m_model->m_parentAgent) {
-            // This is the list in the worker thread, so tell the agent to
-            // emit itemsChanged() later
-            m_model->m_parentAgent->changedData(index, 1, roles);
-        } else {
-            // This is the list in the main thread, so emit itemsChanged()
-            emit m_model->m_listModel->itemsChanged(index, 1, roles);
-        }
-    }
-}
-
-QScriptClass::QueryFlags FlatListScriptClass::queryProperty(Object *, const Identifier &, QScriptClass::QueryFlags)
-{
-    return (QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess);
-}
-
-bool FlatListScriptClass::compare(Object *obj1, Object *obj2)
-{
-    FlatNodeObjectData *data1 = static_cast<FlatNodeObjectData*>(obj1);
-    FlatNodeObjectData *data2 = static_cast<FlatNodeObjectData*>(obj2);
-
-    if (!data1->nodeData || !data2->nodeData)
-        return false;
-
-    return data1->nodeData->index == data2->nodeData->index;
-}
-#endif
-
 NestedListModel::NestedListModel(QDeclarativeListModel *base)
 : _root(0), m_ownsRoot(false), m_listModel(base), _rolesOk(false)
 {

diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h
index 5962f37..94a7e65 100644 (file)
--- a/src/declarative/util/qdeclarativelistmodel_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p.h
@@ -51,7 +51,6 @@
 #include <QtCore/QList>
 #include <QtCore/QVariant>
 #include <private/qlistmodelinterface_p.h>
-#include <QtScript/qscriptvalue.h>
 
 #include <private/qv8engine_p.h>
 
@@ -65,7 +64,6 @@ class FlatListModel;
 class NestedListModel;
 class QDeclarativeListModelWorkerAgent;
 struct ModelNode;
-class FlatListScriptClass;
 class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeListModel : public QListModelInterface
 {
     Q_OBJECT

diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h
index b7fbd0e..971f0d8 100644 (file)
--- a/src/declarative/util/qdeclarativelistmodel_p_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p_p.h
@@ -58,8 +58,6 @@
 #include "private/qdeclarativeopenmetaobject_p.h"
 #include "qdeclarative.h"
 
-#include <private/qscriptdeclarativeclass_p.h>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -69,7 +67,6 @@ QT_MODULE(Declarative)
 class QDeclarativeOpenMetaObject;
 class QDeclarativeListModelWorkerAgent;
 struct ModelNode;
-class FlatListScriptClass;
 class FlatNodeData;
 
 class FlatListModel
@@ -110,32 +107,10 @@ private:
     QList<QHash<int, QVariant> > m_values;
     QDeclarativeListModel *m_listModel;
 
-    FlatListScriptClass *m_scriptClass;
     QList<FlatNodeData *> m_nodeData;
     QDeclarativeListModelWorkerAgent *m_parentAgent;
 };
 
-
-#if 0
-/*
-    Created when get() is called on a FlatListModel. This allows changes to the
-    object returned by get() to be tracked, and passed onto the model.
-*/
-class FlatListScriptClass : public QScriptDeclarativeClass
-{
-public:
-    FlatListScriptClass(FlatListModel *model, QScriptEngine *seng);
-
-    Value property(Object *, const Identifier &);
-    void setProperty(Object *, const Identifier &name, const QScriptValue &);
-    QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, QScriptClass::QueryFlags flags);
-    bool compare(Object *, Object *);
-
-private:
-    FlatListModel *m_model;
-};
-#endif
-
 /*
     FlatNodeData and FlatNodeObjectData allow objects returned by get() to still
     point to the correct list index if move(), insert() or remove() are called.

diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
index d8aae68..d814029 100644 (file)
--- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
@@ -55,7 +55,6 @@
 
 #include "qdeclarative.h"
 
-#include <QtScript/qscriptvalue.h>
 #include <QtGui/qevent.h>
 #include <QMutex>
 #include <QWaitCondition>
@@ -69,7 +68,6 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeListModel;
-class FlatListScriptClass;
 
 class QDeclarativeListModelWorkerAgent : public QObject
 {