diff framework/MainWindowBase.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 14b1768e5406 c837368b1faf 428ce32a8dd9
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Tue Nov 26 14:12:50 2013 +0000
+++ b/framework/MainWindowBase.cpp	Tue Nov 26 14:14:25 2013 +0000
@@ -1132,7 +1132,7 @@
         templateName = getDefaultSessionTemplate();
     }
 
-    cerr << "template is: \"" << templateName.toStdString() << "\"" << endl;
+    cerr << "template is: \"" << templateName << "\"" << endl;
 
     if (!source.isAvailable()) return FileOpenFailed;
     source.waitForData();
@@ -1448,7 +1448,7 @@
         
         if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
             cerr << "ERROR: MainWindowBase::openLayer("
-                      << source.getLocation().toStdString()
+                      << source.getLocation()
                       << "): Failed to open file for reading" << endl;
             return FileOpenFailed;
         }
@@ -1467,7 +1467,7 @@
         
         if (!reader.isOK()) {
             cerr << "ERROR: MainWindowBase::openLayer("
-                      << source.getLocation().toStdString()
+                      << source.getLocation()
                       << "): Failed to read XML file: "
                       << reader.getErrorString() << endl;
             return FileOpenFailed;
@@ -1726,7 +1726,7 @@
     ResourceFinder rf;
     QString tfile = rf.getResourcePath("templates", templateName + ".svt");
     if (tfile != "") {
-        cerr << "SV loading template file " << tfile.toStdString() << endl;
+        cerr << "SV loading template file " << tfile << endl;
         return openSessionTemplate(FileSource("file:" + tfile));
     } else {
         return FileOpenFailed;
@@ -1736,7 +1736,7 @@
 MainWindowBase::FileOpenStatus
 MainWindowBase::openSessionTemplate(FileSource source)
 {
-    cerr << "MainWindowBase::openSessionTemplate(" << source.getLocation().toStdString() << ")" << endl;
+    cerr << "MainWindowBase::openSessionTemplate(" << source.getLocation() << ")" << endl;
 
     if (!source.isAvailable()) return FileOpenFailed;
     source.waitForData();
@@ -2066,7 +2066,7 @@
         BZipFileDevice bzFile(temp.getTemporaryFilename());
         if (!bzFile.open(QIODevice::WriteOnly)) {
             cerr << "Failed to open session file \""
-                      << temp.getTemporaryFilename().toStdString()
+                      << temp.getTemporaryFilename()
                       << "\" for writing: "
                       << bzFile.errorString() << endl;
             return false;
@@ -2111,9 +2111,9 @@
         QFile file(temp.getTemporaryFilename());
         if (!file.open(QIODevice::WriteOnly)) {
             cerr << "Failed to open session template file \""
-                      << temp.getTemporaryFilename().toStdString()
+                      << temp.getTemporaryFilename()
                       << "\" for writing: "
-                      << file.errorString().toStdString() << endl;
+                      << file.errorString() << endl;
             return false;
         }