Mercurial > hg > svcore
diff data/model/ModelDataTableModel.h @ 936:0c1d6de8f44b
Merge from branch warnfix_no_size_t
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 13:51:16 +0100 |
parents | 59e7fe1b1003 |
children | cd42620e3f40 |
line wrap: on
line diff
--- a/data/model/ModelDataTableModel.h Tue Jun 03 11:05:49 2014 +0100 +++ b/data/model/ModelDataTableModel.h Wed Jun 18 13:51:16 2014 +0100 @@ -51,8 +51,8 @@ int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; - QModelIndex getModelIndexForFrame(size_t frame) const; - size_t getFrameForModelIndex(const QModelIndex &) const; + QModelIndex getModelIndexForFrame(int frame) const; + int getFrameForModelIndex(const QModelIndex &) const; void sort(int column, Qt::SortOrder order = Qt::AscendingOrder); @@ -62,14 +62,14 @@ int getCurrentRow() const; signals: - void frameSelected(size_t); + void frameSelected(int); void addCommand(Command *); void currentChanged(const QModelIndex &); void modelRemoved(); protected slots: void modelChanged(); - void modelChanged(size_t, size_t); + void modelChanged(int, int); void modelAboutToBeDeleted(); protected: