X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresessioneventprocessor.cpp;h=3bc78110ba26504007286165bdceed3fb13c9e40;hb=df38a9238d603ec8d2040619befa50980d994916;hp=df4a409189329d6459f5f7f484cdcb0dfaa9c484;hpb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;p=quassel.git

diff --git a/src/core/coresessioneventprocessor.cpp b/src/core/coresessioneventprocessor.cpp
index df4a4091..3bc78110 100644
--- a/src/core/coresessioneventprocessor.cpp
+++ b/src/core/coresessioneventprocessor.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   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  *
@@ -20,6 +20,8 @@
 
 #include "coresessioneventprocessor.h"
 
+#include <algorithm>
+
 #include "coreirclisthelper.h"
 #include "corenetwork.h"
 #include "coresession.h"
@@ -28,7 +30,6 @@
 #include "ctcpevent.h"
 #include "ircevent.h"
 #include "ircuser.h"
-#include "logmessage.h"
 #include "messageevent.h"
 #include "netsplit.h"
 #include "quassel.h"
@@ -407,7 +408,7 @@ void CoreSessionEventProcessor::processIrcEventJoin(IrcEvent* e)
     // Else :nick!user@host JOIN #channelname
 
     bool handledByNetsplit = false;
-    foreach (Netsplit* n, _netsplits.value(e->network())) {
+    for (Netsplit* n : _netsplits.value(e->network())) {
         handledByNetsplit = n->userJoined(e->prefix(), channel);
         if (handledByNetsplit)
             break;
@@ -489,7 +490,7 @@ void CoreSessionEventProcessor::processIrcEventMode(IrcEvent* e)
                         if (add) {
                             bool handledByNetsplit = false;
                             QHash<QString, Netsplit*> splits = _netsplits.value(e->network());
-                            foreach (Netsplit* n, _netsplits.value(e->network())) {
+                            for (Netsplit* n : _netsplits.value(e->network())) {
                                 handledByNetsplit = n->userAlreadyJoined(ircUser->hostmask(), channel->name());
                                 if (handledByNetsplit) {
                                     n->addMode(ircUser->hostmask(), channel->name(), QString(mode));
@@ -1192,7 +1193,7 @@ void CoreSessionEventProcessor::processIrcEvent353(IrcEvent* e)
     // Cache result of multi-prefix to avoid unneeded casts and lookups with each iteration.
     bool _useCapMultiPrefix = coreNetwork(e)->capEnabled(IrcCap::MULTI_PREFIX);
 
-    foreach (QString nick, e->params()[2].split(' ', QString::SkipEmptyParts)) {
+    for (QString nick : e->params()[2].split(' ', QString::SkipEmptyParts)) {
         QString mode;
 
         if (_useCapMultiPrefix) {
@@ -1428,7 +1429,7 @@ void CoreSessionEventProcessor::handleNetsplitJoin(
     QStringList newModes = modes;
     QStringList newUsers = users;
 
-    foreach (const QString& user, users) {
+    for (const QString& user : users) {
         IrcUser* iu = net->ircUser(nickFromMask(user));
         if (iu)
             ircUsers.append(iu);
@@ -1448,10 +1449,9 @@ void CoreSessionEventProcessor::handleNetsplitQuit(Network* net, const QString&
 {
     NetworkSplitEvent* event = new NetworkSplitEvent(EventManager::NetworkSplitQuit, net, channel, users, quitMessage);
     emit newEvent(event);
-    foreach (QString user, users) {
-        IrcUser* iu = net->ircUser(nickFromMask(user));
-        if (iu)
-            iu->quit();
+    for (const QString& user : users) {
+        IrcUser* ircUser = net->ircUser(nickFromMask(user));
+        if (ircUser) ircUser->quit();
     }
 }
 
@@ -1466,19 +1466,19 @@ void CoreSessionEventProcessor::handleEarlyNetsplitJoin(Network* net, const QStr
     QList<IrcUser*> ircUsers;
     QStringList newModes = modes;
 
-    foreach (QString user, users) {
-        IrcUser* iu = net->updateNickFromMask(user);
-        if (iu) {
-            ircUsers.append(iu);
+    for (const QString& user : users) {
+        IrcUser* ircUser = net->updateNickFromMask(user);
+        if (ircUser) {
+            ircUsers.append(ircUser);
             // fake event for scripts that consume join events
-            events << new IrcEvent(EventManager::IrcEventJoin, net, iu->hostmask(), QStringList() << channel);
+            events << new IrcEvent(EventManager::IrcEventJoin, net, {}, ircUser->hostmask(), QStringList() << channel);
         }
         else {
             newModes.removeAt(users.indexOf(user));
         }
     }
     ircChannel->joinIrcUsers(ircUsers, newModes);
-    foreach (NetworkEvent* event, events) {
+    for (NetworkEvent* event : events) {
         event->setFlag(EventManager::Fake);  // ignore this in here!
         emit newEvent(event);
     }
@@ -1536,9 +1536,9 @@ void CoreSessionEventProcessor::handleCtcpAction(CtcpEvent* e)
 void CoreSessionEventProcessor::handleCtcpClientinfo(CtcpEvent* e)
 {
     QStringList supportedHandlers;
-    foreach (QString handler, providesHandlers())
+    for (const QString& handler : providesHandlers())
         supportedHandlers << handler.toUpper();
-    qSort(supportedHandlers);
+    std::sort(supportedHandlers.begin(), supportedHandlers.end());
     e->setReply(supportedHandlers.join(" "));
 }
 
@@ -1548,7 +1548,7 @@ void CoreSessionEventProcessor::handleCtcpDcc(CtcpEvent* e)
 {
     // DCC support is unfinished, experimental and potentially dangerous, so make it opt-in
     if (!Quassel::isOptionSet("enable-experimental-dcc")) {
-        quInfo() << "DCC disabled, start core with --enable-experimental-dcc if you really want to try it out";
+        qInfo() << "DCC disabled, start core with --enable-experimental-dcc if you really want to try it out";
         return;
     }