comparison framework/Document.cpp @ 366:0876ea394902 warnfix_no_size_t

Remove size_t's, fix compiler warnings
author Chris Cannam
date Tue, 17 Jun 2014 16:23:06 +0100
parents 93cf23bfa1cb
children f1cab64363d7
comparison
equal deleted inserted replaced
355:e7a3fa8f4eec 366:0876ea394902
233 //!!! This identifier may be wrong! 233 //!!! This identifier may be wrong!
234 emit modelGenerationWarning(transforms[0].getIdentifier(), message); 234 emit modelGenerationWarning(transforms[0].getIdentifier(), message);
235 } 235 }
236 236
237 QStringList names; 237 QStringList names;
238 for (int i = 0; i < newModels.size(); ++i) { 238 for (int i = 0; i < (int)newModels.size(); ++i) {
239 names.push_back(getUniqueLayerName 239 names.push_back(getUniqueLayerName
240 (TransformFactory::getInstance()-> 240 (TransformFactory::getInstance()->
241 getTransformFriendlyName 241 getTransformFriendlyName
242 (transforms[i].getIdentifier()))); 242 (transforms[i].getIdentifier())));
243 } 243 }
303 303
304 vector<Model *> newModels = addDerivedModels 304 vector<Model *> newModels = addDerivedModels
305 (transforms, input, message, amc); 305 (transforms, input, message, amc);
306 306
307 QStringList names; 307 QStringList names;
308 for (int i = 0; i < newModels.size(); ++i) { 308 for (int i = 0; i < (int)newModels.size(); ++i) {
309 names.push_back(getUniqueLayerName 309 names.push_back(getUniqueLayerName
310 (TransformFactory::getInstance()-> 310 (TransformFactory::getInstance()->
311 getTransformFriendlyName 311 getTransformFriendlyName
312 (transforms[i].getIdentifier()))); 312 (transforms[i].getIdentifier())));
313 } 313 }
491 << typeid(*model).name() << ") with model " 491 << typeid(*model).name() << ") with model "
492 << replacementModel << " (type " 492 << replacementModel << " (type "
493 << typeid(*replacementModel).name() << ") in layer " 493 << typeid(*replacementModel).name() << ") in layer "
494 << layer << " (name " << layer->objectName() << ")" 494 << layer << " (name " << layer->objectName() << ")"
495 << endl; 495 << endl;
496 #endif 496
497 RangeSummarisableTimeValueModel *rm = 497 RangeSummarisableTimeValueModel *rm =
498 dynamic_cast<RangeSummarisableTimeValueModel *>(replacementModel); 498 dynamic_cast<RangeSummarisableTimeValueModel *>(replacementModel);
499 #ifdef DEBUG_DOCUMENT
500 if (rm) { 499 if (rm) {
501 cerr << "new model has " << rm->getChannelCount() << " channels " << endl; 500 cerr << "new model has " << rm->getChannelCount() << " channels " << endl;
502 } else { 501 } else {
503 cerr << "new model " << replacementModel << " is not a RangeSummarisableTimeValueModel!" << endl; 502 cerr << "new model " << replacementModel << " is not a RangeSummarisableTimeValueModel!" << endl;
504 } 503 }