summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-09-01 05:52:10 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-09-01 05:52:10 (GMT)
commit7d566bc4eb5b5e47b48f28012fed24109a8dd735 (patch)
tree7dcdc8660ae10c496f4cdc05ffd0d8f0e30b825d /src/declarative/qml
parent6cd1863ca3ff0684e1dd1a8d9c13b8f141800072 (diff)
downloadQt-7d566bc4eb5b5e47b48f28012fed24109a8dd735.zip
Qt-7d566bc4eb5b5e47b48f28012fed24109a8dd735.tar.gz
Qt-7d566bc4eb5b5e47b48f28012fed24109a8dd735.tar.bz2
Remove unused member variables from QmlEnginePrivate
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qmlengine.cpp9
-rw-r--r--src/declarative/qml/qmlengine_p.h4
2 files changed, 1 insertions, 12 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 1640dcb..652144d 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -107,7 +107,7 @@ QScriptValue desktopOpenUrl(QScriptContext *ctxt, QScriptEngine *e)
}
QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
-: rootContext(0), currentBindContext(0), currentExpression(0),
+: rootContext(0), currentExpression(0),
isDebugging(false), contextClass(0), objectClass(0), valueTypeClass(0),
nodeListClass(0), namedNodeMapClass(0), scriptEngine(this), rootComponent(0),
networkAccessManager(0), typeManager(e), uniqueId(1)
@@ -199,13 +199,6 @@ void QmlEnginePrivate::init()
}
}
-QmlContext *QmlEnginePrivate::setCurrentBindContext(QmlContext *c)
-{
- QmlContext *old = currentBindContext;
- currentBindContext = c;
- return old;
-}
-
QmlEnginePrivate::CapturedProperty::CapturedProperty(const QmlMetaProperty &p)
: object(p.object()), coreIndex(p.coreIndex()), notifyIndex(p.property().notifySignalIndex())
{
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index b3c6279..b595e7c 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -114,7 +114,6 @@ public:
QPODVector<CapturedProperty> capturedProperties;
QmlContext *rootContext;
- QmlContext *currentBindContext; // ### Remove me
QmlExpression *currentExpression;
bool isDebugging;
#ifdef QT_SCRIPTTOOLS_LIB
@@ -128,9 +127,6 @@ public:
QScriptClass *nodeListClass;
QScriptClass *namedNodeMapClass;
- QmlContext *setCurrentBindContext(QmlContext *);
- QStack<QmlContext *> activeContexts; // ### Remove me
-
struct QmlScriptEngine : public QScriptEngine
{
QmlScriptEngine(QmlEnginePrivate *priv)