comparison data/model/AlignmentModel.cpp @ 843:e802e550a1f2

Drop std:: from cout, cerr, endl -- pull these in through Debug.h

 
 void
 AlignmentModel::pathChanged()
 {
     if (m_pathComplete) {
-        std::cerr << "AlignmentModel: deleting raw path model" << std::endl;
+        cerr << "AlignmentModel: deleting raw path model" << endl;
         if (m_rawPath) m_rawPath->aboutToDelete();
         delete m_rawPath;
         m_rawPath = 0;
     }
 }

 void
 AlignmentModel::constructPath() const
 {
     if (!m_path) {
         if (!m_rawPath) {
-            std::cerr << "ERROR: AlignmentModel::constructPath: "
-                      << "No raw path available" << std::endl;
+            cerr << "ERROR: AlignmentModel::constructPath: "
+                      << "No raw path available" << endl;
             return;
         }
         m_path = new PathModel
             (m_rawPath->getSampleRate(), m_rawPath->getResolution(), false);
     } else {

 void
 AlignmentModel::constructReversePath() const
 {
     if (!m_reversePath) {
         if (!m_path) {
-            std::cerr << "ERROR: AlignmentModel::constructReversePath: "
-                      << "No forward path available" << std::endl;
+            cerr << "ERROR: AlignmentModel::constructReversePath: "
+                      << "No forward path available" << endl;
             return;
         }
         m_reversePath = new PathModel
             (m_path->getSampleRate(), m_path->getResolution(), false);
     } else {

 
     PathModel::Point point(frame);
     PathModel::PointList::const_iterator i = points.lower_bound(point);
     if (i == points.end()) {
 #ifdef DEBUG_ALIGNMENT_MODEL
-        std::cerr << "Note: i == points.end()" << std::endl;
+        cerr << "Note: i == points.end()" << endl;
 #endif
         --i;
     }
     while (i != points.begin() && i->frame > long(frame)) --i;
 

     long followingFrame = foundFrame;
     long followingMapFrame = foundMapFrame;
 
     if (++i != points.end()) {
 #ifdef DEBUG_ALIGNMENT_MODEL
-        std::cerr << "another point available" << std::endl;
+        cerr << "another point available" << endl;
 #endif
         followingFrame = i->frame;
         followingMapFrame = i->mapframe;
     } else {
 #ifdef DEBUG_ALIGNMENT_MODEL
-        std::cerr << "no other point available" << std::endl;
+        cerr << "no other point available" << endl;
 #endif
     }        
 
     if (foundMapFrame < 0) return 0;