projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
43e72e1
)
merging latest debug version with trunk
author
Marcus Eggenberger
<egs@quassel-irc.org>
Thu, 17 Apr 2008 20:59:41 +0000
(20:59 +0000)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Thu, 17 Apr 2008 20:59:41 +0000
(20:59 +0000)
src/uisupport/bufferviewfilter.cpp
patch
|
blob
|
history
diff --git
a/src/uisupport/bufferviewfilter.cpp
b/src/uisupport/bufferviewfilter.cpp
index
58a053a
..
49f1673
100644
(file)
--- a/
src/uisupport/bufferviewfilter.cpp
+++ b/
src/uisupport/bufferviewfilter.cpp
@@
-144,9
+144,11
@@
void BufferViewFilter::removeBuffer(const QModelIndex &index) {
bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex) const {
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)
return true;
-
+
if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
return false;
if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
return false;
@@
-157,11
+159,10
@@
bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
return false;
if(_config->minimumActivity() > source_bufferIndex.data(NetworkModel::BufferActivityRole).toInt()) {
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;
}
return false;
}
- BufferId bufferId = sourceModel()->data(source_bufferIndex, NetworkModel::BufferIdRole).value<BufferId>();
return _config->bufferList().contains(bufferId);
}
return _config->bufferList().contains(bufferId);
}
@@
-184,7
+185,7
@@
bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &sourc
return false;
}
return false;
}
- if(
source_parent == QModelIndex
())
+ if(
!source_parent.isValid
())
return filterAcceptNetwork(child);
else
return filterAcceptBuffer(child);
return filterAcceptNetwork(child);
else
return filterAcceptBuffer(child);
@@
-203,6
+204,7
@@
bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelInde
}
bool BufferViewFilter::bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
}
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()) {
BufferId leftBufferId = sourceModel()->data(source_left, NetworkModel::BufferIdRole).value<BufferId>();
BufferId rightBufferId = sourceModel()->data(source_right, NetworkModel::BufferIdRole).value<BufferId>();
if(config()) {