/***************************************************************************
- * 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 *
constexpr auto kTimeoutMs = 5000;
-INIT_SYNCABLE_OBJECT(CoreIrcListHelper)
-QVariantList CoreIrcListHelper::requestChannelList(const NetworkId &netId, const QStringList &channelFilters)
+QVariantList CoreIrcListHelper::requestChannelList(const NetworkId& netId, const QStringList& channelFilters)
{
if (_finishedChannelLists.contains(netId))
return _finishedChannelLists.take(netId);
return QVariantList();
}
-
-bool CoreIrcListHelper::addChannel(const NetworkId &netId, const QString &channelName, quint32 userCount, const QString &topic)
+bool CoreIrcListHelper::addChannel(const NetworkId& netId, const QString& channelName, quint32 userCount, const QString& topic)
{
if (!_channelLists.contains(netId))
return false;
return true;
}
-
-bool CoreIrcListHelper::dispatchQuery(const NetworkId &netId, const QString &query)
+bool CoreIrcListHelper::dispatchQuery(const NetworkId& netId, const QString& query)
{
- CoreNetwork *network = coreSession()->network(netId);
+ CoreNetwork* network = coreSession()->network(netId);
if (network) {
_channelLists[netId] = QList<ChannelDescription>();
network->userInputHandler()->handleList(BufferInfo(), query);
}
}
-
-bool CoreIrcListHelper::endOfChannelList(const NetworkId &netId)
+bool CoreIrcListHelper::endOfChannelList(const NetworkId& netId)
{
if (_queryTimeoutByNetId.contains(netId)) {
// If we recieved an actual RPL_LISTEND, remove the timer
}
else if (_channelLists.contains(netId)) {
QVariantList channelList;
- foreach(ChannelDescription channel, _channelLists[netId]) {
+ foreach (ChannelDescription channel, _channelLists[netId]) {
QVariantList channelVariant;
- channelVariant << channel.channelName
- << channel.userCount
- << channel.topic;
- channelList << qVariantFromValue<QVariant>(channelVariant);
+ channelVariant << channel.channelName << channel.userCount << channel.topic;
+ channelList << QVariant::fromValue<QVariant>(channelVariant);
}
_finishedChannelLists[netId] = channelList;
_channelLists.remove(netId);
}
}
-
-void CoreIrcListHelper::timerEvent(QTimerEvent *event)
+void CoreIrcListHelper::timerEvent(QTimerEvent* event)
{
if (!_queryTimeoutByTimerId.contains(event->timerId())) {
IrcListHelper::timerEvent(event);