diff layer/TimeInstantLayer.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 f329416bf1a5
line wrap: on
line diff
--- a/layer/TimeInstantLayer.cpp	Wed Mar 12 14:40:18 2008 +0000
+++ b/layer/TimeInstantLayer.cpp	Wed Mar 12 17:42:56 2008 +0000
@@ -20,7 +20,7 @@
 #include "view/View.h"
 #include "base/Profiler.h"
 #include "base/Clipboard.h"
-#include "base/ColourDatabase.h"
+#include "ColourDatabase.h"
 
 #include "data/model/SparseOneDimensionalModel.h"
 
@@ -456,7 +456,7 @@
 
     m_editingPoint = SparseOneDimensionalModel::Point(frame, tr("New Point"));
 
-    if (m_editingCommand) m_editingCommand->finish();
+    if (m_editingCommand) finish(m_editingCommand);
     m_editingCommand = new SparseOneDimensionalModel::EditCommand(m_model,
 								  tr("Draw Point"));
     m_editingCommand->addPoint(m_editingPoint);
@@ -489,7 +489,7 @@
 				      m_model->getSampleRate())
 	     .toText(false).c_str());
     m_editingCommand->setName(newName);
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
@@ -505,7 +505,7 @@
     m_editingPoint = *points.begin();
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
@@ -533,7 +533,7 @@
 
     m_editingCommand->deletePoint(m_editingPoint);
 
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
@@ -551,7 +551,7 @@
     m_editingPoint = *points.begin();
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
@@ -590,7 +590,7 @@
 					  m_model->getSampleRate())
 		 .toText(false).c_str());
 	m_editingCommand->setName(newName);
-	m_editingCommand->finish();
+	finish(m_editingCommand);
     }
     m_editingCommand = 0;
     m_editing = false;
@@ -624,7 +624,7 @@
             new SparseOneDimensionalModel::EditCommand(m_model, tr("Edit Point"));
         command->deletePoint(point);
         command->addPoint(newPoint);
-        command->finish();
+        finish(command);
     }
 
     delete dialog;
@@ -654,7 +654,7 @@
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
@@ -689,7 +689,7 @@
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
@@ -709,7 +709,7 @@
 	if (s.contains(i->frame)) command->deletePoint(*i);
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
@@ -796,7 +796,7 @@
         command->addPoint(newPoint);
     }
 
-    command->finish();
+    finish(command);
     return true;
 }