diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-01-10 17:07:50 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-01-11 13:05:18 +0000 |
commit | 7dfcd6fdbc4ee012138db0b7552cd36ba7fe0033 (patch) | |
tree | 4fb3c087a3c14034c08b8ac4d88ad2f57ae109d0 /src/lib/corelib/language/evaluatorscriptclass.cpp | |
parent | dd64db3c9b37ef827143dd70c9959d5072cd7a72 (diff) |
Remove superfluous m_sourceValueStack from EvaluatorScriptClass
Change-Id: Iae79a5e0deb65e45a43de630dde150fb070754d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/language/evaluatorscriptclass.cpp')
-rw-r--r-- | src/lib/corelib/language/evaluatorscriptclass.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp index 3bf0ff228..ba08c2074 100644 --- a/src/lib/corelib/language/evaluatorscriptclass.cpp +++ b/src/lib/corelib/language/evaluatorscriptclass.cpp @@ -75,14 +75,13 @@ class SVConverter : ValueHandler const QScriptString * const propertyName; const EvaluationData * const data; QScriptValue * const result; - QStack<JSSourceValue *> * const sourceValueStack; char pushedScopesCount; public: SVConverter(EvaluatorScriptClass *esc, const QScriptValue *obj, const ValuePtr &v, const Item *_itemOfProperty, const QScriptString *propertyName, const EvaluationData *data, - QScriptValue *result, QStack<JSSourceValue *> *sourceValueStack) + QScriptValue *result) : scriptClass(esc) , engine(static_cast<ScriptEngine *>(esc->engine())) , scriptContext(esc->engine()->currentContext()) @@ -92,7 +91,6 @@ public: , propertyName(propertyName) , data(data) , result(result) - , sourceValueStack(sourceValueStack) , pushedScopesCount(0) { } @@ -249,7 +247,7 @@ private: QScriptValue baseValue; if (value->baseValue()) { SVConverter converter(scriptClass, object, value->baseValue(), itemOfProperty, - propertyName, data, &baseValue, sourceValueStack); + propertyName, data, &baseValue); converter.start(); } setupConvenienceProperty(QLatin1String("base"), &extraScope, baseValue); @@ -269,7 +267,7 @@ private: while (item->type() == ItemType::ModuleInstance) item = item->prototype(); SVConverter converter(scriptClass, object, item->property(*propertyName), item, - propertyName, data, &originalValue, sourceValueStack); + propertyName, data, &originalValue); converter.start(); } else { originalValue = engine->newArray(0); @@ -614,8 +612,7 @@ QScriptValue EvaluatorScriptClass::property(const QScriptValue &object, const QS if (value->next() && !m_currentNextChain.contains(value.data())) { collectValuesFromNextChain(data, &result, name.toString(), value); } else { - SVConverter converter(this, &object, value, itemOfProperty, &name, data, &result, - &m_sourceValueStack); + SVConverter converter(this, &object, value, itemOfProperty, &name, data, &result); converter.start(); const PropertyDeclaration decl = data->item->propertyDeclaration(name.toString()); |