Changeset 30942 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

Timestamp:

Mar 10, 2008, 3:06:44 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Remove KJS::UChar, use ::UChar instead
​http://bugs.webkit.org/show_bug.cgi?id=17017

To functional changes, thus no tests.

• bindings/js/JSCSSStyleDeclarationCustom.cpp: (WebCore::hasCSSPropertyNamePrefix): (WebCore::cssPropertyName):
• bindings/js/JSDOMWindowBase.cpp: (WebCore::windowProtoFuncAToB): (WebCore::windowProtoFuncBToA):
• bindings/js/JSSVGPODTypeWrapper.h:
• bindings/js/kjs_proxy.cpp: (WebCore::KJSProxy::evaluate):
• bridge/objc/objc_utility.mm: (KJS::Bindings::throwError):
• dom/Document.cpp: (WebCore::Document::parseQualifiedName):
• platform/text/AtomicString.cpp: (WebCore::AtomicString::add):
• platform/text/String.cpp: (WebCore::String::String): (WebCore::String::operator Identifier): (WebCore::String::operator UString):
• platform/text/TextCodecICU.cpp: (WebCore::TextCodecICU::decode):
• svg/SVGAnimatedTemplate.h:

File:

• trunk/JavaScriptCore/kjs/string_object.cpp (modified) (11 diffs)

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -246 +246 @@
         break;
 
-    unsigned short ref = substitutedReplacement[i+1].unicode();
+    unsigned short ref = substitutedReplacement[i+1];
     int backrefStart = 0;
     int backrefLength = 0;
@@ -269 +269 @@
             continue;
         if (substitutedReplacement.size() > i + 2) {
-            ref = substitutedReplacement[i+2].unicode();
+            ref = substitutedReplacement[i+2];
             if (ref >= '0' && ref <= '9') {
                 backrefIndex = 10 * backrefIndex + ref - '0';
@@ -451 +451 @@
     double dpos = a0->toInteger(exec);
     if (dpos >= 0 && dpos < len)
-      result = jsNumber(s[static_cast<int>(dpos)].unicode());
+      result = jsNumber(s[static_cast<int>(dpos)]);
     else
       result = jsNaN();
@@ -764 +764 @@
     if (!ssize)
         return sVal;
-    Vector< ::UChar> buffer(ssize);
+    Vector<UChar> buffer(ssize);
     bool error;
-    int length = Unicode::toLower(buffer.data(), ssize, reinterpret_cast<const ::UChar*>(s.data()), ssize, &error);
+    int length = Unicode::toLower(buffer.data(), ssize, reinterpret_cast<const UChar*>(s.data()), ssize, &error);
     if (error) {
         buffer.resize(length);
-        length = Unicode::toLower(buffer.data(), length, reinterpret_cast<const ::UChar*>(s.data()), ssize, &error);
+        length = Unicode::toLower(buffer.data(), length, reinterpret_cast<const UChar*>(s.data()), ssize, &error);
         if (error)
             return sVal;
@@ -775 +775 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(UString(reinterpret_cast<UChar*>(buffer.releaseBuffer()), length, false));
+    return jsString(UString(buffer.releaseBuffer(), length, false));
 }
 
@@ -789 +789 @@
     if (!ssize)
         return sVal;
-    Vector< ::UChar> buffer(ssize);
+    Vector<UChar> buffer(ssize);
     bool error;
-    int length = Unicode::toUpper(buffer.data(), ssize, reinterpret_cast<const ::UChar*>(s.data()), ssize, &error);
+    int length = Unicode::toUpper(buffer.data(), ssize, reinterpret_cast<const UChar*>(s.data()), ssize, &error);
     if (error) {
         buffer.resize(length);
-        length = Unicode::toUpper(buffer.data(), length, reinterpret_cast<const ::UChar*>(s.data()), ssize, &error);
+        length = Unicode::toUpper(buffer.data(), length, reinterpret_cast<const UChar*>(s.data()), ssize, &error);
         if (error)
             return sVal;
@@ -800 +800 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(UString(reinterpret_cast<UChar*>(buffer.releaseBuffer()), length, false));
+    return jsString(UString(buffer.releaseBuffer(), length, false));
 }
 
@@ -815 +815 @@
     if (!ssize)
         return sVal;
-    Vector< ::UChar> buffer(ssize);
+    Vector<UChar> buffer(ssize);
     bool error;
-    int length = Unicode::toLower(buffer.data(), ssize, reinterpret_cast<const ::UChar*>(s.data()), ssize, &error);
+    int length = Unicode::toLower(buffer.data(), ssize, reinterpret_cast<const UChar*>(s.data()), ssize, &error);
     if (error) {
         buffer.resize(length);
-        length = Unicode::toLower(buffer.data(), length, reinterpret_cast<const ::UChar*>(s.data()), ssize, &error);
+        length = Unicode::toLower(buffer.data(), length, reinterpret_cast<const UChar*>(s.data()), ssize, &error);
         if (error)
             return sVal;
@@ -826 +826 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(UString(reinterpret_cast<UChar*>(buffer.releaseBuffer()), length, false));
+    return jsString(UString(buffer.releaseBuffer(), length, false));
 }
 
@@ -840 +840 @@
     if (!ssize)
         return sVal;
-    Vector< ::UChar> buffer(ssize);
+    Vector<UChar> buffer(ssize);
     bool error;
-    int length = Unicode::toUpper(buffer.data(), ssize, reinterpret_cast<const ::UChar*>(s.data()), ssize, &error);
+    int length = Unicode::toUpper(buffer.data(), ssize, reinterpret_cast<const UChar*>(s.data()), ssize, &error);
     if (error) {
         buffer.resize(length);
-        length = Unicode::toUpper(buffer.data(), length, reinterpret_cast<const ::UChar*>(s.data()), ssize, &error);
+        length = Unicode::toUpper(buffer.data(), length, reinterpret_cast<const UChar*>(s.data()), ssize, &error);
         if (error)
             return sVal;
@@ -851 +851 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(UString(reinterpret_cast<UChar*>(buffer.releaseBuffer()), length, false));
+    return jsString(UString(buffer.releaseBuffer(), length, false));
 }