diff layer/TextLayer.cpp @ 376:e1a9e478b7f2

* juggle some files around in order to free audioio, base, and system libraries from dependency on QtGui
author Chris Cannam
date Wed, 12 Mar 2008 17:42:56 +0000
parents d58701996fae
children 2e8194a30f40
line wrap: on
line diff
--- a/layer/TextLayer.cpp	Wed Mar 12 14:40:18 2008 +0000
+++ b/layer/TextLayer.cpp	Wed Mar 12 17:42:56 2008 +0000
@@ -18,7 +18,7 @@
 #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"
@@ -398,7 +398,7 @@
     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);
 
@@ -443,7 +443,7 @@
         m_editingCommand->deletePoint(m_editingPoint);
     }
 
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
@@ -459,7 +459,7 @@
     m_editingPoint = *points.begin();
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
@@ -488,7 +488,7 @@
 
     m_editingCommand->deletePoint(m_editingPoint);
 
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
@@ -508,7 +508,7 @@
     m_originalPoint = m_editingPoint;
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
@@ -563,7 +563,7 @@
 	}
 
 	m_editingCommand->setName(newName);
-	m_editingCommand->finish();
+	finish(m_editingCommand);
     }
     
     m_editingCommand = 0;
@@ -615,7 +615,7 @@
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
@@ -649,7 +649,7 @@
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
@@ -668,7 +668,7 @@
 	if (s.contains(i->frame)) command->deletePoint(*i);
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
@@ -767,7 +767,7 @@
         command->addPoint(newPoint);
     }
 
-    command->finish();
+    finish(command);
     return true;
 }