projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #163 from esainane/fix-ssl-identd-race
[quassel.git]
/
src
/
uisupport
/
bufferviewfilter.cpp
diff --git
a/src/uisupport/bufferviewfilter.cpp
b/src/uisupport/bufferviewfilter.cpp
index
30839f6
..
c829267
100644
(file)
--- a/
src/uisupport/bufferviewfilter.cpp
+++ b/
src/uisupport/bufferviewfilter.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
2
by the Quassel Project *
+ * Copyright (C) 2005-201
5
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-30,7
+30,6
@@
#include "client.h"
#include "clientbufferviewconfig.h"
#include "graphicalui.h"
#include "client.h"
#include "clientbufferviewconfig.h"
#include "graphicalui.h"
-#include "iconloader.h"
#include "networkmodel.h"
#include "uistyle.h"
#include "networkmodel.h"
#include "uistyle.h"
@@
-162,12
+161,12
@@
void BufferViewFilter::enableEditMode(bool enable)
if (enable == false) {
addBuffers(QList<BufferId>::fromSet(_toAdd));
QSet<BufferId>::const_iterator iter;
if (enable == false) {
addBuffers(QList<BufferId>::fromSet(_toAdd));
QSet<BufferId>::const_iterator iter;
- for (iter = _toTempRemove.constBegin(); iter != _toTempRemove.constEnd();
iter++
) {
+ for (iter = _toTempRemove.constBegin(); iter != _toTempRemove.constEnd();
++iter
) {
if (config()->temporarilyRemovedBuffers().contains(*iter))
continue;
config()->requestRemoveBuffer(*iter);
}
if (config()->temporarilyRemovedBuffers().contains(*iter))
continue;
config()->requestRemoveBuffer(*iter);
}
- for (iter = _toRemove.constBegin(); iter != _toRemove.constEnd();
iter++
) {
+ for (iter = _toRemove.constBegin(); iter != _toRemove.constEnd();
++iter
) {
if (config()->removedBuffers().contains(*iter))
continue;
config()->requestRemoveBufferPermanently(*iter);
if (config()->removedBuffers().contains(*iter))
continue;
config()->requestRemoveBufferPermanently(*iter);
@@
-377,6
+376,10
@@
bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) cons
if (!config())
return true;
if (!config())
return true;
+ if (config()->hideInactiveNetworks() && !(sourceModel()->data(source_index, NetworkModel::ItemActiveRole).toBool())) {
+ return false;
+ }
+
if (!config()->networkId().isValid()) {
return true;
}
if (!config()->networkId().isValid()) {
return true;
}