comparison data/model/ModelDataTableModel.h @ 935:f960d67ce842 tonioni

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:42:01 +0100
parents 59e7fe1b1003
children cd42620e3f40
comparison
equal deleted inserted replaced
925:3efc20c59a94 935:f960d67ce842
49 QModelIndex parent(const QModelIndex &index) const; 49 QModelIndex parent(const QModelIndex &index) const;
50 50
51 int rowCount(const QModelIndex &parent = QModelIndex()) const; 51 int rowCount(const QModelIndex &parent = QModelIndex()) const;
52 int columnCount(const QModelIndex &parent = QModelIndex()) const; 52 int columnCount(const QModelIndex &parent = QModelIndex()) const;
53 53
54 QModelIndex getModelIndexForFrame(size_t frame) const; 54 QModelIndex getModelIndexForFrame(int frame) const;
55 size_t getFrameForModelIndex(const QModelIndex &) const; 55 int getFrameForModelIndex(const QModelIndex &) const;
56 56
57 void sort(int column, Qt::SortOrder order = Qt::AscendingOrder); 57 void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
58 58
59 QModelIndex findText(QString text) const; 59 QModelIndex findText(QString text) const;
60 60
61 void setCurrentRow(int row); 61 void setCurrentRow(int row);
62 int getCurrentRow() const; 62 int getCurrentRow() const;
63 63
64 signals: 64 signals:
65 void frameSelected(size_t); 65 void frameSelected(int);
66 void addCommand(Command *); 66 void addCommand(Command *);
67 void currentChanged(const QModelIndex &); 67 void currentChanged(const QModelIndex &);
68 void modelRemoved(); 68 void modelRemoved();
69 69
70 protected slots: 70 protected slots:
71 void modelChanged(); 71 void modelChanged();
72 void modelChanged(size_t, size_t); 72 void modelChanged(int, int);
73 void modelAboutToBeDeleted(); 73 void modelAboutToBeDeleted();
74 74
75 protected: 75 protected:
76 TabularModel *m_model; 76 TabularModel *m_model;
77 int m_sortColumn; 77 int m_sortColumn;