[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:       2010-11-03 19:12:42
Message-ID: 20101103191242.26BA6AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192698 by dfaure:

fix perl warning, and fix failure to add the #include if there's only one in the file


 M  +5 -2      functionUtilkde.pm  


--- trunk/KDE/kdesdk/scripts/qt4/functionUtilkde.pm #1192697:1192698
@@ -84,8 +84,11 @@
    open F, "+<", $file or do { print STDOUT "open($file) failed : \"$!\"\n"; next };
    my $str = join '', <F>;
    if( $str !~ /#include <$includefile>/ ) {
-    $str =~ s!(#include <.*#include <[^
-]*)!\1\n#include <$includefile>!smig;
+    # Add the include after all others
+    if (!($str =~ s!(#include <.*#include <[^\n]*)!$1\n#include <$includefile>!smig)) {
+       # This failed, maybe there is only one include
+       $str =~ s!(#include <[^\n]*)!$1\n#include <$includefile>!smig;
+    }
     seek F, 0, 0;
     print F $str;
     truncate F, tell(F);
[prev in list] [next in list] [prev in thread] [next in thread]