diff framework/Document.cpp @ 370:a1b8b6a2cdfc tonioni

Merge from branch warnfix_no_size_t

--- a/framework/Document.cpp	Mon Jun 16 09:28:12 2014 +0100
+++ b/framework/Document.cpp	Wed Jun 18 13:42:37 2014 +0100
@@ -235,7 +235,7 @@
     }
 
     QStringList names;
-    for (int i = 0; i < newModels.size(); ++i) {
+    for (int i = 0; i < (int)newModels.size(); ++i) {
         names.push_back(getUniqueLayerName
                         (TransformFactory::getInstance()->
                          getTransformFriendlyName
@@ -314,7 +314,7 @@
         (transforms, input, message, amc);
 
     QStringList names;
-    for (int i = 0; i < newModels.size(); ++i) {
+    for (int i = 0; i < (int)newModels.size(); ++i) {
         names.push_back(getUniqueLayerName
                         (TransformFactory::getInstance()->
                          getTransformFriendlyName
@@ -513,10 +513,9 @@
                           << typeid(*replacementModel).name() << ") in layer "
                           << layer << " (name " << layer->objectName() << ")"
                           << endl;
-#endif
+
                 RangeSummarisableTimeValueModel *rm =
                     dynamic_cast<RangeSummarisableTimeValueModel *>(replacementModel);
-#ifdef DEBUG_DOCUMENT
                 if (rm) {
                     cerr << "new model has " << rm->getChannelCount() << " channels " << endl;
                 } else {