diff options
Diffstat (limited to 'WebCore/bridge/qt/qt_runtime.cpp')
| -rw-r--r-- | WebCore/bridge/qt/qt_runtime.cpp | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/WebCore/bridge/qt/qt_runtime.cpp b/WebCore/bridge/qt/qt_runtime.cpp index ada9f01..40ff6a1 100644 --- a/WebCore/bridge/qt/qt_runtime.cpp +++ b/WebCore/bridge/qt/qt_runtime.cpp @@ -154,7 +154,7 @@ static JSRealType valueRealType(ExecState* exec, JSValue val) return Date; else if (object->inherits(&RegExpObject::info)) return RegExp; - else if (object->inherits(&RuntimeObjectImp::s_info)) + else if (object->inherits(&RuntimeObject::s_info)) return QObj; return Object; } @@ -308,7 +308,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type dist = 6; } else { UString str = value.toString(exec); - ret = QVariant(QChar(str.size() ? *(const ushort*)str.rep()->data() : 0)); + ret = QVariant(QChar(str.size() ? *(const ushort*)str.rep()->characters() : 0)); if (type == String) dist = 3; else @@ -323,7 +323,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type return QString(); } else { UString ustring = value.toString(exec); - ret = QVariant(QString((const QChar*)ustring.rep()->data(), ustring.size())); + ret = QVariant(QString((const QChar*)ustring.rep()->characters(), ustring.size())); if (type == String) dist = 0; else @@ -332,7 +332,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type break; } - case QMetaType::QVariantMap: + case QMetaType::QVariantMap: if (type == Object || type == Array || type == RTArray) { // Enumerate the contents of the object PropertyNameArray properties(exec); @@ -347,7 +347,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type QVariant v = convertValueToQVariant(exec, val, QMetaType::Void, &objdist, visitedObjects); if (objdist >= 0) { UString ustring = (*it).ustring(); - QString id = QString((const QChar*)ustring.rep()->data(), ustring.size()); + QString id = QString((const QChar*)ustring.rep()->characters(), ustring.size()); result.insert(id, v); } } @@ -422,7 +422,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type for (int i = 0; i < len; ++i) { JSValue val = rtarray->getConcreteArray()->valueAt(exec, i); UString ustring = val.toString(exec); - QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size()); + QString qstring = QString((const QChar*)ustring.rep()->characters(), ustring.size()); result.append(qstring); } @@ -436,7 +436,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type for (int i = 0; i < len; ++i) { JSValue val = array->get(exec, i); UString ustring = val.toString(exec); - QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size()); + QString qstring = QString((const QChar*)ustring.rep()->characters(), ustring.size()); result.append(qstring); } @@ -445,7 +445,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type } else { // Make a single length array UString ustring = value.toString(exec); - QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size()); + QString qstring = QString((const QChar*)ustring.rep()->characters(), ustring.size()); QStringList result; result.append(qstring); ret = QVariant(result); @@ -461,7 +461,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type dist = 0; } else { UString ustring = value.toString(exec); - ret = QVariant(QString((const QChar*)ustring.rep()->data(), ustring.size()).toLatin1()); + ret = QVariant(QString((const QChar*)ustring.rep()->characters(), ustring.size()).toLatin1()); if (type == String) dist = 5; else @@ -503,7 +503,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type } } else if (type == String) { UString ustring = value.toString(exec); - QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size()); + QString qstring = QString((const QChar*)ustring.rep()->characters(), ustring.size()); if (hint == QMetaType::QDateTime) { QDateTime dt = QDateTime::fromString(qstring, Qt::ISODate); @@ -552,7 +552,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type */ // Attempt to convert.. a bit risky UString ustring = value.toString(exec); - QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size()); + QString qstring = QString((const QChar*)ustring.rep()->characters(), ustring.size()); // this is of the form '/xxxxxx/i' int firstSlash = qstring.indexOf(QLatin1Char('/')); @@ -572,7 +572,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type } } else if (type == String) { UString ustring = value.toString(exec); - QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size()); + QString qstring = QString((const QChar*)ustring.rep()->characters(), ustring.size()); QRegExp re(qstring); if (re.isValid()) { @@ -871,6 +871,8 @@ JSValue convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, con if (type == QMetaType::QObjectStar || type == QMetaType::QWidgetStar) { QObject* obj = variant.value<QObject*>(); + if (!obj) + return jsNull(); return QtInstance::getQtInstance(obj, root, QScriptEngine::QtOwnership)->createRuntimeObject(exec); } @@ -1471,15 +1473,15 @@ void QtRuntimeMetaMethod::getOwnPropertyNames(ExecState* exec, PropertyNameArray QtRuntimeMethod::getOwnPropertyNames(exec, propertyNames, mode); } -JSValue QtRuntimeMetaMethod::lengthGetter(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue QtRuntimeMetaMethod::lengthGetter(ExecState* exec, JSValue, const Identifier&) { // QtScript always returns 0 return jsNumber(exec, 0); } -JSValue QtRuntimeMetaMethod::connectGetter(ExecState* exec, const Identifier& ident, const PropertySlot& slot) +JSValue QtRuntimeMetaMethod::connectGetter(ExecState* exec, JSValue slotBase, const Identifier& ident) { - QtRuntimeMetaMethod* thisObj = static_cast<QtRuntimeMetaMethod*>(asObject(slot.slotBase())); + QtRuntimeMetaMethod* thisObj = static_cast<QtRuntimeMetaMethod*>(asObject(slotBase)); QW_DS(QtRuntimeMetaMethod, thisObj); if (!d->m_connect) @@ -1487,9 +1489,9 @@ JSValue QtRuntimeMetaMethod::connectGetter(ExecState* exec, const Identifier& id return d->m_connect; } -JSValue QtRuntimeMetaMethod::disconnectGetter(ExecState* exec, const Identifier& ident, const PropertySlot& slot) +JSValue QtRuntimeMetaMethod::disconnectGetter(ExecState* exec, JSValue slotBase, const Identifier& ident) { - QtRuntimeMetaMethod* thisObj = static_cast<QtRuntimeMetaMethod*>(asObject(slot.slotBase())); + QtRuntimeMetaMethod* thisObj = static_cast<QtRuntimeMetaMethod*>(asObject(slotBase)); QW_DS(QtRuntimeMetaMethod, thisObj); if (!d->m_disconnect) @@ -1677,7 +1679,7 @@ void QtRuntimeConnectionMethod::getOwnPropertyNames(ExecState* exec, PropertyNam QtRuntimeMethod::getOwnPropertyNames(exec, propertyNames, mode); } -JSValue QtRuntimeConnectionMethod::lengthGetter(ExecState* exec, const Identifier&, const PropertySlot&) +JSValue QtRuntimeConnectionMethod::lengthGetter(ExecState* exec, JSValue, const Identifier&) { // we have one formal argument, and one optional return jsNumber(exec, 1); |