X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.h;h=3b2b8750e62045429acecf08616c6f27d60cb6b6;hp=f035eb9aff45e18970eaa1acd8aea41b472b82a4;hb=e4972a0ebce0d555d752ab2f34ffd6a6dcdef1dd;hpb=fd80315c076ede937f5d51ba6f8061a32d0107ec

diff --git a/src/core/ircserverhandler.h b/src/core/ircserverhandler.h
index f035eb9a..3b2b8750 100644
--- a/src/core/ircserverhandler.h
+++ b/src/core/ircserverhandler.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-10 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,10 +21,10 @@
 #ifndef IRCSERVERHANDLER_H
 #define IRCSERVERHANDLER_H
 
-#include "basichandler.h"
+#include "corebasichandler.h"
 #include "netsplit.h"
 
-class IrcServerHandler : public BasicHandler {
+class IrcServerHandler : public CoreBasicHandler {
   Q_OBJECT
 
 public:
@@ -45,7 +45,8 @@ public slots:
   void handlePrivmsg(const QString &prefix, const QList<QByteArray> &params);
   void handleQuit(const QString &prefix, const QList<QByteArray> &params);
   void handleTopic(const QString &prefix, const QList<QByteArray> &params);
-
+  void handleCap(const QString &prefix, const QList<QByteArray> &params);   // CAP framework
+  void handleAuthenticate();                                                // SASL auth - no params
   void handle001(const QString &prefix, const QList<QByteArray> &params);   // RPL_WELCOME
   void handle005(const QString &prefix, const QList<QByteArray> &params);   // RPL_ISUPPORT
   void handle221(const QString &prefix, const QList<QByteArray> &params);   // RPL_UMODEIS
@@ -87,9 +88,10 @@ private slots:
   /** This slot handles a bulk-join after a netsplit is over
     * \param channel The channel the users joined
     * \param users   The list of users that joind the channel
+    * \param modes   The list of modes the users get set
     * \param quitMessage The message we received when the netsplit occured
     */
-  void handleNetsplitJoin(const QString &channel, const QStringList &users, const QString &quitMessage);
+  void handleNetsplitJoin(const QString &channel, const QStringList &users, const QStringList &modes, const QString &quitMessage);
 
   //! Quits after a netsplit
   /** This slot handles a bulk-quit after a netsplit occured
@@ -104,6 +106,14 @@ private slots:
     */
   void handleNetsplitFinished();
 
+  void handleEarlyNetsplitJoin(const QString &channel, const QStringList &users, const QStringList &modes);
+
+  //! Destroy any existing netsplits
+  /** This slot deletes all netsplit objects
+    * Used to get rid of existing netsplits on network reconnect
+    */
+  void destroyNetsplits();
+
 private:
   void tryNextNick(const QString &errnick, bool erroneus = false);
   bool checkParamCount(const QString &methodName, const QList<QByteArray> &params, int minParams);