X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickviewfilter.cpp;h=5058de7c6b18c58b82c06da80b6fe2e849e07b69;hp=83a7ce33308fc82208421ef10eb7553cb29f4b11;hb=52209badc8e769e50aa3019b63689dda0e79e9d0;hpb=9d54503555534a2c554f09a33df6afa33d6308ec diff --git a/src/uisupport/nickviewfilter.cpp b/src/uisupport/nickviewfilter.cpp index 83a7ce33..5058de7c 100644 --- a/src/uisupport/nickviewfilter.cpp +++ b/src/uisupport/nickviewfilter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -22,16 +22,15 @@ #include "buffersettings.h" #include "graphicalui.h" -#include "iconloader.h" #include "networkmodel.h" #include "uistyle.h" /****************************************************************************************** * NickViewFilter ******************************************************************************************/ -NickViewFilter::NickViewFilter(const BufferId &bufferId, NetworkModel *parent) - : QSortFilterProxyModel(parent), - _bufferId(bufferId) +NickViewFilter::NickViewFilter(const BufferId& bufferId, NetworkModel* parent) + : QSortFilterProxyModel(parent) + , _bufferId(bufferId) { setSourceModel(parent); setDynamicSortFilter(true); @@ -39,19 +38,17 @@ NickViewFilter::NickViewFilter(const BufferId &bufferId, NetworkModel *parent) setSortRole(TreeModel::SortRole); } - -bool NickViewFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const +bool NickViewFilter::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const { // root node, networkindexes, the bufferindex of the buffer this filter is active for and it's children are accepted if (!source_parent.isValid()) return true; - QModelIndex source_child = source_parent.child(source_row, 0); + QModelIndex source_child = source_parent.model()->index(source_row, 0, source_parent); return (sourceModel()->data(source_child, NetworkModel::BufferIdRole).value() == _bufferId); } - -QVariant NickViewFilter::data(const QModelIndex &index, int role) const +QVariant NickViewFilter::data(const QModelIndex& index, int role) const { switch (role) { case Qt::FontRole: