projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BufferViewOverlay now correctly respects filtering of buffer types
[quassel.git]
/
src
/
uisupport
/
bufferviewoverlayfilter.cpp
diff --git
a/src/uisupport/bufferviewoverlayfilter.cpp
b/src/uisupport/bufferviewoverlayfilter.cpp
index
992ab6c
..
4309ee9
100644
(file)
--- a/
src/uisupport/bufferviewoverlayfilter.cpp
+++ b/
src/uisupport/bufferviewoverlayfilter.cpp
@@
-83,10
+83,6
@@
bool BufferViewOverlayFilter::filterAcceptsRow(int source_row, const QModelIndex
if(_overlay->minimumActivity() > activityLevel)
return false;
if(_overlay->minimumActivity() > activityLevel)
return false;
- bool isActive = sourceModel()->data(source_bufferIndex, NetworkModel::ItemActiveRole).toBool();
- if(_overlay->hideInactiveBuffers() && !isActive && activityLevel <= BufferInfo::OtherActivity)
- return false;
-
int bufferType = sourceModel()->data(source_bufferIndex, NetworkModel::BufferTypeRole).toInt();
if(!(_overlay->allowedBufferTypes() & bufferType))
return false;
int bufferType = sourceModel()->data(source_bufferIndex, NetworkModel::BufferTypeRole).toInt();
if(!(_overlay->allowedBufferTypes() & bufferType))
return false;
@@
-104,6
+100,7
@@
bool BufferViewOverlayFilter::filterAcceptsRow(int source_row, const QModelIndex
return false;
// the buffer is not known to us
return false;
// the buffer is not known to us
- return _overlay->addBuffersAutomatically();
+ qDebug() << "BufferViewOverlayFilter::filterAcceptsRow()" << bufferId << "is unknown!";
+ return false;
}
}