diff framework/SVFileReader.cpp @ 294:933b5aed341a

Drop toStdString() and toLocal8Bit().data(), with debug header we can stream QStrings
author Chris Cannam
date Tue, 26 Nov 2013 14:14:25 +0000
parents 068235cf5bf7
children 289d65722123
line wrap: on
line diff
--- a/framework/SVFileReader.cpp	Tue Nov 26 14:12:50 2013 +0000
+++ b/framework/SVFileReader.cpp	Tue Nov 26 14:14:25 2013 +0000
@@ -236,12 +236,12 @@
 
     } else {
         cerr << "WARNING: SV-XML: Unexpected element \""
-                  << name.toLocal8Bit().data() << "\"" << endl;
+                  << name << "\"" << endl;
     }
 
     if (!ok) {
 	cerr << "WARNING: SV-XML: Failed to completely process element \""
-		  << name.toLocal8Bit().data() << "\"" << endl;
+		  << name << "\"" << endl;
     }
 
     return true;
@@ -362,7 +362,7 @@
 	.arg(exception.message())
 	.arg(exception.lineNumber())
 	.arg(exception.columnNumber());
-    cerr << m_errorString.toLocal8Bit().data() << endl;
+    cerr << m_errorString << endl;
     return QXmlDefaultHandler::error(exception);
 }
 
@@ -374,7 +374,7 @@
 	.arg(exception.message())
 	.arg(exception.lineNumber())
 	.arg(exception.columnNumber());
-    cerr << m_errorString.toLocal8Bit().data() << endl;
+    cerr << m_errorString << endl;
     return QXmlDefaultHandler::fatalError(exception);
 }
 
@@ -706,7 +706,7 @@
     } else {
 
 	cerr << "WARNING: SV-XML: Unexpected model type \""
-		  << type.toLocal8Bit().data() << "\" for model id " << id << endl;
+		  << type << "\" for model id " << id << endl;
     }
 
     return false;
@@ -720,7 +720,7 @@
     
     if (type != "pane") {
 	cerr << "WARNING: SV-XML: Unexpected view type \""
-		  << type.toLocal8Bit().data() << "\"" << endl;
+		  << type << "\"" << endl;
 	return false;
     }
 
@@ -778,7 +778,7 @@
 
     if (!ok) {
 	cerr << "WARNING: SV-XML: No layer id for layer of type \""
-		  << type.toLocal8Bit().data()
+		  << type
 		  << "\"" << endl;
 	return false;
     }
@@ -837,7 +837,7 @@
 	    
     if (!layer) {
 	cerr << "WARNING: SV-XML: Failed to add layer of type \""
-		  << type.toLocal8Bit().data()
+		  << type
 		  << "\"" << endl;
 	return false;
     }