diff options
Diffstat (limited to 'WebCore/bridge/qt/qt_runtime.cpp')
| -rw-r--r-- | WebCore/bridge/qt/qt_runtime.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/WebCore/bridge/qt/qt_runtime.cpp b/WebCore/bridge/qt/qt_runtime.cpp index b9cf4b0..6881c2e 100644 --- a/WebCore/bridge/qt/qt_runtime.cpp +++ b/WebCore/bridge/qt/qt_runtime.cpp @@ -310,7 +310,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()->characters() : 0)); + ret = QVariant(QChar(str.length() ? *(const ushort*)str.impl()->characters() : 0)); if (type == String) dist = 3; else @@ -325,7 +325,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type return QString(); } else { UString ustring = value.toString(exec); - ret = QVariant(QString((const QChar*)ustring.rep()->characters(), ustring.size())); + ret = QVariant(QString((const QChar*)ustring.impl()->characters(), ustring.length())); if (type == String) dist = 0; else @@ -349,7 +349,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type QVariant v = convertValueToQVariant(exec, val, QMetaType::Void, &objdist, visitedObjects, recursionLimit); if (objdist >= 0) { UString ustring = (*it).ustring(); - QString id = QString((const QChar*)ustring.rep()->characters(), ustring.size()); + QString id = QString((const QChar*)ustring.impl()->characters(), ustring.length()); result.insert(id, v); } } @@ -424,7 +424,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()->characters(), ustring.size()); + QString qstring = QString((const QChar*)ustring.impl()->characters(), ustring.length()); result.append(qstring); } @@ -438,7 +438,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()->characters(), ustring.size()); + QString qstring = QString((const QChar*)ustring.impl()->characters(), ustring.length()); result.append(qstring); } @@ -447,7 +447,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()->characters(), ustring.size()); + QString qstring = QString((const QChar*)ustring.impl()->characters(), ustring.length()); QStringList result; result.append(qstring); ret = QVariant(result); @@ -463,7 +463,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type dist = 0; } else { UString ustring = value.toString(exec); - ret = QVariant(QString((const QChar*)ustring.rep()->characters(), ustring.size()).toLatin1()); + ret = QVariant(QString((const QChar*)ustring.impl()->characters(), ustring.length()).toLatin1()); if (type == String) dist = 5; else @@ -503,9 +503,10 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type ret = QTime(gdt.hour, gdt.minute, gdt.second); dist = 10; } +#ifndef QT_NO_DATESTRING } else if (type == String) { UString ustring = value.toString(exec); - QString qstring = QString((const QChar*)ustring.rep()->characters(), ustring.size()); + QString qstring = QString((const QChar*)ustring.impl()->characters(), ustring.length()); if (hint == QMetaType::QDateTime) { QDateTime dt = QDateTime::fromString(qstring, Qt::ISODate); @@ -544,6 +545,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type dist = 3; } } +#endif // QT_NO_DATESTRING } break; @@ -554,7 +556,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()->characters(), ustring.size()); + QString qstring = QString((const QChar*)ustring.impl()->characters(), ustring.length()); // this is of the form '/xxxxxx/i' int firstSlash = qstring.indexOf(QLatin1Char('/')); @@ -574,7 +576,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()->characters(), ustring.size()); + QString qstring = QString((const QChar*)ustring.impl()->characters(), ustring.length()); QRegExp re(qstring); if (re.isValid()) { |