X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresessioneventprocessor.cpp;h=ec988ff5ed7b1ebf10afee0a684939373a1ad037;hb=145a52eb79fed146731f85c23b60f0609e40e785;hp=c1807ab866812c022eed0cd5e67e9ee94ed40f5e;hpb=d030c159599a22c9023b8f0d34909d3277707f52;p=quassel.git

diff --git a/src/core/coresessioneventprocessor.cpp b/src/core/coresessioneventprocessor.cpp
index c1807ab8..ec988ff5 100644
--- a/src/core/coresessioneventprocessor.cpp
+++ b/src/core/coresessioneventprocessor.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2019 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"
@@ -132,9 +134,7 @@ void CoreSessionEventProcessor::processIrcEventAuthenticate(IrcEvent* e)
 
     CoreNetwork* net = coreNetwork(e);
 
-#ifdef HAVE_SSL
     if (net->identityPtr()->sslCert().isNull()) {
-#endif
         QString construct = net->saslAccount();
         construct.append(QChar(QChar::Null));
         construct.append(net->saslAccount());
@@ -143,12 +143,10 @@ void CoreSessionEventProcessor::processIrcEventAuthenticate(IrcEvent* e)
         QByteArray saslData = QByteArray(construct.toLatin1().toBase64());
         saslData.prepend("AUTHENTICATE ");
         net->putRawLine(saslData);
-#ifdef HAVE_SSL
     }
     else {
         net->putRawLine("AUTHENTICATE +");
     }
-#endif
 }
 
 void CoreSessionEventProcessor::processIrcEventCap(IrcEvent* e)
@@ -1469,7 +1467,7 @@ void CoreSessionEventProcessor::handleEarlyNetsplitJoin(Network* net, const QStr
         if (ircUser) {
             ircUsers.append(ircUser);
             // fake event for scripts that consume join events
-            events << new IrcEvent(EventManager::IrcEventJoin, net, ircUser->hostmask(), QStringList() << channel);
+            events << new IrcEvent(EventManager::IrcEventJoin, net, {}, ircUser->hostmask(), QStringList() << channel);
         }
         else {
             newModes.removeAt(users.indexOf(user));
@@ -1536,7 +1534,7 @@ void CoreSessionEventProcessor::handleCtcpClientinfo(CtcpEvent* e)
     QStringList supportedHandlers;
     for (const QString& handler : providesHandlers())
         supportedHandlers << handler.toUpper();
-    qSort(supportedHandlers);
+    std::sort(supportedHandlers.begin(), supportedHandlers.end());
     e->setReply(supportedHandlers.join(" "));
 }