X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.cpp;h=52d6d54c5073b05f1d2fc196a3186c487f271622;hp=e0f80ed12b6caec2448c0acc026c46def328552b;hb=6c06fdd7dbd8215c28b5c99dc7961fa8eabeebaf;hpb=8010224cf5bfe5685dc2cf535e8dc1ec19c4c364 diff --git a/src/client/buffermodel.cpp b/src/client/buffermodel.cpp index e0f80ed1..52d6d54c 100644 --- a/src/client/buffermodel.cpp +++ b/src/client/buffermodel.cpp @@ -28,13 +28,10 @@ BufferModel::BufferModel(NetworkModel *parent) : QSortFilterProxyModel(parent), _selectionModelSynchronizer(this), - _propertyMapper(this) + _standardSelectionModel(this) { setSourceModel(parent); - - // initialize the Property Mapper - _propertyMapper.setModel(this); - _selectionModelSynchronizer.addRegularSelectionModel(_propertyMapper.selectionModel()); + _selectionModelSynchronizer.addRegularSelectionModel(standardSelectionModel()); } BufferModel::~BufferModel() { @@ -63,10 +60,11 @@ void BufferModel::synchronizeView(QAbstractItemView *view) { view->setSelectionModel(mappedSelectionModel); } -void BufferModel::mapProperty(int column, int role, QObject *target, const QByteArray &property) { - _propertyMapper.addMapping(column, role, target, property); +QModelIndex BufferModel::currentIndex() { + return standardSelectionModel()->currentIndex(); } -QModelIndex BufferModel::currentIndex() { - return propertyMapper()->selectionModel()->currentIndex(); +void BufferModel::setCurrentIndex(const QModelIndex &newCurrent) { + _standardSelectionModel.setCurrentIndex(newCurrent, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); + _standardSelectionModel.select(newCurrent, QItemSelectionModel::ClearAndSelect); }