Still more tweaks to renaming.
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Mar 2006 09:21:47 +0000 (09:21 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Mar 2006 09:21:47 +0000 (09:21 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13188 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/Scripts/do-webcore-rename

index 6ad4468f007bd84e7ebacee3fe566e575ad7b646..949225dea17deb0517ab6ac5050af07a10804374 100755 (executable)
@@ -155,11 +155,12 @@ my %otherRenames = (
     "QValueListConstIterator" => "DeprecatedValueListConstIterator",
     "QValueListIterator" => "DeprecatedValueListIterator",
     "QValueListNode" => "DeprecatedValueListNode",
-    "KWQRenderTreeDebug" => "RenderTreeTextForm",
-    "QRegExp" => "Regexp",
-    "KWQRegExp" => "Regexp",
+    "KWQRenderTreeDebug" => "RenderTreeAsText",
+    "QRegExp" => "RegularExpression",
+    "KWQRegExp" => "RegularExpression",
     "KJavaAppletWidget" => "JavaAppletWidget",
     "KWQKJavaAppletWidget" => "JavaAppletWidget",
+    "uint" => "unsigned",
 );
 
 # rename most files with names ending in Impl
@@ -195,10 +196,14 @@ for my $file (sort @paths) {
     }
     my $newContents = $contents;
 
-    # fix DOM and khtml namespaces
+    # fix namespace names
     $newContents =~ s/\bDOM::/WebCore::/g;
+    $newContents =~ s/\bKDOM::/WebCore::/g;
+    $newContents =~ s/\bKSVG::/WebCore::/g;
     $newContents =~ s/\bkhtml::/WebCore::/g;
     $newContents =~ s/namespace DOM\b/namespace WebCore/g;
+    $newContents =~ s/namespace KDOM\b/namespace WebCore/g;
+    $newContents =~ s/namespace KSVG\b/namespace WebCore/g;
     $newContents =~ s/namespace khtml\b/namespace WebCore/g;
 
     if ($file !~ /\.(pm|idl)$/) {
@@ -217,7 +222,8 @@ for my $file (sort @paths) {
         $newContents =~ s/\#\#Event_/\#\#Event/g;
     }
 
-    # remove bogus friend declaration
+    # remove some bogus stuff
+    $newContents =~ s/typedef unsigned unsigned;\n//;
     $newContents =~ s/friend class HTMLFormElement;\s*\n\s*(friend class HTMLFormCollection)/$1/;
 
     # fix binding code generation