Mercurial > hg > svcore
diff data/model/ModelDataTableModel.h @ 1069:32ab6c48efaa
Merge from branch tonioni
author | Chris Cannam |
---|---|
date | Mon, 20 Apr 2015 09:11:34 +0100 |
parents | 2f49be7d4264 |
children | ec9e65fcf749 |
line wrap: on
line diff
--- a/data/model/ModelDataTableModel.h Mon Mar 02 17:21:34 2015 +0000 +++ b/data/model/ModelDataTableModel.h Mon Apr 20 09:11:34 2015 +0100 @@ -20,6 +20,8 @@ #include <vector> +#include "base/BaseTypes.h" + class TabularModel; class Command; @@ -51,8 +53,8 @@ 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); @@ -69,7 +71,7 @@ protected slots: void modelChanged(); - void modelChangedWithin(int, int); + void modelChangedWithin(sv_frame_t, sv_frame_t); void modelAboutToBeDeleted(); protected: