projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging r732:766 from trunk to branches/0.3.
[quassel.git]
/
src
/
client
/
buffermodel.h
diff --git
a/src/client/buffermodel.h
b/src/client/buffermodel.h
index
0be559a
..
3126f73
100644
(file)
--- a/
src/client/buffermodel.h
+++ b/
src/client/buffermodel.h
@@
-36,12
+36,11
@@
class BufferModel : public QSortFilterProxyModel {
public:
BufferModel(NetworkModel *parent = 0);
public:
BufferModel(NetworkModel *parent = 0);
- virtual ~BufferModel();
bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const;
inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const;
inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
- inline QItemSelectionModel *standardSelectionModel() const { return
const_cast<QItemSelectionModel *>(&_standardSelectionModel
); }
+ inline QItemSelectionModel *standardSelectionModel() const { return
_selectionModelSynchronizer.selectionModel(
); }
void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
void synchronizeView(QAbstractItemView *view);
void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
void synchronizeView(QAbstractItemView *view);
@@
-49,9
+48,12
@@
public:
QModelIndex currentIndex();
void setCurrentIndex(const QModelIndex &newCurrent);
QModelIndex currentIndex();
void setCurrentIndex(const QModelIndex &newCurrent);
+private slots:
+ void debug_currentChanged(QModelIndex current, QModelIndex previous);
+ void debug_selectionChanged(QItemSelection current , QItemSelection previous);
+
private:
SelectionModelSynchronizer _selectionModelSynchronizer;
private:
SelectionModelSynchronizer _selectionModelSynchronizer;
- QItemSelectionModel _standardSelectionModel;
};
#endif // BUFFERMODEL_H
};
#endif // BUFFERMODEL_H