From 3c9ee8213a8ac283b596d93d10365a2e928199f8 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Mon, 7 Sep 2009 10:17:53 +1000
Subject: Fix warnings.

---
 src/declarative/qml/qmlengine.cpp | 16 +++++++---------
 src/declarative/qml/qmlengine_p.h |  3 +--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index a31d014..6d3506c 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -274,14 +274,10 @@ QmlEnginePrivate::queryContext(const QString &propName, uint *id,
     return rv;
 }
 
-QScriptValue 
-QmlEnginePrivate::propertyContext(const QScriptString &name, 
-                                  QmlContext *bindContext, 
-                                  uint id)
+QScriptValue QmlEnginePrivate::propertyContext(const QScriptString &name, uint id)
 {
     Q_ASSERT(id == resolveData.safetyCheckId);
 
-
     if (resolveData.type || resolveData.ns) {
         QmlTypeNameBridge tnb = { 
             resolveData.object, 
@@ -1096,11 +1092,10 @@ QScriptValue QmlContextScriptClass::property(const QScriptValue &object,
                                              const QScriptString &name,
                                              uint id)
 {
-    QmlContext *bindContext =
-        static_cast<QmlContext*>(object.data().toQObject());
+    Q_UNUSED(object);
 
     QmlEnginePrivate *ep = QmlEnginePrivate::get(engine);
-    return ep->propertyContext(name, bindContext, id);
+    return ep->propertyContext(name, id);
 }
 
 void QmlContextScriptClass::setProperty(QScriptValue &object,
@@ -1108,6 +1103,7 @@ void QmlContextScriptClass::setProperty(QScriptValue &object,
                                             uint id,
                                             const QScriptValue &value)
 {
+    Q_UNUSED(object);
     Q_UNUSED(name);
 
     QmlEnginePrivate::get(engine)->setPropertyContext(value, id);
@@ -1128,6 +1124,8 @@ QmlTypeNameScriptClass::queryProperty(const QScriptValue &scriptObject,
                                       const QScriptString &name,
                                       QueryFlags flags, uint *id)
 {
+    Q_UNUSED(flags);
+
     QmlTypeNameBridge bridge = 
         qvariant_cast<QmlTypeNameBridge>(scriptObject.data().toVariant());
 
@@ -1283,7 +1281,7 @@ QScriptValue QmlObjectToString(QScriptContext *context, QScriptEngine *engine)
         ret += QLatin1String("\"");
         ret += obj->objectName();
         ret += QLatin1String("\" ");
-        ret += obj->metaObject()->className();
+        ret += QLatin1String(obj->metaObject()->className());
         ret += QLatin1String("(0x");
         ret += QString::number((quintptr)obj,16);
         ret += QLatin1String(")");
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index f492ccb..15ab40d 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -100,8 +100,7 @@ public:
 
     QScriptClass::QueryFlags queryContext(const QString &name, uint *id,
                                           QmlContext *);
-    QScriptValue propertyContext(const QScriptString &propName, QmlContext *, 
-                                 uint id);
+    QScriptValue propertyContext(const QScriptString &propName, uint id);
     void setPropertyContext(const QScriptValue &, uint id);
     QScriptClass::QueryFlags queryObject(const QString &name, uint *id, 
                                          QObject *);
-- 
cgit v0.12