A couple more fixes for things found during dry runs.

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

diff --git a/WebKitTools/Scripts/do-webcore-rename b/WebKitTools/Scripts/do-webcore-rename
index 73dbfc9bf486785984b261a27135492dab005e3e..b6cd490f4a382d9028692331f49ee2e29e4aeeac 100755 (executable)
--- a/WebKitTools/Scripts/do-webcore-rename
+++ b/WebKitTools/Scripts/do-webcore-rename
@@ -227,19 +227,19 @@ for my $file (sort @paths) {
     $newContents =~ s/namespace KSVG\b/namespace WebCore/g;
     $newContents =~ s/namespace khtml\b/namespace WebCore/g;
 
-    if ($file !~ /\.(pm|idl)$/) {
+    if ($file !~ /\.idl$/) {
         for my $from (keys %otherRenames) {
-            my $to = $otherRenames{$from};
-            $newContents =~ s/\b$from\b/$to/g;
-            $newContents =~ s/"$to"/"$from"/g;
+            $newContents =~ s/(?<!["\w])$from(?!["\w])/$otherRenames{$from}/g;
         }
         $newContents =~ s/\#\#Event_/\#\#Event/g;
 
-        # fix DOMString and QString
-        $newContents =~ s/\#define DOMStringImpl StringImpl\n//;
-        $newContents =~ s/\bDOMString\b/String/g;
-        $newContents =~ s/\bDOMStringImpl\b/StringImpl/g;
-        $newContents =~ s/\#define String String\n/#define DOMString String\n#define QString DeprecatedString\n/;
+        if ($file !~ /\.pm$/) {
+            # fix DOMString and QString
+            $newContents =~ s/\#define DOMStringImpl StringImpl\n//;
+            $newContents =~ s/\bDOMString\b/String/g;
+            $newContents =~ s/\bDOMStringImpl\b/StringImpl/g;
+            $newContents =~ s/\#define String String\n/#define DOMString String\n#define QString DeprecatedString\n/;
+        }
     }
 
     # remove some bogus stuff