comparison layer/TextLayer.cpp @ 376:e1a9e478b7f2

* juggle some files around in order to free audioio, base, and system libraries
  from dependency on QtGui

 #include "TextLayer.h"
 
 #include "data/model/Model.h"
 #include "base/RealTime.h"
 #include "base/Profiler.h"
-#include "base/ColourDatabase.h"
+#include "ColourDatabase.h"
 #include "view/View.h"
 
 #include "data/model/TextModel.h"
 
 #include <QPainter>

     float height = getHeightForY(v, e->y());
 
     m_editingPoint = TextModel::Point(frame, height, "");
     m_originalPoint = m_editingPoint;
 
-    if (m_editingCommand) m_editingCommand->finish();
+    if (m_editingCommand) finish(m_editingCommand);
     m_editingCommand = new TextModel::EditCommand(m_model, "Add Label");
     m_editingCommand->addPoint(m_editingPoint);
 
     m_editing = true;
 }

 	m_editingCommand->addCommand(command);
     } else {
         m_editingCommand->deletePoint(m_editingPoint);
     }
 
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
 
 void

     if (points.empty()) return;
 
     m_editingPoint = *points.begin();
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
     m_editing = true;
 }

     m_editingCommand = new TextModel::EditCommand
         (m_model, tr("Erase Point"));
 
     m_editingCommand->deletePoint(m_editingPoint);
 
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
 
 void

     m_editOrigin = e->pos();
     m_editingPoint = *points.begin();
     m_originalPoint = m_editingPoint;
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
     m_editing = true;
 }

 	} else {
 	    newName = tr("Move Label Vertically");
 	}
 
 	m_editingCommand->setName(newName);
-	m_editingCommand->finish();
+	finish(m_editingCommand);
     }
     
     m_editingCommand = 0;
     m_editing = false;
 }

 	    command->deletePoint(*i);
 	    command->addPoint(newPoint);
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
 TextLayer::resizeSelection(Selection s, Selection newSize)
 {

 	    command->deletePoint(*i);
 	    command->addPoint(newPoint);
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
 TextLayer::deleteSelection(Selection s)
 {

     for (TextModel::PointList::iterator i = points.begin();
 	 i != points.end(); ++i) {
 	if (s.contains(i->frame)) command->deletePoint(*i);
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
 TextLayer::copy(View *v, Selection s, Clipboard &to)
 {

         }
         
         command->addPoint(newPoint);
     }
 
-    command->finish();
+    finish(command);
     return true;
 }
 
 int
 TextLayer::getDefaultColourHint(bool darkbg, bool &impose)