comparison framework/Document.cpp @ 370:a1b8b6a2cdfc tonioni

Merge from branch warnfix_no_size_t

         //!!! This identifier may be wrong!
         emit modelGenerationWarning(transforms[0].getIdentifier(), message);
     }
 
     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
                          (transforms[i].getIdentifier())));
     }

     
     vector<Model *> newModels = addDerivedModels
         (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
                          (transforms[i].getIdentifier())));
     }

                           << typeid(*model).name() << ") with model "
                           << replacementModel << " (type "
                           << 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 {
                     cerr << "new model " << replacementModel << " is not a RangeSummarisableTimeValueModel!" << endl;
                 }