diff options
author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-05-20 15:09:34 +0200 |
---|---|---|
committer | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-05-25 10:56:26 +0200 |
commit | a8326b168a93a39ca52188ba29ca54d0dc62ccd8 (patch) | |
tree | ec5cf8f1d34d6febdf6ad23181b3a6d1c2cf6af9 | |
parent | 8a84d56c572b163b6f4e50f3f66d6bb3cc057a03 (diff) |
Code cleanup.
Remove unused constructors from QScriptContextPrivate.
-rw-r--r-- | src/script/api/qscriptcontext_impl_p.h | 33 | ||||
-rw-r--r-- | src/script/api/qscriptcontext_p.h | 5 |
2 files changed, 1 insertions, 37 deletions
diff --git a/src/script/api/qscriptcontext_impl_p.h b/src/script/api/qscriptcontext_impl_p.h index b2305e0..3fc832d 100644 --- a/src/script/api/qscriptcontext_impl_p.h +++ b/src/script/api/qscriptcontext_impl_p.h @@ -49,18 +49,6 @@ inline QScriptContextPrivate::QScriptContextPrivate(const AllocationType type, Q Q_ASSERT(engine); } -inline QScriptContextPrivate::QScriptContextPrivate(const AllocationType type, QScriptEnginePrivate *engine, const v8::Arguments *args, v8::Handle<v8::Value> callee, v8::Handle<v8::Object> customThisObject) - : m_allocation(type), q_ptr(this), engine(engine), arguments(args), accessorInfo(0), - context(type, v8::Context::NewFunctionContext()), - inheritedScope(type, v8::Context::GetCallerContext()), - parent(engine->setCurrentQSContext(this)), previous(0), m_thisObject(type, customThisObject), - m_callee(type, callee), hasArgumentGetter(false) -{ - Q_ASSERT(engine); - Q_ASSERT(parent); - context->Enter(); -} - inline QScriptContextPrivate::QScriptContextPrivate(const AllocationType type, QScriptEnginePrivate *engine, const v8::AccessorInfo *accessor) : m_allocation(type), q_ptr(this), engine(engine), arguments(0), accessorInfo(accessor), context(type, v8::Context::NewFunctionContext()), @@ -103,27 +91,6 @@ inline QScriptContextPrivate::QScriptContextPrivate(const AllocationType type, Q context->Enter(); } - -inline QScriptContextPrivate::QScriptContextPrivate(const AllocationType type, QScriptEnginePrivate *engine, v8::Local<v8::Context> context) - : m_allocation(type), q_ptr(this), engine(engine), arguments(0), accessorInfo(0), - context(type, context), - parent(engine->setCurrentQSContext(this)), - previous(0), hasArgumentGetter(false) -{ - Q_ASSERT(engine); - Q_ASSERT(parent); - context->Enter(); -} - -inline QScriptContextPrivate::QScriptContextPrivate(const AllocationType type, QScriptContextPrivate *parent, v8::Local<v8::StackFrame> frame) - : m_allocation(type), q_ptr(this), engine(parent->engine), arguments(0), accessorInfo(0), - parent(parent), previous(0), frame(type, frame), hasArgumentGetter(false) -{ - Q_ASSERT(engine); - Q_ASSERT(parent); -} - - inline QScriptContextPrivate::~QScriptContextPrivate() { Q_ASSERT(engine); diff --git a/src/script/api/qscriptcontext_p.h b/src/script/api/qscriptcontext_p.h index d9bd218..fb4fbed 100644 --- a/src/script/api/qscriptcontext_p.h +++ b/src/script/api/qscriptcontext_p.h @@ -54,14 +54,11 @@ class QScriptContextPrivate : public QScriptContext protected: enum AllocationType {HeapAllocation, StackAllocation}; inline QScriptContextPrivate(const AllocationType type, QScriptEnginePrivate *engine); // the global context (member of QScriptEnginePrivate) - inline QScriptContextPrivate(const AllocationType type, QScriptEnginePrivate *engine, const v8::Arguments *args, v8::Handle<v8::Value> callee = v8::Handle<v8::Value>(), v8::Handle<v8::Object> customThisObject = v8::Handle<v8::Object>()); // native function context (on the stack) + inline QScriptContextPrivate(const AllocationType type, QScriptEnginePrivate *engine, const v8::Arguments *args, v8::Local<v8::Value> callee = v8::Local<v8::Value>(), v8::Local<v8::Object> customThisObject = v8::Local<v8::Object>()); // native function context (on the stack) inline QScriptContextPrivate(const AllocationType type, QScriptEnginePrivate *engine, const v8::AccessorInfo *accessor); // native acessors (on the stack) inline QScriptContextPrivate(const AllocationType type, QScriptEnginePrivate *engine, v8::Handle<v8::Context> context); // from QScriptEngine::pushContext inline QScriptContextPrivate(const AllocationType type, QScriptContextPrivate *parent, v8::Handle<v8::StackFrame> frame); // internal, for js frame (allocated in parentContext()) - inline QScriptContextPrivate(const AllocationType type, QScriptEnginePrivate *engine, const v8::Arguments *args, v8::Local<v8::Value> callee = v8::Local<v8::Value>(), v8::Local<v8::Object> customThisObject = v8::Local<v8::Object>()); // native function context (on the stack) - inline QScriptContextPrivate(const AllocationType type, QScriptEnginePrivate *engine, v8::Local<v8::Context> context); // from QScriptEngine::pushContext - inline QScriptContextPrivate(const AllocationType type, QScriptContextPrivate *parent, v8::Local<v8::StackFrame> frame); // internal, for js frame (allocated in parentContext()) public: class Stack; class Heap; |