Changeset 13385 in webkit


Ignore:
Timestamp:
Mar 18, 2006 10:31:21 PM (18 years ago)
Author:
darin
Message:

Did another dry run of the renaming and had to fix a couple of things.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/Scripts/do-webcore-rename

    r13373 r13385  
    201201        my $newFile = $newFile{$file};
    202202        print "Renaming $file to $newFile\n";
    203         system "mv $file $newFile"; # use svn move when "doing the real thing"
     203        system "svn move $file $newFile";
    204204    }
    205205}
     
    229229
    230230    if ($file !~ /\.(pm|idl)$/) {
    231         # fix DOMString
    232         $newContents =~ s/\#define DOMStringImpl StringImpl\n//;
    233         $newContents =~ s/\bDOMString\b/String/g;
    234         $newContents =~ s/\bDOMStringImpl\b/StringImpl/g;
    235         $newContents =~ s/\#define String String/#define DOMString String/;
    236 
    237         # fix other identifiers that would collide otherwise
    238231        for my $from (keys %otherRenames) {
    239232            my $to = $otherRenames{$from};
     
    242235        }
    243236        $newContents =~ s/\#\#Event_/\#\#Event/g;
     237
     238        # fix DOMString and QString
     239        $newContents =~ s/\#define DOMStringImpl StringImpl\n//;
     240        $newContents =~ s/\bDOMString\b/String/g;
     241        $newContents =~ s/\bDOMStringImpl\b/StringImpl/g;
     242        $newContents =~ s/\#define String String\n/#define DOMString String\n#define QString DeprecatedString\n/;
    244243    }
    245244
Note: See TracChangeset for help on using the changeset viewer.