diff layer/TimeValueLayer.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 67f82da3d29c
children 1304dbe4542e
line wrap: on
line diff
--- a/layer/TimeValueLayer.cpp	Wed Mar 12 14:40:18 2008 +0000
+++ b/layer/TimeValueLayer.cpp	Wed Mar 12 17:42:56 2008 +0000
@@ -19,7 +19,7 @@
 #include "base/RealTime.h"
 #include "base/Profiler.h"
 #include "base/LogRange.h"
-#include "base/ColourDatabase.h"
+#include "ColourDatabase.h"
 #include "view/View.h"
 
 #include "data/model/SparseTimeValueModel.h"
@@ -29,7 +29,7 @@
 #include "widgets/ListInputDialog.h"
 
 #include "SpectrogramLayer.h" // for optional frequency alignment
-#include "base/ColourMapper.h"
+#include "ColourMapper.h"
 
 #include <QPainter>
 #include <QPainterPath>
@@ -875,7 +875,7 @@
 
     m_originalPoint = m_editingPoint;
 
-    if (m_editingCommand) m_editingCommand->finish();
+    if (m_editingCommand) finish(m_editingCommand);
     m_editingCommand = new SparseTimeValueModel::EditCommand(m_model,
 							     tr("Draw Point"));
     if (!havePoint) {
@@ -942,7 +942,7 @@
 {
 //    std::cerr << "TimeValueLayer::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;
 }
@@ -958,7 +958,7 @@
     m_editingPoint = *points.begin();
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
@@ -987,7 +987,7 @@
 
     m_editingCommand->deletePoint(m_editingPoint);
 
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
@@ -1006,7 +1006,7 @@
     m_originalPoint = m_editingPoint;
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
@@ -1058,7 +1058,7 @@
 	}
 
 	m_editingCommand->setName(newName);
-	m_editingCommand->finish();
+	finish(m_editingCommand);
     }
 
     m_editingCommand = 0;
@@ -1097,7 +1097,7 @@
             new SparseTimeValueModel::EditCommand(m_model, tr("Edit Point"));
         command->deletePoint(point);
         command->addPoint(newPoint);
-        command->finish();
+        finish(command);
     }
 
     delete dialog;
@@ -1127,7 +1127,7 @@
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
@@ -1162,7 +1162,7 @@
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
@@ -1185,7 +1185,7 @@
         }
     }
 
-    command->finish();
+    finish(command);
 }    
 
 void
@@ -1401,7 +1401,7 @@
         command->addPoint(newPoint);
     }
 
-    command->finish();
+    finish(command);
     return true;
 }