From 2af9bc37a5955e8e1da2c3ba03fa0be763e2ae5e Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Tue, 27 Oct 2009 14:05:26 +1000
Subject: Simplify the defaultObjects handling

As the scope object is no longer added to the defaultObjects list
it makes sense that the root object remain constant at position 0
---
 src/declarative/qml/qmlbasicscript.cpp        |  2 +-
 src/declarative/qml/qmlcontext.cpp            | 21 +--------------------
 src/declarative/qml/qmlcontext_p.h            |  6 ------
 src/declarative/qml/qmlcontextscriptclass.cpp |  2 +-
 src/declarative/qml/qmlexpression.cpp         | 10 ++++++----
 5 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp
index b7aac54..eba4307 100644
--- a/src/declarative/qml/qmlbasicscript.cpp
+++ b/src/declarative/qml/qmlbasicscript.cpp
@@ -658,7 +658,7 @@ QVariant QmlBasicScript::run(QmlContext *context, QObject *me)
 
             case ScriptInstruction::FetchRootConstant:
             {
-                QObject *obj = contextPrivate->defaultObjects.last();
+                QObject *obj = contextPrivate->defaultObjects.at(0);
 
                 stack.push(fetch_value(obj, instr.constant.idx, instr.constant.type));
                 if (obj && instr.constant.notify != 0)
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 7ba3544..2ebdf10 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -50,9 +50,6 @@
 #include <private/qmlbindingoptimizations_p.h>
 #include <QtDeclarative/qmlinfo.h>
 
-// 6-bits
-#define MAXIMUM_DEFAULT_OBJECTS 63
-
 QT_BEGIN_NAMESPACE
 
 QmlContextPrivate::QmlContextPrivate()
@@ -130,22 +127,6 @@ void QmlContextPrivate::init()
         parent->d_func()->childContexts.insert(q);
 }
 
-void QmlContextPrivate::addDefaultObject(QObject *object, Priority priority)
-{
-    if (defaultObjects.count() >= (MAXIMUM_DEFAULT_OBJECTS - 1)) {
-        qWarning("QmlContext: Cannot have more than %d default objects on "
-                 "one bind context.", MAXIMUM_DEFAULT_OBJECTS - 1);
-        return;
-    }
-
-    if (priority == HighPriority) {
-        defaultObjects.insert(highPriorityCount++, object);
-    } else {
-        defaultObjects.append(object);
-    }
-}
-
-
 /*!
     \class QmlContext
     \brief The QmlContext class defines a context within a QML engine.
@@ -366,7 +347,7 @@ QmlContext *QmlContext::parentContext() const
 void QmlContext::addDefaultObject(QObject *defaultObject)
 {
     Q_D(QmlContext);
-    d->addDefaultObject(defaultObject, QmlContextPrivate::NormalPriority);
+    d->defaultObjects.prepend(defaultObject);
 }
 
 /*!
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index be7bf1d..6af5f64 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -104,12 +104,6 @@ public:
     void dump();
     void dump(int depth);
 
-    enum Priority {
-        HighPriority,
-        NormalPriority
-    };
-    void addDefaultObject(QObject *, Priority);
-
     void invalidateEngines();
     QSet<QmlContext *> childContexts;
 
diff --git a/src/declarative/qml/qmlcontextscriptclass.cpp b/src/declarative/qml/qmlcontextscriptclass.cpp
index 4df23f0..a978df2 100644
--- a/src/declarative/qml/qmlcontextscriptclass.cpp
+++ b/src/declarative/qml/qmlcontextscriptclass.cpp
@@ -155,7 +155,7 @@ QmlContextScriptClass::queryProperty(QmlContext *bindContext, QObject *scopeObje
         }
     }
 
-    for (int ii = 0; ii < cp->defaultObjects.count(); ++ii) {
+    for (int ii = cp->defaultObjects.count() - 1; ii >= 0; --ii) {
         QScriptClass::QueryFlags rv = 
             ep->objectClass->queryProperty(cp->defaultObjects.at(ii), name, flags, bindContext);
 
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index 3b89a23..c62756b 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -293,8 +293,7 @@ QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUnd
     QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
 
     if (secondaryScope)
-       ctxtPriv->defaultObjects.insert(ctxtPriv->highPriorityCount, 
-                                       secondaryScope);
+       ctxtPriv->defaultObjects.append(secondaryScope);
 
     QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine);
 
@@ -328,8 +327,11 @@ QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUnd
        return QVariant();
     }
 
-    if (secondaryScope)
-        ctxtPriv->defaultObjects.removeAt(ctxtPriv->highPriorityCount);
+    if (secondaryScope) {
+        QObject *last = ctxtPriv->defaultObjects.takeLast();
+        Q_ASSERT(last == secondaryScope);
+        Q_UNUSED(last);
+    }
 
     QVariant rv;
 
-- 
cgit v0.12