Commit 05604217 authored by hausmann@webkit.org's avatar hausmann@webkit.org

Fix the Qt build

git-svn-id: svn://svn.chromium.org/blink/trunk@42993 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 01f1fefc
2009-04-28 Simon Hausmann <simon.hausmann@nokia.com>
Fix the Qt build.
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::findMethodIndex): Removed exec param from at() call.
(JSC::Bindings::QtRuntimeConnectionMethod::call): Ditto.
2009-04-28 Geoffrey Garen <ggaren@apple.com> 2009-04-28 Geoffrey Garen <ggaren@apple.com>
Rubber stamped by Beth Dakin. Rubber stamped by Beth Dakin.
...@@ -1181,7 +1181,7 @@ static int findMethodIndex(ExecState* exec, ...@@ -1181,7 +1181,7 @@ static int findMethodIndex(ExecState* exec,
bool converted = true; bool converted = true;
int matchDistance = 0; int matchDistance = 0;
for (int i = 0; converted && i < types.count() - 1; ++i) { for (int i = 0; converted && i < types.count() - 1; ++i) {
JSValuePtr arg = i < jsArgs.size() ? jsArgs.at(exec, i) : jsUndefined(); JSValuePtr arg = i < jsArgs.size() ? jsArgs.at(i) : jsUndefined();
int argdistance = -1; int argdistance = -1;
QVariant v = convertValueToQVariant(exec, arg, types.at(i+1).typeId(), &argdistance); QVariant v = convertValueToQVariant(exec, arg, types.at(i+1).typeId(), &argdistance);
...@@ -1454,7 +1454,7 @@ JSValuePtr QtRuntimeConnectionMethod::call(ExecState* exec, JSObject* functionOb ...@@ -1454,7 +1454,7 @@ JSValuePtr QtRuntimeConnectionMethod::call(ExecState* exec, JSObject* functionOb
if (signalIndex != -1) { if (signalIndex != -1) {
if (args.size() == 1) { if (args.size() == 1) {
funcObject = args.at(exec, 0).toObject(exec); funcObject = args.at(0).toObject(exec);
CallData callData; CallData callData;
if (funcObject->getCallData(callData) == CallTypeNone) { if (funcObject->getCallData(callData) == CallTypeNone) {
if (d->m_isConnect) if (d->m_isConnect)
...@@ -1463,18 +1463,18 @@ JSValuePtr QtRuntimeConnectionMethod::call(ExecState* exec, JSObject* functionOb ...@@ -1463,18 +1463,18 @@ JSValuePtr QtRuntimeConnectionMethod::call(ExecState* exec, JSObject* functionOb
return throwError(exec, TypeError, "QtMetaMethod.disconnect: target is not a function"); return throwError(exec, TypeError, "QtMetaMethod.disconnect: target is not a function");
} }
} else if (args.size() >= 2) { } else if (args.size() >= 2) {
if (args.at(exec, 0).isObject()) { if (args.at(0).isObject()) {
thisObject = args.at(exec, 0).toObject(exec); thisObject = args.at(0).toObject(exec);
// Get the actual function to call // Get the actual function to call
JSObject *asObj = args.at(exec, 1).toObject(exec); JSObject *asObj = args.at(1).toObject(exec);
CallData callData; CallData callData;
if (asObj->getCallData(callData) != CallTypeNone) { if (asObj->getCallData(callData) != CallTypeNone) {
// Function version // Function version
funcObject = asObj; funcObject = asObj;
} else { } else {
// Convert it to a string // Convert it to a string
UString funcName = args.at(exec, 1).toString(exec); UString funcName = args.at(1).toString(exec);
Identifier funcIdent(exec, funcName); Identifier funcIdent(exec, funcName);
// ### DropAllLocks // ### 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