Commit e89ec251 authored by barraclough@apple.com's avatar barraclough@apple.com
Browse files

* bridge/qt/qt_runtime.cpp:

(JSC::Bindings::findMethodIndex):
(JSC::Bindings::QtRuntimeMetaMethod::call):
(JSC::Bindings::QtRuntimeConnectionMethod::call):

Reviewed by NOBODY (Qt build fix pt 2).



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60765 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f912277e
2010-06-06 Gavin Barraclough <barraclough@apple.com>
Reviewed by NOBODY (Qt build fix pt 2).
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::findMethodIndex):
(JSC::Bindings::QtRuntimeMetaMethod::call):
(JSC::Bindings::QtRuntimeConnectionMethod::call):
2010-06-06 Gavin Barraclough <barraclough@apple.com> 2010-06-06 Gavin Barraclough <barraclough@apple.com>
Reviewed by NOBODY (Qt build fix). Reviewed by NOBODY (Qt build fix).
......
...@@ -360,7 +360,7 @@ JSValue QtField::valueFromInstance(ExecState* exec, const Instance* inst) const ...@@ -360,7 +360,7 @@ JSValue QtField::valueFromInstance(ExecState* exec, const Instance* inst) const
return convertQVariantToValue(exec, inst->rootObject(), val); return convertQVariantToValue(exec, inst->rootObject(), val);
} }
QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name())); QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name()));
return throwError(exec, GeneralError, msg.toLatin1().constData()); return throwError(exec, createError(exec, msg.toLatin1().constData()));
} }
void QtField::setValueToInstance(ExecState* exec, const Instance* inst, JSValue aValue) const void QtField::setValueToInstance(ExecState* exec, const Instance* inst, JSValue aValue) const
...@@ -387,7 +387,7 @@ void QtField::setValueToInstance(ExecState* exec, const Instance* inst, JSValue ...@@ -387,7 +387,7 @@ void QtField::setValueToInstance(ExecState* exec, const Instance* inst, JSValue
#endif #endif
} else { } else {
QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name())); QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name()));
throwError(exec, GeneralError, msg.toLatin1().constData()); throwError(exec, createError(exec, msg.toLatin1().constData()));
} }
} }
......
...@@ -1567,9 +1567,9 @@ EncodedJSValue QtRuntimeConnectionMethod::call(ExecState* exec) ...@@ -1567,9 +1567,9 @@ EncodedJSValue QtRuntimeConnectionMethod::call(ExecState* exec)
funcObject = asFuncObj; funcObject = asFuncObj;
} else { } else {
if (d->m_isConnect) if (d->m_isConnect)
return throwError(exec, createTypeError(exec, "QtMetaMethod.connect: target is not a function")); return throwVMError(exec, createTypeError(exec, "QtMetaMethod.connect: target is not a function"));
else else
return throwError(exec, createTypeError(exec, "QtMetaMethod.disconnect: target is not a function")); return throwVMError(exec, createTypeError(exec, "QtMetaMethod.disconnect: target is not a function"));
} }
} }
} else { } else {
......
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