comparison layer/TimeRulerLayer.cpp @ 682:1a0dfcbffaf1

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

 #include <iostream>
 #include <cmath>
 
 //#define DEBUG_TIME_RULER_LAYER 1
 
-using std::cerr;
-using std::endl;
+
+
 
 TimeRulerLayer::TimeRulerLayer() :
     SingleColourLayer(),
     m_model(0),
     m_labelHeight(LabelTop)

     if (!sampleRate) return;
 
     long startFrame = v->getFrameForX(rect.x() - 50);
 
 #ifdef DEBUG_TIME_RULER_LAYER
-    std::cerr << "start frame = " << startFrame << std::endl;
+    cerr << "start frame = " << startFrame << endl;
 #endif
 
     bool quarter = false;
     int incms = getMajorTickSpacing(v, quarter);
 
     int ms = lrint(1000.0 * (double(startFrame) / double(sampleRate)));
     ms = (ms / incms) * incms - incms;
 
 #ifdef DEBUG_TIME_RULER_LAYER
-    std::cerr << "start ms = " << ms << " at step " << incms << std::endl;
+    cerr << "start ms = " << ms << " at step " << incms << endl;
 #endif
 
     // Calculate the number of ticks per increment -- approximate
     // values for x and frame counts here will do, no rounding issue.
     // We always use the exact incms in our calculations for where to

         SVDEBUG << "Considering frame = " << frame << ", x = " << x << endl;
 #endif
 
         if (x >= rect.x() + rect.width() + 50) {
 #ifdef DEBUG_TIME_RULER_LAYER
-            std::cerr << "X well out of range, ending here" << std::endl;
+            cerr << "X well out of range, ending here" << endl;
 #endif
             break;
         }
 
 	if (x >= rect.x() - 50) {
 
             RealTime rt = RealTime::fromMilliseconds(ms);
 
 #ifdef DEBUG_TIME_RULER_LAYER
-            std::cerr << "X in range, drawing line here for time " << rt.toText() << std::endl;
+            cerr << "X in range, drawing line here for time " << rt.toText() << endl;
 #endif
 
             QString text(QString::fromStdString(rt.toText()));
             QFontMetrics metrics = paint.fontMetrics();
             int tw = metrics.width(text);
 
             if (tw < 50 &&
                 (x < rect.x() - tw/2 ||
                  x >= rect.x() + rect.width() + tw/2)) {
 #ifdef DEBUG_TIME_RULER_LAYER
-                std::cerr << "hm, maybe X isn't in range after all (x = " << x << ", tw = " << tw << ", rect.x() = " << rect.x() << ", rect.width() = " << rect.width() << ")" << std::endl;
+                cerr << "hm, maybe X isn't in range after all (x = " << x << ", tw = " << tw << ", rect.x() = " << rect.x() << ", rect.width() = " << rect.width() << ")" << endl;
 #endif
             }
 
             paint.setPen(greyColour);
             paint.drawLine(x, 0, x, v->height());

 
             x = v->getXForFrame(frame);
 
             if (x < rect.x() || x >= rect.x() + rect.width()) {
 #ifdef DEBUG_TIME_RULER_LAYER
-//                std::cerr << "tick " << i << ": X out of range, going on to next tick" << std::endl;
+//                cerr << "tick " << i << ": X out of range, going on to next tick" << endl;
 #endif
                 continue;
             }
 
 #ifdef DEBUG_TIME_RULER_LAYER
-            std::cerr << "tick " << i << " in range, drawing at " << x << std::endl;
+            cerr << "tick " << i << " in range, drawing at " << x << endl;
 #endif
 
 	    int sz = 5;
 	    if (ticks == 10) {
 		if ((i % 2) == 1) {