diff base/TempWriteFile.cpp @ 689:573d45e9487b

Merge from debug-output branch

--- a/base/TempWriteFile.cpp	Tue Jun 14 13:43:03 2011 +0100
+++ b/base/TempWriteFile.cpp	Tue Jun 14 14:47:59 2011 +0100
@@ -27,7 +27,7 @@
     temp.setAutoRemove(false);
     temp.open(); // creates the file and opens it atomically
     if (temp.error()) {
-	std::cerr << "TempWriteFile: Failed to create temporary file in directory of " << m_target.toStdString() << ": " << temp.errorString().toStdString() << std::endl;
+	std::cerr << "TempWriteFile: Failed to create temporary file in directory of " << m_target << ": " << temp.errorString() << std::endl;
 	throw FileOperationFailed(temp.fileName(), "creation");
     }
     
@@ -60,7 +60,7 @@
     // Therefore, delete first the existing file.
     if (dir.exists(m_target)) dir.remove(m_target);
     if (!dir.rename(m_temp, m_target)) {
-	std::cerr << "TempWriteFile: Failed to rename temporary file " << m_temp.toStdString() << " to target " << m_target.toStdString() << std::endl;
+	std::cerr << "TempWriteFile: Failed to rename temporary file " << m_temp << " to target " << m_target << std::endl;
 	throw FileOperationFailed(m_temp, "rename");
     }