X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientirclisthelper.cpp;h=acfb73e7828a09bde4855072c0502ae77af2b0c2;hp=65775de28f7fbabb53d2c6c5fc49b59d1c3b6802;hb=ee8b9f55860e340c1600188fddcfd557c7489f66;hpb=fe4b38e66592f11fdf4c4651863968983daecd2d diff --git a/src/client/clientirclisthelper.cpp b/src/client/clientirclisthelper.cpp index 65775de2..acfb73e7 100644 --- a/src/client/clientirclisthelper.cpp +++ b/src/client/clientirclisthelper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "clientirclisthelper.h" @@ -25,30 +25,35 @@ #include "client.h" #include "irclistmodel.h" -QVariantList ClientIrcListHelper::requestChannelList(const NetworkId &netId, const QStringList &channelFilters) { - _netId = netId; - return IrcListHelper::requestChannelList(netId, channelFilters); +INIT_SYNCABLE_OBJECT(ClientIrcListHelper) +QVariantList ClientIrcListHelper::requestChannelList(const NetworkId &netId, const QStringList &channelFilters) +{ + _netId = netId; + return IrcListHelper::requestChannelList(netId, channelFilters); } -void ClientIrcListHelper::receiveChannelList(const NetworkId &netId, const QStringList &channelFilters, const QVariantList &channels) { - QVariantList::const_iterator iter = channels.constBegin(); - QVariantList::const_iterator iterEnd = channels.constEnd(); - QList channelList; - while(iter != iterEnd) { - QVariantList channelVar = iter->toList(); - ChannelDescription channelDescription(channelVar[0].toString(), channelVar[1].toUInt(), channelVar[2].toString()); - channelList << channelDescription; - iter++; - } +void ClientIrcListHelper::receiveChannelList(const NetworkId &netId, const QStringList &channelFilters, const QVariantList &channels) +{ + QVariantList::const_iterator iter = channels.constBegin(); + QVariantList::const_iterator iterEnd = channels.constEnd(); - emit channelListReceived(netId, channelFilters, channelList); -} + QList channelList; + while (iter != iterEnd) { + QVariantList channelVar = iter->toList(); + ChannelDescription channelDescription(channelVar[0].toString(), channelVar[1].toUInt(), channelVar[2].toString()); + channelList << channelDescription; + ++iter; + } -void ClientIrcListHelper::reportFinishedList(const NetworkId &netId) { - if(_netId == netId) { - requestChannelList(netId, QStringList()); - emit finishedListReported(netId); - } + emit channelListReceived(netId, channelFilters, channelList); } + +void ClientIrcListHelper::reportFinishedList(const NetworkId &netId) +{ + if (_netId == netId) { + requestChannelList(netId, QStringList()); + emit finishedListReported(netId); + } +}