Refactor SignalProxy, network and protocol code

[quassel.git] / src / core / coresession.h

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 9de37c0..fffb768 100644 (file)
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2012 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.         *
  ***************************************************************************/
 
 #ifndef CORESESSION_H
@@ -28,6 +28,7 @@
 #include "corealiasmanager.h"
 #include "coreignorelistmanager.h"
 #include "message.h"
+#include "signalproxy.h"
 #include "storage.h"
 
 class CoreBacklogManager;
@@ -41,10 +42,11 @@ class CoreSessionEventProcessor;
 class CtcpParser;
 class EventManager;
 class EventStringifier;
+class InternalConnection;
 class IrcParser;
 class MessageEvent;
 class NetworkConnection;
-class SignalProxy;
+class RemoteConnection;
 
 struct NetworkInfo;
 
@@ -87,8 +89,8 @@ public:
     void restoreSessionState();
 
 public slots:
-    void addClient(QIODevice *device);
-    void addClient(SignalProxy *proxy);
+    void addClient(RemoteConnection *connection);
+    void addClient(InternalConnection *connection);
 
     void msgFromClient(BufferInfo, QString message);
 
@@ -155,7 +157,7 @@ protected:
     virtual void customEvent(QEvent *event);
 
 private slots:
-    void removeClient(QIODevice *dev);
+    void removeClient(SignalProxy::AbstractPeer *peer);
 
     void recvStatusMsgFromServer(QString msg);
     void recvMessageFromServer(NetworkId networkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None);