diff layer/TextLayer.cpp @ 586:1ae54a29e59e

Merge from debug-output branch

--- a/layer/TextLayer.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/layer/TextLayer.cpp	Tue Jun 14 14:48:29 2011 +0100
@@ -51,7 +51,7 @@
 
     connectSignals(m_model);
 
-//    std::cerr << "TextLayer::setModel(" << model << ")" << std::endl;
+//    DEBUG << "TextLayer::setModel(" << model << ")" << endl;
 
     emit modelReplaced();
 }
@@ -331,8 +331,8 @@
     QColor penColour;
     penColour = v->getForeground();
 
-//    std::cerr << "TextLayer::paint: resolution is "
-//	      << m_model->getResolution() << " frames" << std::endl;
+//    DEBUG << "TextLayer::paint: resolution is "
+//	      << m_model->getResolution() << " frames" << endl;
 
     QPoint localPos;
     TextModel::Point illuminatePoint(0);
@@ -413,10 +413,10 @@
 void
 TextLayer::drawStart(View *v, QMouseEvent *e)
 {
-//    std::cerr << "TextLayer::drawStart(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "TextLayer::drawStart(" << e->x() << "," << e->y() << ")" << endl;
 
     if (!m_model) {
-	std::cerr << "TextLayer::drawStart: no model" << std::endl;
+	DEBUG << "TextLayer::drawStart: no model" << endl;
 	return;
     }
 
@@ -439,7 +439,7 @@
 void
 TextLayer::drawDrag(View *v, QMouseEvent *e)
 {
-//    std::cerr << "TextLayer::drawDrag(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "TextLayer::drawDrag(" << e->x() << "," << e->y() << ")" << endl;
 
     if (!m_model || !m_editing) return;
 
@@ -458,7 +458,7 @@
 void
 TextLayer::drawEnd(View *v, QMouseEvent *)
 {
-//    std::cerr << "TextLayer::drawEnd(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "TextLayer::drawEnd(" << e->x() << "," << e->y() << ")" << endl;
     if (!m_model || !m_editing) return;
 
     bool ok = false;
@@ -523,7 +523,7 @@
 void
 TextLayer::editStart(View *v, QMouseEvent *e)
 {
-//    std::cerr << "TextLayer::editStart(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "TextLayer::editStart(" << e->x() << "," << e->y() << ")" << endl;
 
     if (!m_model) return;
 
@@ -572,7 +572,7 @@
 void
 TextLayer::editEnd(View *, QMouseEvent *)
 {
-//    std::cerr << "TextLayer::editEnd(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "TextLayer::editEnd(" << e->x() << "," << e->y() << ")" << endl;
     if (!m_model || !m_editing) return;
 
     if (m_editingCommand) {