summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-08-04 04:54:43 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-08-04 04:54:43 (GMT)
commit826e1f392908b497fa254513b348614376b892a2 (patch)
tree3f2cb3929bcee3656406c9b5b4af10339397be0d /src/declarative
parent52aa98b54fd663a563d5fb4adc6230dbbbe9f311 (diff)
downloadQt-826e1f392908b497fa254513b348614376b892a2.zip
Qt-826e1f392908b497fa254513b348614376b892a2.tar.gz
Qt-826e1f392908b497fa254513b348614376b892a2.tar.bz2
Remove unused QmlContextPrivate member variables
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/qml/qmlcompileddata.cpp7
-rw-r--r--src/declarative/qml/qmlcomponent.cpp5
-rw-r--r--src/declarative/qml/qmlcontext.cpp3
-rw-r--r--src/declarative/qml/qmlcontext_p.h4
4 files changed, 2 insertions, 17 deletions
diff --git a/src/declarative/qml/qmlcompileddata.cpp b/src/declarative/qml/qmlcompileddata.cpp
index 0563891..ffb89b3 100644
--- a/src/declarative/qml/qmlcompileddata.cpp
+++ b/src/declarative/qml/qmlcompileddata.cpp
@@ -170,12 +170,7 @@ QObject *QmlCompiledData::TypeReference::createInstance(QmlContext *ctxt) const
return rv;
} else {
Q_ASSERT(component);
- QObject *rv = component->create(ctxt);
- QmlContext *ctxt = qmlContext(rv);
- if(ctxt) {
- static_cast<QmlContextPrivate *>(QObjectPrivate::get(ctxt))->typeName = className;
- }
- return rv;
+ return component->create(ctxt);
}
}
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 8fb7736..d4e383d 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -488,11 +488,6 @@ QObject *QmlComponent::beginCreate(QmlContext *context)
static_cast<QmlContextPrivate *>(QObjectPrivate::get(context));
QmlContext *ctxt = new QmlContext(context, 0, true);
static_cast<QmlContextPrivate*>(ctxt->d_ptr)->url = d->cc->url;
- if(d->start != -1) {
- // ### FIXME
- static_cast<QmlContextPrivate*>(ctxt->d_ptr)->startLine = d->cc->bytecode.at(d->start - 1).line;
- static_cast<QmlContextPrivate*>(ctxt->d_ptr)->endLine = d->cc->bytecode.at(d->start - 1).createComponent.endLine;
- }
QmlVME vme;
QObject *rv = vme.run(ctxt, d->cc, d->start, d->count);
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index fd64a95..365ad6d 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -55,8 +55,7 @@ QT_BEGIN_NAMESPACE
QmlContextPrivate::QmlContextPrivate()
: parent(0), engine(0), isInternal(false), notifyIndex(-1),
- highPriorityCount(0), startLine(-1), endLine(-1), idValues(0),
- idValueCount(0)
+ highPriorityCount(0), idValues(0), idValueCount(0)
{
}
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index 5bb3aaf..4240c8a 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -88,9 +88,6 @@ public:
QScriptValueList scopeChain;
QUrl url;
- QByteArray typeName;
- int startLine;
- int endLine;
void init();
@@ -110,7 +107,6 @@ public:
QmlSimpleDeclarativeData contextData;
QObjectList contextObjects;
-
struct ContextGuard : public QGuard<QObject>
{
QmlContextPrivate *priv;