# HG changeset patch
# User Chris Cannam
# Date 1385475064 0
# Node ID 692a8b9804fe6b59cedf50d904a4bc983973d607
# Parent  1a0dfcbffaf13d56300e025be3c563e1dbcee053
Drop toStdString() and toLocal8Bit().data(), with debug header we can stream QStrings

diff -r 1a0dfcbffaf1 -r 692a8b9804fe layer/LayerFactory.cpp
--- a/layer/LayerFactory.cpp	Tue Nov 26 14:06:40 2013 +0000
+++ b/layer/LayerFactory.cpp	Tue Nov 26 14:11:04 2013 +0000
@@ -480,7 +480,7 @@
         for (unsigned int i = 0; i < attrNodes.length(); ++i) {
             QDomAttr attr = attrNodes.item(i).toAttr();
             if (attr.isNull()) continue;
-//            cerr << "append \"" << attr.name().toStdString()
+//            cerr << "append \"" << attr.name()
 //                      << "\" -> \"" << attr.value() << "\""
 //                      << endl;
             attrs.append(attr.name(), "", "", attr.value());
@@ -492,7 +492,7 @@
             QDomAttr attr = attrNodes.item(i).toAttr();
             if (attr.isNull()) continue;
             if (attrs.value(attr.name()) == "") {
-//                cerr << "append \"" << attr.name().toStdString()
+//                cerr << "append \"" << attr.name()
 //                          << "\" -> \"" << attr.value() << "\""
 //                          << endl;
                 attrs.append(attr.name(), "", "", attr.value());
diff -r 1a0dfcbffaf1 -r 692a8b9804fe view/Pane.cpp
--- a/view/Pane.cpp	Tue Nov 26 14:06:40 2013 +0000
+++ b/view/Pane.cpp	Tue Nov 26 14:11:04 2013 +0000
@@ -2257,7 +2257,7 @@
 {
     QStringList formats(e->mimeData()->formats());
     cerr << "dragEnterEvent: format: "
-              << formats.join(",").toStdString()
+              << formats.join(",")
               << ", possibleActions: " << e->possibleActions()
               << ", proposedAction: " << e->proposedAction() << endl;
     
@@ -2276,7 +2276,7 @@
 void
 Pane::dropEvent(QDropEvent *e)
 {
-    cerr << "dropEvent: text: \"" << e->mimeData()->text().toStdString()
+    cerr << "dropEvent: text: \"" << e->mimeData()->text()
               << "\"" << endl;
 
     if (e->mimeData()->hasFormat("text/uri-list") || 
diff -r 1a0dfcbffaf1 -r 692a8b9804fe widgets/CommandHistory.cpp
--- a/widgets/CommandHistory.cpp	Tue Nov 26 14:06:40 2013 +0000
+++ b/widgets/CommandHistory.cpp	Tue Nov 26 14:11:04 2013 +0000
@@ -143,7 +143,7 @@
     if (!command) return;
 
 #ifdef DEBUG_COMMAND_HISTORY
-    SVDEBUG << "CommandHistory::addCommand: " << command->getName().toLocal8Bit().data() << " of type " << typeid(*command).name() << " at " << command << ": execute = " << execute << ", bundle = " << bundle << " (m_currentCompound = " << m_currentCompound << ", m_currentBundle = " << m_currentBundle << ")" << endl;
+    SVDEBUG << "CommandHistory::addCommand: " << command->getName() << " of type " << typeid(*command).name() << " at " << command << ": execute = " << execute << ", bundle = " << bundle << " (m_currentCompound = " << m_currentCompound << ", m_currentBundle = " << m_currentBundle << ")" << endl;
 #endif
 
     if (m_currentCompound) {
@@ -265,7 +265,7 @@
 CommandHistory::addToCompound(Command *command, bool execute)
 {
 #ifdef DEBUG_COMMAND_HISTORY
-    SVDEBUG << "CommandHistory::addToCompound: " << command->getName().toLocal8Bit().data() << endl;
+    SVDEBUG << "CommandHistory::addToCompound: " << command->getName() << endl;
 #endif
     if (!m_currentCompound) {
 	SVDEBUG << "CommandHistory::addToCompound: ERROR: no compound operation in progress!" << endl;
@@ -281,7 +281,7 @@
 {
     if (m_currentCompound) {
 	SVDEBUG << "CommandHistory::startCompoundOperation: ERROR: compound operation already in progress!" << endl;
-	cerr << "(name is " << m_currentCompound->getName().toLocal8Bit().data() << ")" << endl;
+	cerr << "(name is " << m_currentCompound->getName() << ")" << endl;
         return;
     }
  
@@ -436,7 +436,7 @@
 	for (i = 0; i < limit; ++i) {
 #ifdef DEBUG_COMMAND_HISTORY
 	    Command *command = stack.top();
-	    SVDEBUG << "CommandHistory::clipStack: Saving recent command: " << command->getName().toLocal8Bit().data() << " at " << command << endl;
+	    SVDEBUG << "CommandHistory::clipStack: Saving recent command: " << command->getName() << " at " << command << endl;
 #endif
 	    tempStack.push(stack.top());
 	    stack.pop();
diff -r 1a0dfcbffaf1 -r 692a8b9804fe widgets/PropertyBox.cpp
--- a/widgets/PropertyBox.cpp	Tue Nov 26 14:06:40 2013 +0000
+++ b/widgets/PropertyBox.cpp	Tue Nov 26 14:11:04 2013 +0000
@@ -275,7 +275,7 @@
 
 #ifdef DEBUG_PROPERTY_BOX
     cerr << "PropertyBox[" << this
-	      << "(\"" << m_container->getPropertyContainerName().toStdString()
+	      << "(\"" << m_container->getPropertyContainerName()
 	      << "\")]";
     cerr << "::updatePropertyEditor(\"" << name << "\"):";
     cerr << " value " << value << ", have " << have << ", group \""