Commit 03a7e59a authored by rniwa@webkit.org's avatar rniwa@webkit.org

2010-10-25 Ryosuke Niwa <rniwa@webkit.org>

        Unreviewed Qt build fix for r70496.

        * bridge/qt/qt_instance.cpp:
        (JSC::Bindings::QtInstance::numberValue):
        * bridge/qt/qt_pixmapruntime.cpp:
        (JSC::Bindings::QtPixmapWidthField::valueFromInstance):
        (JSC::Bindings::QtPixmapHeightField::valueFromInstance):
        * bridge/qt/qt_runtime.cpp:
        (JSC::Bindings::convertValueToQVariant):
        (JSC::Bindings::convertQVariantToValue):
        (JSC::Bindings::QtRuntimeMetaMethod::lengthGetter):
        (JSC::Bindings::QtRuntimeConnectionMethod::lengthGetter):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70503 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d9682e9e
2010-10-25 Ryosuke Niwa <rniwa@webkit.org>
Unreviewed Qt build fix for r70496.
* bridge/qt/qt_instance.cpp:
(JSC::Bindings::QtInstance::numberValue):
* bridge/qt/qt_pixmapruntime.cpp:
(JSC::Bindings::QtPixmapWidthField::valueFromInstance):
(JSC::Bindings::QtPixmapHeightField::valueFromInstance):
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::convertValueToQVariant):
(JSC::Bindings::convertQVariantToValue):
(JSC::Bindings::QtRuntimeMetaMethod::lengthGetter):
(JSC::Bindings::QtRuntimeConnectionMethod::lengthGetter):
2010-10-25 Andy Estes <aestes@apple.com>
Reviewed by Simon Fraser.
......@@ -306,9 +306,9 @@ JSValue QtInstance::stringValue(ExecState* exec) const
return jsString(exec, buf.constData());
}
JSValue QtInstance::numberValue(ExecState* exec) const
JSValue QtInstance::numberValue(ExecState*) const
{
return jsNumber(exec, 0);
return jsNumber(0);
}
JSValue QtInstance::booleanValue() const
......
......@@ -51,9 +51,9 @@ public:
class QtPixmapWidthField : public Field {
public:
static const char* name() { return "width"; }
virtual JSValue valueFromInstance(ExecState* exec, const Instance* instance) const
virtual JSValue valueFromInstance(ExecState*, const Instance* instance) const
{
return jsNumber(exec, static_cast<const QtPixmapInstance*>(instance)->width());
return jsNumber(static_cast<const QtPixmapInstance*>(instance)->width());
}
virtual void setValueToInstance(ExecState*, const Instance*, JSValue) const {}
};
......@@ -61,9 +61,9 @@ public:
class QtPixmapHeightField : public Field {
public:
static const char* name() { return "height"; }
virtual JSValue valueFromInstance(ExecState* exec, const Instance* instance) const
virtual JSValue valueFromInstance(ExecState*, const Instance* instance) const
{
return jsNumber(exec, static_cast<const QtPixmapInstance*>(instance)->height());
return jsNumber(static_cast<const QtPixmapInstance*>(instance)->height());
}
virtual void setValueToInstance(ExecState*, const Instance*, JSValue) const {}
};
......
......@@ -179,7 +179,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type
}
// check magic pointer values before dereferencing value
if (value == jsNaN(exec)
if (value == jsNaN()
|| (value == jsUndefined()
&& hint != QMetaType::QString
&& hint != (QMetaType::Type) qMetaTypeId<QVariant>())) {
......@@ -816,7 +816,7 @@ JSValue convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, con
type == QMetaType::UShort ||
type == QMetaType::Float ||
type == QMetaType::Double)
return jsNumber(exec, variant.toDouble());
return jsNumber(variant.toDouble());
if (type == QMetaType::QRegExp) {
QRegExp re = variant.value<QRegExp>();
......@@ -1477,10 +1477,10 @@ void QtRuntimeMetaMethod::getOwnPropertyNames(ExecState* exec, PropertyNameArray
QtRuntimeMethod::getOwnPropertyNames(exec, propertyNames, mode);
}
JSValue QtRuntimeMetaMethod::lengthGetter(ExecState* exec, JSValue, const Identifier&)
JSValue QtRuntimeMetaMethod::lengthGetter(ExecState*, JSValue, const Identifier&)
{
// QtScript always returns 0
return jsNumber(exec, 0);
return jsNumber(0);
}
JSValue QtRuntimeMetaMethod::connectGetter(ExecState* exec, JSValue slotBase, const Identifier& ident)
......@@ -1683,10 +1683,10 @@ void QtRuntimeConnectionMethod::getOwnPropertyNames(ExecState* exec, PropertyNam
QtRuntimeMethod::getOwnPropertyNames(exec, propertyNames, mode);
}
JSValue QtRuntimeConnectionMethod::lengthGetter(ExecState* exec, JSValue, const Identifier&)
JSValue QtRuntimeConnectionMethod::lengthGetter(ExecState*, JSValue, const Identifier&)
{
// we have one formal argument, and one optional
return jsNumber(exec, 1);
return jsNumber(1);
}
// ===============
......
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