Merge Function::init with the constructor

Change-Id: I557f8a80aa2c74398b94e87ed0f29fe8d2297150
Reviewed-by: Lars Knoll <[email protected]>

2 files changed, 18 insertions, 19 deletions

diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp
index 87db58580f..e3575086a2 100644
--- a/src/qml/jsruntime/qv4function.cpp
+++ b/src/qml/jsruntime/qv4function.cpp
@@ -51,17 +51,22 @@ QT_BEGIN_NAMESPACE
 
 using namespace QV4;
 
-Function::~Function()
-{
-}
-
-void Function::init(CompiledData::CompilationUnit *unit, const CompiledData::Function *function, Value (*codePtr)(ExecutionContext *, const uchar *),
-                    quint32 _codeSize)
+Function::Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function,
+                   Value (*codePtr)(ExecutionContext *, const uchar *), quint32 _codeSize)
+        : name(0)
+        , compiledFunction(0)
+        , compilationUnit(0)
+        , code(0)
+        , codeData(0)
+        , codeSize(0)
+        , engine(engine)
 {
     Q_ASSERT(!compilationUnit);
     compilationUnit = unit;
     compiledFunction = function;
 
+    name = compilationUnit->runtimeStrings[compiledFunction->nameIndex];
+
     code = codePtr;
     codeSize = _codeSize;
 
@@ -77,6 +82,11 @@ void Function::init(CompiledData::CompilationUnit *unit, const CompiledData::Fun
         locals[i] = engine->newString(unit->data->stringAt(localsIndices[i])->qString());
 }
 
+Function::~Function()
+{
+}
+
+
 void Function::mark()
 {
     if (name)
diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index d9ba9dccb8..d197098663 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -100,21 +100,10 @@ struct Function {
 
     ExecutionEngine *engine;
 
-    Function(ExecutionEngine *engine, String *name)
-        : name(name)
-        , compiledFunction(0)
-        , compilationUnit(0)
-        , code(0)
-        , codeData(0)
-        , codeSize(0)
-        , engine(engine)
-    {}
+    Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function,
+             Value (*codePtr)(ExecutionContext *, const uchar *), quint32 _codeSize);
     ~Function();
 
-    // ### Merge with constructor later.
-    void init(CompiledData::CompilationUnit *unit, const CompiledData::Function *function,
-              Value (*codePtr)(ExecutionContext *, const uchar *), quint32 _codeSize);
-
     inline QString sourceFile() const { return compilationUnit->fileName(); }
 
     inline bool usesArgumentsObject() const { return compiledFunction->flags & CompiledData::Function::UsesArgumentsObject; }