Commit 1405f8a0 authored by ggaren@apple.com's avatar ggaren@apple.com

Qt build fix: Updated for ArgList changes.

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



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60400 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 31427ffa
2010-05-29 Geoffrey Garen <ggaren@apple.com>
Qt build fix: Updated for ArgList changes.
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::QtRuntimeConnectionMethod::call):
2010-05-29 Geoffrey Garen <ggaren@apple.com>
Qt build fix: Updated for ArgList changes.
......
......@@ -1535,7 +1535,7 @@ JSValue QtRuntimeConnectionMethod::call(ExecState* exec)
if (signalIndex != -1) {
if (exec->argumentCount() == 1) {
funcObject = args.at(0).toObject(exec);
funcObject = exec->argument(0).toObject(exec);
CallData callData;
if (funcObject->getCallData(callData) == CallTypeNone) {
if (d->m_isConnect)
......@@ -1544,18 +1544,18 @@ JSValue QtRuntimeConnectionMethod::call(ExecState* exec)
return throwError(exec, TypeError, "QtMetaMethod.disconnect: target is not a function");
}
} else if (exec->argumentCount() >= 2) {
if (args.at(0).isObject()) {
thisObject = args.at(0).toObject(exec);
if (exec->argument(0).isObject()) {
thisObject = exec->argument(0).toObject(exec);
// Get the actual function to call
JSObject *asObj = args.at(1).toObject(exec);
JSObject *asObj = exec->argument(1).toObject(exec);
CallData callData;
if (asObj->getCallData(callData) != CallTypeNone) {
// Function version
funcObject = asObj;
} else {
// Convert it to a string
UString funcName = args.at(1).toString(exec);
UString funcName = exec->argument(1).toString(exec);
Identifier funcIdent(exec, funcName);
// ### DropAllLocks
......
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