Make build on Symbian

2 files changed, 33 insertions, 29 deletions

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 2d8b946..3263238 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -356,6 +356,37 @@ void QDeclarativeListModel::clear()
     }
 }
 
+QDeclarativeListModel *ModelNode::model(const NestedListModel *model)
+{
+    if (!modelCache) { 
+        modelCache = new QDeclarativeListModel;
+        QDeclarativeEngine::setContextForObject(modelCache,QDeclarativeEngine::contextForObject(model->m_listModel));
+        modelCache->m_nested->_root = this;  // ListModel defaults to nestable model
+
+        for (int i=0; i<values.count(); ++i) {
+            ModelNode *subNode = qvariant_cast<ModelNode *>(values.at(i));
+            if (subNode)
+                subNode->m_model = modelCache->m_nested;
+        }
+    }
+    return modelCache;
+}
+
+ModelObject *ModelNode::object(const NestedListModel *model)
+{
+    if (!objectCache) {
+        objectCache = new ModelObject(this, 
+                const_cast<NestedListModel*>(model), 
+                QDeclarativeEnginePrivate::getScriptEngine(qmlEngine(model->m_listModel)));
+        QHash<QString, ModelNode *>::iterator it;
+        for (it = properties.begin(); it != properties.end(); ++it) {
+            objectCache->setValue(it.key().toUtf8(), model->valueForNode(*it));
+        }
+        objectCache->setNodeUpdatesEnabled(true);
+    }
+    return objectCache;
+}
+
 /*!
     \qmlmethod ListModel::remove(int index)
 
diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h
index acf4f3e..d2d40ee 100644
--- a/src/declarative/util/qdeclarativelistmodel_p_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p_p.h
@@ -255,35 +255,8 @@ struct ModelNode
 
     void clear();
 
-    QDeclarativeListModel *model(const NestedListModel *model) {
-        if (!modelCache) { 
-            modelCache = new QDeclarativeListModel;
-            QDeclarativeEngine::setContextForObject(modelCache,QDeclarativeEngine::contextForObject(model->m_listModel));
-            modelCache->m_nested->_root = this;  // ListModel defaults to nestable model
-
-            for (int i=0; i<values.count(); ++i) {
-                ModelNode *subNode = qvariant_cast<ModelNode *>(values.at(i));
-                if (subNode)
-                    subNode->m_model = modelCache->m_nested;
-            }
-        }
-        return modelCache;
-    }
-
-    ModelObject *object(const NestedListModel *model) {
-        if (!objectCache) {
-            objectCache = new ModelObject(this, 
-                    const_cast<NestedListModel*>(model), 
-                    QDeclarativeEnginePrivate::getScriptEngine(qmlEngine(model->m_listModel)));
-            QHash<QString, ModelNode *>::iterator it;
-            for (it = properties.begin(); it != properties.end(); ++it) {
-                objectCache->setValue(it.key().toUtf8(), model->valueForNode(*it));
-            }
-            objectCache->setNodeUpdatesEnabled(true);
-        }
-        return objectCache;
-    }
-
+    QDeclarativeListModel *model(const NestedListModel *model);
+    ModelObject *object(const NestedListModel *model);
 
     void setObjectValue(const QScriptValue& valuemap, bool writeToCache = true);
     void setListValue(const QScriptValue& valuelist);