X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=01ffd8e8fdb469a0f9886971fa9e368514cef30b;hp=1c8924ab89941aca1e156c4e5458df932b11ccf7;hb=6f2f1723f5bb3d26908f6dd297890f6fba43793b;hpb=7f9a9f7627d590ae99d489c343b75d76c9db33ae

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 1c8924ab..01ffd8e8 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -37,7 +37,7 @@ class CoreSession : public QObject {
   Q_OBJECT
 
 public:
-  CoreSession(UserId, QObject *parent = 0);
+  CoreSession(UserId, bool restoreState, QObject *parent = 0);
   ~CoreSession();
 
   QList<BufferInfo> buffers() const;
@@ -56,8 +56,8 @@ public:
   void attachNetworkConnection(NetworkConnection *conn);
 
   //! Return necessary data for restoring the session after restarting the core
-  QVariant state() const;
-  void restoreState(const QVariant &previousState);
+  void saveSessionState() const;
+  void restoreSessionState();
 
 public slots:
   //! Store a piece session-wide data and distribute it to connected clients.
@@ -122,8 +122,8 @@ signals:
 private slots:
   void recvStatusMsgFromServer(QString msg);
   void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
-  void networkConnected(uint networkid);
-  void networkDisconnected(uint networkid);
+  void networkConnected(NetworkId networkid);
+  void networkDisconnected(NetworkId networkid);
 
   //! Called when storage updated a BufferInfo.
   /** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.