common: Port remote nicks to NickHighlightMatcher

[quassel.git] / src / client / clientirclisthelper.cpp

diff --git a/src/client/clientirclisthelper.cpp b/src/client/clientirclisthelper.cpp
index fd52b9a..acfb73e 100644 (file)
--- a/src/client/clientirclisthelper.cpp
+++ b/src/client/clientirclisthelper.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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"
@@ -26,30 +26,34 @@
 #include "irclistmodel.h"
 
 INIT_SYNCABLE_OBJECT(ClientIrcListHelper)
-QVariantList ClientIrcListHelper::requestChannelList(const NetworkId &netId, const QStringList &channelFilters) {
-  _netId = netId;
-  return IrcListHelper::requestChannelList(netId, channelFilters);
+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<ChannelDescription> 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<ChannelDescription> 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);
+    }
+}