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

diff --git a/src/core/ircserverhandler.h b/src/core/ircserverhandler.h
index f035eb9a..86eaff23 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:
@@ -87,9 +87,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 +105,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);