X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagefilter.cpp;h=55f609c7f7f08bf2e07eb3a72de35734fca4e854;hp=39fd3eb733b203d8e5c92cf393bfc3e041173d3c;hb=b3cf44aa5773bb6a6e0a1ba8d0c1add841281b4b;hpb=98bec7bab038a8e656f90617c59fe1e8c0907f71 diff --git a/src/client/messagefilter.cpp b/src/client/messagefilter.cpp index 39fd3eb7..55f609c7 100644 --- a/src/client/messagefilter.cpp +++ b/src/client/messagefilter.cpp @@ -135,7 +135,7 @@ bool MessageFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourcePar return true; } - MsgId msgId = sourceIdx.data(MessageModel::MsgIdRole).value(); + // MsgId msgId = sourceIdx.data(MessageModel::MsgIdRole).value(); Message::Flags flags = (Message::Flags)sourceIdx.data(MessageModel::FlagsRole).toInt(); NetworkId myNetworkId = networkId(); @@ -154,12 +154,12 @@ bool MessageFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourcePar switch(messageType) { case Message::Notice: if(Client::networkModel()->bufferType(bufferId) != BufferInfo::ChannelBuffer) { - if(flags & Message::ServerMsg) { - // server notice - redirectionTarget = _serverNoticesTarget; - } else { - redirectionTarget = _userNoticesTarget; - } + if(flags & Message::ServerMsg) { + // server notice + redirectionTarget = _serverNoticesTarget; + } else { + redirectionTarget = _userNoticesTarget; + } } break; case Message::Error: @@ -175,21 +175,21 @@ bool MessageFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourcePar if(redirectionTarget & BufferSettings::CurrentBuffer && !(flags & Message::Backlog)) { BufferId redirectedTo = sourceModel()->data(sourceIdx, MessageModel::RedirectedToRole).value(); if(!redirectedTo.isValid()) { - BufferId redirectedTo = Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value(); - if(redirectedTo.isValid()) - sourceModel()->setData(sourceIdx, QVariant::fromValue(redirectedTo), MessageModel::RedirectedToRole); + BufferId redirectedTo = Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value(); + if(redirectedTo.isValid()) + sourceModel()->setData(sourceIdx, QVariant::fromValue(redirectedTo), MessageModel::RedirectedToRole); } if(_validBuffers.contains(redirectedTo)) - return true; + return true; } if(redirectionTarget & BufferSettings::StatusBuffer) { QSet::const_iterator idIter = _validBuffers.constBegin(); while(idIter != _validBuffers.constEnd()) { - if(Client::networkModel()->bufferType(*idIter) == BufferInfo::StatusBuffer) - return true; - idIter++; + if(Client::networkModel()->bufferType(*idIter) == BufferInfo::StatusBuffer) + return true; + idIter++; } }