diff layer/NoteLayer.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 681542f0c8c5
line wrap: on
line diff
--- a/layer/NoteLayer.cpp	Wed Mar 12 14:40:18 2008 +0000
+++ b/layer/NoteLayer.cpp	Wed Mar 12 17:42:56 2008 +0000
@@ -20,7 +20,7 @@
 #include "base/Profiler.h"
 #include "base/Pitch.h"
 #include "base/LogRange.h"
-#include "base/ColourDatabase.h"
+#include "ColourDatabase.h"
 #include "view/View.h"
 
 #include "data/model/NoteModel.h"
@@ -623,7 +623,7 @@
     m_editingPoint = NoteModel::Point(frame, value, 0, 0.8, tr("New Point"));
     m_originalPoint = m_editingPoint;
 
-    if (m_editingCommand) m_editingCommand->finish();
+    if (m_editingCommand) finish(m_editingCommand);
     m_editingCommand = new NoteModel::EditCommand(m_model,
 						  tr("Draw Point"));
     m_editingCommand->addPoint(m_editingPoint);
@@ -665,7 +665,7 @@
 {
 //    std::cerr << "NoteLayer::drawEnd(" << e->x() << "," << e->y() << ")" << std::endl;
     if (!m_model || !m_editing) return;
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
@@ -681,7 +681,7 @@
     m_editingPoint = *points.begin();
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
@@ -710,7 +710,7 @@
 
     m_editingCommand->deletePoint(m_editingPoint);
 
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
@@ -729,7 +729,7 @@
     m_originalPoint = m_editingPoint;
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
@@ -781,7 +781,7 @@
 	}
 
 	m_editingCommand->setName(newName);
-	m_editingCommand->finish();
+	finish(m_editingCommand);
     }
 
     m_editingCommand = 0;
@@ -823,7 +823,7 @@
             (m_model, tr("Edit Point"));
         command->deletePoint(note);
         command->addPoint(newNote);
-        command->finish();
+        finish(command);
     }
 
     delete dialog;
@@ -852,7 +852,7 @@
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
@@ -891,7 +891,7 @@
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
@@ -913,7 +913,7 @@
         }
     }
 
-    command->finish();
+    finish(command);
 }    
 
 void
@@ -1011,7 +1011,7 @@
         command->addPoint(newPoint);
     }
 
-    command->finish();
+    finish(command);
     return true;
 }