bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
+ BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
+ Q_ASSERT(bufferId.isValid());
if(!_config)
return true;
-
+
if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
return false;
return false;
if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) {
- if(!Client::bufferModel()->standardSelectionModel()->isSelected(source_bufferIndex))
+ if(bufferId != Client::bufferModel()->standardSelectionModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>())
return false;
}
- BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
return _config->bufferList().contains(bufferId);
}
return false;
}
- if(source_parent == QModelIndex())
+ if(!source_parent.isValid())
return filterAcceptNetwork(child);
else
return filterAcceptBuffer(child);
}
bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
+ return QSortFilterProxyModel::lessThan(source_left, source_right);
BufferId leftBufferId = sourceModel()->data(source_left, NetworkModel::BufferIdRole).value<BufferId>();
BufferId rightBufferId = sourceModel()->data(source_right, NetworkModel::BufferIdRole).value<BufferId>();
if(config()) {