X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferhotlistfilter.cpp;fp=src%2Fuisupport%2Fbufferhotlistfilter.cpp;h=6297639dc09458fd9fdb0df4306fbf25289961f1;hp=1c262271d5ac0eeda86162fab41df006856c47e7;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d diff --git a/src/uisupport/bufferhotlistfilter.cpp b/src/uisupport/bufferhotlistfilter.cpp index 1c262271..6297639d 100644 --- a/src/uisupport/bufferhotlistfilter.cpp +++ b/src/uisupport/bufferhotlistfilter.cpp @@ -23,47 +23,52 @@ #include "networkmodel.h" BufferHotListFilter::BufferHotListFilter(QAbstractItemModel *source, QObject *parent) - : QSortFilterProxyModel(parent) + : QSortFilterProxyModel(parent) { - setSourceModel(source); - setDynamicSortFilter(true); - sort(0, Qt::DescendingOrder); // enable sorting... this is "usually" triggered by a enabling setSortingEnabled(true) on a view; + setSourceModel(source); + setDynamicSortFilter(true); + sort(0, Qt::DescendingOrder); // enable sorting... this is "usually" triggered by a enabling setSortingEnabled(true) on a view; } -bool BufferHotListFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const { - Q_ASSERT(sourceModel()); - QModelIndex source_index = sourceModel()->index(source_row, 0, source_parent); - MsgId firstUnreadMsgId = sourceModel()->data(source_index, NetworkModel::BufferFirstUnreadMsgIdRole).value(); - if(!firstUnreadMsgId.isValid()) - return false; +bool BufferHotListFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const +{ + Q_ASSERT(sourceModel()); + QModelIndex source_index = sourceModel()->index(source_row, 0, source_parent); + + MsgId firstUnreadMsgId = sourceModel()->data(source_index, NetworkModel::BufferFirstUnreadMsgIdRole).value(); + if (!firstUnreadMsgId.isValid()) + return false; - // filter out statusbuffers (it's accessable as networkitem) - BufferInfo::Type bufferType = (BufferInfo::Type)sourceModel()->data(source_index, NetworkModel::BufferTypeRole).toInt(); - if(bufferType == BufferInfo::StatusBuffer) { - NetworkModel::ItemType itemType = (NetworkModel::ItemType)sourceModel()->data(source_index, NetworkModel::ItemTypeRole).toInt(); - return itemType == NetworkModel::NetworkItemType; - } + // filter out statusbuffers (it's accessable as networkitem) + BufferInfo::Type bufferType = (BufferInfo::Type)sourceModel()->data(source_index, NetworkModel::BufferTypeRole).toInt(); + if (bufferType == BufferInfo::StatusBuffer) { + NetworkModel::ItemType itemType = (NetworkModel::ItemType)sourceModel()->data(source_index, NetworkModel::ItemTypeRole).toInt(); + return itemType == NetworkModel::NetworkItemType; + } - return true; + return true; } -bool BufferHotListFilter::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { - int leftActivity = sourceModel()->data(source_left, NetworkModel::BufferActivityRole).toInt(); - int rightActivity = sourceModel()->data(source_right, NetworkModel::BufferActivityRole).toInt(); - if(leftActivity != rightActivity) - return leftActivity < rightActivity; - MsgId leftUnreadMsgId = sourceModel()->data(source_left, NetworkModel::BufferFirstUnreadMsgIdRole).value(); - MsgId rightUnreadMsgId = sourceModel()->data(source_right, NetworkModel::BufferFirstUnreadMsgIdRole).value(); - return leftUnreadMsgId > rightUnreadMsgId; // newer messages are treated to be "less" +bool BufferHotListFilter::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const +{ + int leftActivity = sourceModel()->data(source_left, NetworkModel::BufferActivityRole).toInt(); + int rightActivity = sourceModel()->data(source_right, NetworkModel::BufferActivityRole).toInt(); + if (leftActivity != rightActivity) + return leftActivity < rightActivity; + + MsgId leftUnreadMsgId = sourceModel()->data(source_left, NetworkModel::BufferFirstUnreadMsgIdRole).value(); + MsgId rightUnreadMsgId = sourceModel()->data(source_right, NetworkModel::BufferFirstUnreadMsgIdRole).value(); + return leftUnreadMsgId > rightUnreadMsgId; // newer messages are treated to be "less" } + // QVariant BufferHotListFilter::data(const QModelIndex &index, int role) const { // QVariant d = QSortFilterProxyModel::data(index, role); // if(role == Qt::DisplayRole) { -// int activity = QSortFilterProxyModel::data(index, NetworkModel::BufferActivityRole).toInt(); +// int activity = QSortFilterProxyModel::data(index, NetworkModel::BufferActivityRole).toInt(); // MsgId unreadMsgId = QSortFilterProxyModel::data(index, NetworkModel::BufferFirstUnreadMsgIdRole).value(); // return QString("%1 %2 %3").arg(d.toString()).arg(activity).arg(unreadMsgId.toInt()); // }