diff data/model/Model.cpp @ 847:2d53205f70cd tonioni

Merge from default branch

--- a/data/model/Model.cpp	Fri Nov 22 10:37:28 2013 +0000
+++ b/data/model/Model.cpp	Tue Nov 26 14:37:01 2013 +0000
@@ -59,13 +59,13 @@
 void
 Model::aboutToDelete()
 {
-//    std::cerr << "Model(" << this << ")::aboutToDelete()" << std::endl;
+//    cerr << "Model(" << this << ")::aboutToDelete()" << endl;
 
     if (m_aboutToDelete) {
-        std::cerr << "WARNING: Model(" << this << ", \""
+        cerr << "WARNING: Model(" << this << ", \""
                   << objectName() << "\")::aboutToDelete: "
                   << "aboutToDelete called more than once for the same model"
-                  << std::endl;
+                  << endl;
     }
 
     emit aboutToBeDeleted();
@@ -141,7 +141,7 @@
     }
     int completion = 0;
     (void)m_alignment->isReady(&completion);
-//    std::cerr << " -> " << completion << std::endl;
+//    cerr << " -> " << completion << endl;
     return completion;
 }