Commit 31427ffa authored by ggaren@apple.com's avatar ggaren@apple.com

Qt build fix: Updated for ArgList changes.

* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::QtRuntimeMetaMethod::call):
(JSC::Bindings::QtRuntimeConnectionMethod::call):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60399 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ca549372
2010-05-29 Geoffrey Garen <ggaren@apple.com>
Qt build fix: Updated for ArgList changes.
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::QtRuntimeMetaMethod::call):
(JSC::Bindings::QtRuntimeConnectionMethod::call):
2010-05-29 Geoffrey Garen <ggaren@apple.com>
Qt build fix: Updated for ArgList changes.
......
......@@ -1379,10 +1379,10 @@ void QtRuntimeMetaMethod::markChildren(MarkStack& markStack)
JSValue QtRuntimeMetaMethod::call(ExecState* exec)
{
QtRuntimeMetaMethodData* d = static_cast<QtRuntimeMetaMethod *>(functionObject)->d_func();
QtRuntimeMetaMethodData* d = static_cast<QtRuntimeMetaMethod *>(exec->callee())->d_func();
// We're limited to 10 args
if (args.size() > 10)
if (exec->argumentCount() > 10)
return jsUndefined();
// We have to pick a method that matches..
......@@ -1514,7 +1514,7 @@ QtRuntimeConnectionMethod::QtRuntimeConnectionMethod(ExecState* exec, const Iden
JSValue QtRuntimeConnectionMethod::call(ExecState* exec)
{
QtRuntimeConnectionMethodData* d = static_cast<QtRuntimeConnectionMethod *>(functionObject)->d_func();
QtRuntimeConnectionMethodData* d = static_cast<QtRuntimeConnectionMethod *>(exec->callee())->d_func();
JSLock lock(SilenceAssertionsOnly);
......@@ -1534,7 +1534,7 @@ JSValue QtRuntimeConnectionMethod::call(ExecState* exec)
signalIndex = findSignalIndex(sender->metaObject(), d->m_index, d->m_signature);
if (signalIndex != -1) {
if (args.size() == 1) {
if (exec->argumentCount() == 1) {
funcObject = args.at(0).toObject(exec);
CallData callData;
if (funcObject->getCallData(callData) == CallTypeNone) {
......@@ -1543,7 +1543,7 @@ JSValue QtRuntimeConnectionMethod::call(ExecState* exec)
else
return throwError(exec, TypeError, "QtMetaMethod.disconnect: target is not a function");
}
} else if (args.size() >= 2) {
} else if (exec->argumentCount() >= 2) {
if (args.at(0).isObject()) {
thisObject = args.at(0).toObject(exec);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment