sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

make std:: optional when converting iostream stuff to QgsDebugMsg

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@11985 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-11-07 22:13:24 +00:00
parent afa191088e
commit 63060d9aa8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/qgsloggermig.pl
View File

@ -60,7 +60,7 @@ for my $file (@ARGV) {
$lastinclude = scalar(@file)+1; $lastinclude = scalar(@file)+1;
} }
if(/std::(cout|cerr)/) { if(/(std::)?(cout|cerr)/) {
die "nested? [$file]" if defined $output; die "nested? [$file]" if defined $output;
$output = ""; $output = "";
} }
@ -72,7 +72,7 @@ for my $file (@ARGV) {
$output =~ s/$le/\n/g; $output =~ s/$le/\n/g;
my $level = 0; my $level = 0;
if($output =~ /^\s*\/\/\s*(std::(cout|cerr))/) { if($output =~ /^\s*\/\/\s*((std::)?(cout|cerr))/) {
$level = 3; $level = 3;
$output =~ s/^\s*\/\///; $output =~ s/^\s*\/\///;
$output =~ s/\n\s*\/\//\n /g; $output =~ s/\n\s*\/\//\n /g;
@ -89,7 +89,7 @@ for my $file (@ARGV) {
next; next;
} }
unless( $arr[0] =~ /^std::(cout|cerr)$/ ) { unless( $arr[0] =~ /^(std::)?(cout|cerr)$/ ) {
die "std::(cerr|cout) expected [$file]: |" . $arr[0] . "|"; die "std::(cerr|cout) expected [$file]: |" . $arr[0] . "|";
} }
@ -102,14 +102,14 @@ for my $file (@ARGV) {
$arr[-1] = "std::endl;"; $arr[-1] = "std::endl;";
} }
if( $arr[-1] =~ /^std::flush;$/ && if( $arr[-1] =~ /^(std::)?flush;$/ &&
$arr[-2] =~ /^std::endl$/ ) { $arr[-2] =~ /^(std::)?endl$/ ) {
pop @arr; pop @arr;
pop @arr; pop @arr;
push @arr, "std::endl;"; push @arr, "std::endl;";
} }
unless( $arr[-1] =~ /^std::endl;$/ ) { unless( $arr[-1] =~ /^(std::)?endl;$/ ) {
die "std::endl; expected [$file]: |" . $arr[-1] . "|"; die "std::endl; expected [$file]: |" . $arr[-1] . "|";
} }