X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=ce64b090bf5369e793a2159768e728a9c21dc951;hb=e008cd12ef319c4b5f9fe5a8cc1524829551771d;hp=f9336b27ea0be67ae4a654e36c888b82fca0b389;hpb=42ff71aaa8d3cee9e348a45758c56c380a4f1b45;p=quassel.git

diff --git a/src/core/coresession.h b/src/core/coresession.h
index f9336b27..ce64b090 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -25,73 +25,79 @@
 #include <QString>
 #include <QVariant>
 
-#include "coreproxy.h"
+#include "message.h"
 
 class Server;
+class SignalProxy;
 class Storage;
 
 class CoreSession : public QObject {
   Q_OBJECT
 
-  public:
-    CoreSession(UserId, Storage *);
-    ~CoreSession();
+public:
+  CoreSession(UserId, Storage *, QObject *parent = 0);
+  virtual ~CoreSession();
 
-    QList<BufferId> buffers() const;
-    UserId userId() const;
-    QVariant sessionState();
+  NetworkId getNetworkId(const QString &network) const;
+  QList<BufferInfo> buffers() const;
+  UserId userId() const;
+  QVariant sessionState();
 
-  public slots:
-    //! Store a piece session-wide data and distribute it to connected clients.
-    void storeSessionData(const QString &key, const QVariant &data);
+  //! Retrieve a piece of session-wide data.
+  QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
 
-  public:
-    //! Retrieve a piece of session-wide data.
-    QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
+  SignalProxy *signalProxy() const;
 
-    CoreProxy *proxy();
+  void attachServer(Server *server);
 
-  public slots:
-    void connectToIrc(QStringList);
-    void processSignal(ClientSignal, QVariant, QVariant, QVariant);
-    void sendBacklog(BufferId, QVariant, QVariant);
-    void msgFromGui(BufferId, QString message);
-    void sendServerStates();
+  //! Return necessary data for restoring the session after restarting the core
+  QVariant state() const;
+  void restoreState(const QVariant &previousState);
 
-  signals:
-    void proxySignal(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
+public slots:
+  //! Store a piece session-wide data and distribute it to connected clients.
+  void storeSessionData(const QString &key, const QVariant &data);
 
-    void msgFromGui(QString net, QString buf, QString message);
-    void displayMsg(Message message);
-    void displayStatusMsg(QString, QString);
+  void serverStateRequested();
 
-    void connectToIrc(QString net);
-    void disconnectFromIrc(QString net);
-    void serverStateRequested();
+  void addClient(QIODevice *connection);
 
-    void backlogData(BufferId, QList<QVariant>, bool done);
+  void connectToNetwork(QString, const QVariant &previousState = QVariant());
+  //void connectToNetwork(NetworkId);
 
-    void bufferIdUpdated(BufferId);
-    void sessionDataChanged(const QString &key);
-    void sessionDataChanged(const QString &key, const QVariant &data);
+  //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
+  void sendBacklog(BufferInfo, QVariant, QVariant);
+  void msgFromGui(BufferInfo, QString message);
 
-  private slots:
-    //void recvProxySignal(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
-    void globalDataUpdated(UserId, QString);
-    void recvStatusMsgFromServer(QString msg);
-    void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
-    void serverConnected(QString net);
-    void serverDisconnected(QString net);
+signals:
+  void msgFromGui(uint netid, QString buf, QString message);
+  void displayMsg(Message message);
+  void displayStatusMsg(QString, QString);
 
-  private:
-    CoreProxy *coreProxy;
-    Storage *storage;
-    QHash<QString, Server *> servers;
-    UserId user;
+  void connectToIrc(QString net);
+  void disconnectFromIrc(QString net);
 
-    VarMap sessionData;
-    QMutex mutex;
+  void backlogData(BufferInfo, QVariantList, bool done);
 
+  void bufferInfoUpdated(BufferInfo);
+  void sessionDataChanged(const QString &key);
+  void sessionDataChanged(const QString &key, const QVariant &data);
+
+private slots:
+  void recvStatusMsgFromServer(QString msg);
+  void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+  void serverConnected(uint networkid);
+  void serverDisconnected(uint networkid);
+
+private:
+  UserId user;
+  
+  SignalProxy *_signalProxy;
+  Storage *storage;
+  QHash<NetworkId, Server *> servers;
+  
+  QVariantMap sessionData;
+  QMutex mutex;
 };
 
 #endif