comparison data/model/ModelDataTableModel.h @ 1057:5c5d4863b428 tonioni

Merge from cxx11 branch

 #define _MODEL_DATA_TABLE_MODEL_H_
 
 #include <QAbstractItemModel>
 
 #include <vector>
+
+#include "base/BaseTypes.h"
 
 class TabularModel;
 class Command;
 
 class ModelDataTableModel : public QAbstractItemModel

     QModelIndex parent(const QModelIndex &index) const;
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
 
-    QModelIndex getModelIndexForFrame(int frame) const;
-    int getFrameForModelIndex(const QModelIndex &) const;
+    QModelIndex getModelIndexForFrame(sv_frame_t frame) const;
+    sv_frame_t getFrameForModelIndex(const QModelIndex &) const;
 
     void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
 
     QModelIndex findText(QString text) const;
 

     void currentChanged(const QModelIndex &);
     void modelRemoved();
 
 protected slots:
     void modelChanged();
-    void modelChangedWithin(int, int);
+    void modelChangedWithin(sv_frame_t, sv_frame_t);
     void modelAboutToBeDeleted();
 
 protected:
     TabularModel *m_model;
     int m_sortColumn;