[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/scripts/qt4
From:       David Faure <faure () kde ! org>
Date:       2007-03-27 22:43:07
Message-ID: 1175035387.318824.15019.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 647308 by dfaure:

Updates.
Don't run convert-misc-k3.pl yet ;)


 M  +0 -1      convert-kinstance.pl  
 M  +8 -9      convert-kmimetype-pixmap.pl  
 M  +4 -20     convert-misc-k3.pl  
 M  +0 -1      convert-qvhbox.pl  


--- trunk/KDE/kdesdk/scripts/qt4/convert-kinstance.pl #647307:647308
@@ -16,7 +16,6 @@
     chomp $file;
     next if functionUtilkde::excludeFile( $file);
 
-    my $nbLoop = 1;
     my $modified;
     my @necessaryIncludes = ();
     open(my $FILE, $file) or warn "We can't open file $file:$!\n";
--- trunk/KDE/kdesdk/scripts/qt4/convert-kmimetype-pixmap.pl #647307:647308
@@ -3,20 +3,19 @@
 # David Faure <faure@kde.org> 2007
 # Based on script by Laurent Montel <montel@kde.org> 2005
 # This script converts KMimeType::pixmap (deprecated) to \
KIconLoader::loadMimeTypeIcon +#        and KDEDesktopMimeType:: to \
KDesktopFileActions::  
 use lib qw( . );
 use functionUtilkde;
 
 foreach my $file (@ARGV) {
-    local *F;
-    open F, "+<", $file or do { print STDOUT "open($file) failled : \"$!\"\n"; next \
                };
-    my $str = join '', <F>;
-    $str =~ s/(KMimeType::mimeType\([^)]*\))->pixmap\(([^)]*)\)/KIconLoader::global()->loadMimeTypeIcon($1->iconName(),$2)/sg;
                
-    $str =~ s/(\w*)->pixmap\(([^)]*)\)/KIconLoader::global()->loadMimeTypeIcon($1->iconName(),$2)/sg;
                
-    seek F, 0, 0;
-    print F $str;
-    truncate F, tell(F);
-    close F;
+    functionUtilkde::substInFile {
+	s/(KMimeType::mimeType\([^)]*\))->pixmap\(([^)]*)\)/KIconLoader::global()->loadMimeTypeIcon($1->iconName(),$2)/sg;
 +	# the regexp below is a bit too greedy, it also matches fileitem->pixmap()
+	#s/(\w*)->pixmap\(([^)]*)\)/KIconLoader::global()->loadMimeTypeIcon($1->iconName(),$2)/sg;
 +	s/KDEDesktopMimeType::/KDesktopFileActions::/g;
+	s/kdedesktopmimetype\.h/kdesktopfileactions.h/g;
+    } $file;
 }
 
 functionUtilkde::diffFile( "@ARGV" );
--- trunk/KDE/kdesdk/scripts/qt4/convert-misc-k3.pl #647307:647308
@@ -8,19 +8,10 @@
 use functionUtilkde;
 use strict;
 
-open(my $F, q(find -name "*" |));
-my $file;
+foreach my $file (@ARGV) {
 
-while ($file = <$F>) {
-    chomp $file;
-    next if functionUtilkde::excludeFile( $file);
+    functionUtilkde::substInFile {
 
-    my $nbLoop = 1;
-    my $modified;
-    open(my $FILE, $file) or warn "We can't open file $file:$!\n";
-    my @l = map {
-        my $orig = $_;
-
         s!#include <kfiletreeview.h>!#include <k3filetreeview.h>!;
         s!#include "kfiletreeview.h"!#include "k3filetreeview.h"!;
         s!KFileTreeView!K3FileTreeView!g;
@@ -43,15 +34,8 @@
         s!KCompletionBox!K3CompletionBox!g;
         s!#include <kfiletreeviewitem.h>!#include <k3filetreeviewitem.h>!;
         s!#include "kfiletreeviewitem.h"!#include "k3filetreeviewitem.h"!;
+        s!currentK3FileTreeViewItem!currentKFileTreeViewItem!g;
 
-
-        $modified ||= $orig ne $_;
-        $_;
-    } <$FILE>;
-
-    if ($modified) {
-        open (my $OUT, ">$file");
-        print $OUT @l;
-    }
+    } $file;
 }
 functionUtilkde::diffFile( "@ARGV" );
--- trunk/KDE/kdesdk/scripts/qt4/convert-qvhbox.pl #647307:647308
@@ -14,7 +14,6 @@
     chomp $file;
     next if functionUtilkde::excludeFile( $file);
 
-    my $nbLoop = 1;
     my $modified;
     open(my $FILE, $file) or warn "We can't open file $file:$!\n";
     my @l = map {


[prev in list] [next in list] [prev in thread] [next in thread]