aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-08-06 14:18:57 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-22 04:24:16 +0200
commit6d32ff7d891635982b54fd4db1946952ddb50b26 (patch)
treecb16ec942678b123664f4eaaf417f52d1f816c64 /src
parente8cb9ac132dbac4c7373a47469a097e572b818d2 (diff)
Cleanup: Rename overloaded () operators of CodeGen to more descriptive function names
Change-Id: I529c3d5c80ed7f703046a2803c492c4b15511049 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/compiler/qv4codegen.cpp4
-rw-r--r--src/qml/compiler/qv4codegen_p.h4
-rw-r--r--src/qml/jsruntime/qv4functionobject.cpp2
-rw-r--r--src/qml/jsruntime/qv4script.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index e97be71d02..4f9815826b 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -443,7 +443,7 @@ Codegen::Codegen(bool strict)
{
}
-V4IR::Function *Codegen::operator()(const QString &fileName,
+V4IR::Function *Codegen::generateFromProgram(const QString &fileName,
const QString &sourceCode,
Program *node,
V4IR::Module *module,
@@ -468,7 +468,7 @@ V4IR::Function *Codegen::operator()(const QString &fileName,
return globalCode;
}
-V4IR::Function *Codegen::operator()(const QString &fileName,
+V4IR::Function *Codegen::generateFromFunctionExpression(const QString &fileName,
const QString &sourceCode,
AST::FunctionExpression *ast,
V4IR::Module *module)
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 2aa4b42c6a..075371b273 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -75,13 +75,13 @@ public:
QmlBinding
};
- V4IR::Function *operator()(const QString &fileName,
+ V4IR::Function *generateFromProgram(const QString &fileName,
const QString &sourceCode,
AST::Program *ast,
V4IR::Module *module,
Mode mode = GlobalCode,
const QStringList &inheritedLocals = QStringList());
- V4IR::Function *operator()(const QString &fileName,
+ V4IR::Function *generateFromFunctionExpression(const QString &fileName,
const QString &sourceCode,
AST::FunctionExpression *ast,
V4IR::Module *module);
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp
index 012318d30f..d04971a02c 100644
--- a/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@ -212,7 +212,7 @@ Value FunctionCtor::construct(Managed *that, Value *args, int argc)
QQmlJS::V4IR::Module module;
QQmlJS::RuntimeCodegen cg(v4->current, f->strictMode);
- cg(QString(), function, fe, &module);
+ cg.generateFromFunctionExpression(QString(), function, fe, &module);
QScopedPointer<QQmlJS::EvalInstructionSelection> isel(v4->iselFactory->create(v4->executableAllocator, &module));
QV4::CompiledData::CompilationUnit *compilationUnit = isel->compile();
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index d2d21d4fd5..2e75caa3b6 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -163,8 +163,8 @@ void Script::parse()
inheritedLocals.append(*i ? (*i)->toQString() : QString());
RuntimeCodegen cg(scope, strictMode);
- cg(sourceFile, sourceCode, program, &module,
- parseAsBinding ? QQmlJS::Codegen::QmlBinding : QQmlJS::Codegen::EvalCode, inheritedLocals);
+ cg.generateFromProgram(sourceFile, sourceCode, program, &module,
+ parseAsBinding ? QQmlJS::Codegen::QmlBinding : QQmlJS::Codegen::EvalCode, inheritedLocals);
QScopedPointer<EvalInstructionSelection> isel(v4->iselFactory->create(v4->executableAllocator, &module));
if (inheritContext)
isel->setUseFastLookups(false);