diff widgets/AudioDial.cpp @ 706:97ea68f62c1f imaf_enc

Merge from default branch

--- a/widgets/AudioDial.cpp	Mon Nov 04 17:12:32 2013 +0000
+++ b/widgets/AudioDial.cpp	Thu Dec 05 09:47:02 2013 +0000
@@ -52,8 +52,8 @@
 
 #include "base/Profiler.h"
 
-using std::endl;
-using std::cerr;
+
+
 
 
 //!!! Pedro updated his version to use my up/down response code from RG -- need to grab that code in preference to this version from Rui
@@ -99,7 +99,7 @@
 
 void AudioDial::setRangeMapper(RangeMapper *mapper)
 {
-//    std::cerr << "AudioDial[" << this << "][\"" << objectName() << "\"::setRangeMapper(" << mapper << ") [current is " << m_rangeMapper << "] (have " << dialsExtant << " dials extant)" << std::endl;
+//    cerr << "AudioDial[" << this << "][\"" << objectName() << "\"::setRangeMapper(" << mapper << ") [current is " << m_rangeMapper << "] (have " << dialsExtant << " dials extant)" << endl;
 
     if (m_rangeMapper == mapper) return;
 
@@ -183,7 +183,7 @@
     // Tick notches...
 
     if ( notchesVisible() ) {
-//	std::cerr << "Notches visible" << std::endl;
+//	cerr << "Notches visible" << endl;
 	pen.setColor(palette().dark().color());
 	pen.setWidth(scale);
 	paint.setPen(pen);
@@ -202,7 +202,7 @@
     pen.setWidth(indent);
     paint.setPen(pen);
 
-//    std::cerr << "degrees " << degrees << ", gives us " << -(degrees - 45) * 16 << std::endl;
+//    cerr << "degrees " << degrees << ", gives us " << -(degrees - 45) * 16 << endl;
 
     int arcLen = -(degrees - 45) * 16;
     if (arcLen == 0) arcLen = -16;