Fix the Qt build.
[WebKit-https.git] / WebCore / bridge / qt / qt_runtime.cpp
index 113f0c5..c53084e 100644 (file)
@@ -104,7 +104,7 @@ static JSRealType valueRealType(ExecState* exec, JSValue* val)
             return Date;
         else if (object->inherits(&RegExpImp::info))
             return RegExp;
-        else if (object->inherits(&RuntimeObjectImp::info))
+        else if (object->inherits(&RuntimeObjectImp::s_info))
             return QObj;
         return Object;
     }
@@ -636,7 +636,7 @@ JSValue* convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, co
 
             if (re.caseSensitivity() == Qt::CaseInsensitive)
                 uflags = "i"; // ### Can't do g or m
-            UString ustring((KJS::UChar*)re.pattern().utf16(), re.pattern().length());
+            UString ustring((UChar*)re.pattern().utf16(), re.pattern().length());
             args.append(jsString(ustring));
             args.append(jsString(uflags));
             return regExpObj->construct(exec, args);
@@ -681,7 +681,7 @@ JSValue* convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, co
 
     if (type == QMetaType::QObjectStar || type == QMetaType::QWidgetStar) {
         QObject* obj = variant.value<QObject*>();
-        return Instance::createRuntimeObject(Instance::QtLanguage, obj, root);
+        return Instance::createRuntimeObject(QtInstance::create(obj, root));
     }
 
     if (type == QMetaType::QVariantMap) {
@@ -725,7 +725,7 @@ JSValue* convertQVariantToValue(ExecState* exec, PassRefPtr<RootObject> root, co
     qConvDebug() << "fallback path for" << variant << variant.userType();
 
     QString string = variant.toString();
-    UString ustring((KJS::UChar*)string.utf16(), string.length());
+    UString ustring((UChar*)string.utf16(), string.length());
     return jsString(ustring);
 }
 
@@ -1514,7 +1514,7 @@ void QtConnectionObject::execute(void **argv)
                     if (m_funcObject->inherits(&FunctionImp::info)) {
                         FunctionImp* fimp = static_cast<FunctionImp*>(m_funcObject.get());
 
-                        JSObject* qt_sender = Instance::createRuntimeObject(Instance::QtLanguage, sender(), ro);
+                        JSObject* qt_sender = Instance::createRuntimeObject(QtInstance::create(sender(), ro));
                         JSObject* wrapper = new JSObject();
                         wrapper->put(exec, "__qt_sender__", qt_sender);
                         ScopeChain oldsc = fimp->scope();