changeset 417:12b7bf0c3915

* Compile fixes
author Chris Cannam
date Tue, 10 Jun 2008 09:11:42 +0000
parents a00902d5f0ab
children d35d4e79c95b
files data/model/ModelDataTableModel.cpp
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/data/model/ModelDataTableModel.cpp	Mon Jun 09 16:01:50 2008 +0000
+++ b/data/model/ModelDataTableModel.cpp	Tue Jun 10 09:11:42 2008 +0000
@@ -19,6 +19,8 @@
 #include "SparseOneDimensionalModel.h"
 #include "SparseModel.h"
 
+#include <algorithm>
+
 ModelDataTableModel::ModelDataTableModel(Model *m) :
     m_model(m)
 {
@@ -99,7 +101,7 @@
 
         case 1:
             std::cerr << "Returning frame " << frame << std::endl;
-            return QVariant(frame); //!!! RealTime
+            return QVariant(int(frame));
 
         case 2:
             if (dynamic_cast<const SparseOneDimensionalModel *>(m_model)) {
@@ -168,7 +170,7 @@
         PointListType;
     typedef typename ModelType::EditCommand EditCommandType;
 
-    ModelType *sm = dynamic_cast<const ModelType *>(m_model);
+    ModelType *sm = dynamic_cast<ModelType *>(m_model);
     const PointListType &points = sm->getPoints(frame);
 
     // it is possible to have more than one point at the same frame