- try to fix Qt build
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Mar 2008 00:48:25 +0000 (00:48 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Mar 2008 00:48:25 +0000 (00:48 +0000)
        * bridge/qt/qt_runtime.cpp:
        (KJS::Bindings::convertQVariantToValue): Change KJS::UChar to UChar.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/bridge/qt/qt_runtime.cpp

index e123669..c0d43af 100644 (file)
@@ -1,5 +1,12 @@
 2008-03-10  Darin Adler  <darin@apple.com>
 
+        - try to fix Qt build
+
+        * bridge/qt/qt_runtime.cpp:
+        (KJS::Bindings::convertQVariantToValue): Change KJS::UChar to UChar.
+
+2008-03-10  Darin Adler  <darin@apple.com>
+
         Reviewed by Antti.
 
         - fix <rdar://problem/3059610> VIP: links opened in new frame, window, or tab
index 113f0c5..f1513c8 100644 (file)
@@ -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);
@@ -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);
 }