[QGIS Commit] r11985 - trunk/qgis/scripts

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-11-07 17:13:24 -0500 (Sat, 07 Nov 2009)
New Revision: 11985

Modified:
   trunk/qgis/scripts/qgsloggermig.pl
Log:
make std:: optional when converting iostream stuff to QgsDebugMsg

Modified: trunk/qgis/scripts/qgsloggermig.pl
===================================================================
--- trunk/qgis/scripts/qgsloggermig.pl	2009-11-07 21:13:17 UTC (rev 11984)
+++ trunk/qgis/scripts/qgsloggermig.pl	2009-11-07 22:13:24 UTC (rev 11985)
@@ -60,7 +60,7 @@
 			$lastinclude = scalar(@file)+1;
 		}
 
-		if(/std::(cout|cerr)/) {
+		if(/(std::)?(cout|cerr)/) {
 			die "nested? [$file]" if defined $output;
 			$output = "";
 		}
@@ -72,7 +72,7 @@
 				$output =~ s/$le/\n/g;
 
 				my $level = 0;
-				if($output =~ /^\s*\/\/\s*(std::(cout|cerr))/) {
+				if($output =~ /^\s*\/\/\s*((std::)?(cout|cerr))/) {
 					$level = 3;
 					$output =~ s/^\s*\/\///;
 					$output =~ s/\n\s*\/\//\n /g;
@@ -89,7 +89,7 @@
 					next;
 				}
 
-				unless( $arr[0] =~ /^std::(cout|cerr)$/ ) {
+				unless( $arr[0] =~ /^(std::)?(cout|cerr)$/ ) {
 					die "std::(cerr|cout) expected [$file]: |" . $arr[0] . "|";
 				}
 
@@ -102,14 +102,14 @@
 					$arr[-1] = "std::endl;";
 				}
 
-				if( $arr[-1] =~ /^std::flush;$/ &&
-				    $arr[-2] =~ /^std::endl$/ ) {
+				if( $arr[-1] =~ /^(std::)?flush;$/ &&
+				    $arr[-2] =~ /^(std::)?endl$/ ) {
 					pop @arr;
 					pop @arr;
 					push @arr, "std::endl;";
 				}
 
-				unless( $arr[-1] =~ /^std::endl;$/ ) {
+				unless( $arr[-1] =~ /^(std::)?endl;$/ ) {
 					die "std::endl; expected [$file]: |" . $arr[-1] . "|";
 				}