/***************************************************************************
- * Copyright (C) 2005-2018 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "networkmodel.h"
+#include <algorithm>
#include <utility>
#include <QAbstractItemView>
else
return QVariant();
case NetworkModel::NetworkIdRole:
- return qVariantFromValue(_networkId);
+ return QVariant::fromValue(_networkId);
case NetworkModel::ItemTypeRole:
return NetworkModel::NetworkItemType;
case NetworkModel::ItemActiveRole:
case NetworkModel::ItemTypeRole:
return NetworkModel::BufferItemType;
case NetworkModel::BufferIdRole:
- return qVariantFromValue(bufferInfo().bufferId());
+ return QVariant::fromValue(bufferInfo().bufferId());
case NetworkModel::NetworkIdRole:
- return qVariantFromValue(bufferInfo().networkId());
+ return QVariant::fromValue(bufferInfo().networkId());
case NetworkModel::BufferInfoRole:
- return qVariantFromValue(bufferInfo());
+ return QVariant::fromValue(bufferInfo());
case NetworkModel::BufferTypeRole:
return int(bufferType());
case NetworkModel::ItemActiveRole:
case NetworkModel::BufferActivityRole:
return (int)activityLevel();
case NetworkModel::BufferFirstUnreadMsgIdRole:
- return qVariantFromValue(firstUnreadMsgId());
+ return QVariant::fromValue(firstUnreadMsgId());
case NetworkModel::MarkerLineMsgIdRole:
- return qVariantFromValue(markerLineMsgId());
+ return QVariant::fromValue(markerLineMsgId());
default:
return PropertyMapItem::data(column, role);
}
case Qt::EditRole:
return BufferItem::data(column, Qt::DisplayRole);
case NetworkModel::IrcUserRole:
- return QVariant::fromValue<QObject*>(_ircUser);
+ return QVariant::fromValue(_ircUser);
case NetworkModel::UserAwayRole:
return (bool)_ircUser ? _ircUser->isAway() : false;
default:
{
switch (role) {
case NetworkModel::IrcChannelRole:
- return QVariant::fromValue<QObject*>(_ircChannel);
+ return QVariant::fromValue(_ircChannel);
default:
return BufferItem::data(column, role);
}
case NetworkModel::IrcChannelRole:
return parent()->data(column, role);
case NetworkModel::IrcUserRole:
- return QVariant::fromValue<QObject*>(_ircUser.data());
+ return QVariant::fromValue(_ircUser.data());
case NetworkModel::UserAwayRole:
return (bool)_ircUser ? _ircUser->isAway() : false;
default:
return;
for (int row = start; row <= end; row++) {
- _bufferItemCache.remove(parent.child(row, 0).data(BufferIdRole).value<BufferId>());
+ _bufferItemCache.remove(index(row, 0, parent).data(BufferIdRole).value<BufferId>());
}
}
return;
for (int row = start; row <= end; row++) {
- QModelIndex child = parent.child(row, 0);
+ QModelIndex child = parent.model()->index(row, 0, parent);
_bufferItemCache[child.data(BufferIdRole).value<BufferId>()] = static_cast<BufferItem*>(child.internalPointer());
}
}
bufferItems << _bufferItemCache[bufferId];
}
- qSort(bufferItems.begin(), bufferItems.end(), bufferItemLessThan);
+ std::sort(bufferItems.begin(), bufferItems.end(), bufferItemLessThan);
bufferIds.clear();
foreach (BufferItem* bufferItem, bufferItems) {