projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssl: Require SSL support in Qt
[quassel.git]
/
src
/
core
/
coreirclisthelper.cpp
diff --git
a/src/core/coreirclisthelper.cpp
b/src/core/coreirclisthelper.cpp
index
1c4bfde
..
2325081
100644
(file)
--- a/
src/core/coreirclisthelper.cpp
+++ b/
src/core/coreirclisthelper.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-25,8
+25,7
@@
constexpr auto kTimeoutMs = 5000;
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);
{
if (_finishedChannelLists.contains(netId))
return _finishedChannelLists.take(netId);
@@
-40,8
+39,7
@@
QVariantList CoreIrcListHelper::requestChannelList(const NetworkId &netId, const
return QVariantList();
}
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;
{
if (!_channelLists.contains(netId))
return false;
@@
-53,10
+51,9
@@
bool CoreIrcListHelper::addChannel(const NetworkId &netId, const QString &channe
return true;
}
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);
if (network) {
_channelLists[netId] = QList<ChannelDescription>();
network->userInputHandler()->handleList(BufferInfo(), query);
@@
-73,8
+70,7
@@
bool CoreIrcListHelper::dispatchQuery(const NetworkId &netId, const QString &que
}
}
}
}
-
-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
{
if (_queryTimeoutByNetId.contains(netId)) {
// If we recieved an actual RPL_LISTEND, remove the timer
@@
-88,12
+84,10
@@
bool CoreIrcListHelper::endOfChannelList(const NetworkId &netId)
}
else if (_channelLists.contains(netId)) {
QVariantList channelList;
}
else if (_channelLists.contains(netId)) {
QVariantList channelList;
- foreach(ChannelDescription channel, _channelLists[netId]) {
+ foreach
(ChannelDescription channel, _channelLists[netId]) {
QVariantList channelVariant;
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);
}
_finishedChannelLists[netId] = channelList;
_channelLists.remove(netId);
@@
-105,8
+99,7
@@
bool CoreIrcListHelper::endOfChannelList(const NetworkId &netId)
}
}
}
}
-
-void CoreIrcListHelper::timerEvent(QTimerEvent *event)
+void CoreIrcListHelper::timerEvent(QTimerEvent* event)
{
if (!_queryTimeoutByTimerId.contains(event->timerId())) {
IrcListHelper::timerEvent(event);
{
if (!_queryTimeoutByTimerId.contains(event->timerId())) {
IrcListHelper::timerEvent(event);