X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=8fa8725b18bb282e6b1835e30e564cfa8e0b9ffd;hp=91ad27e1301413f0ead24d43f130eaef54b64029;hb=a5dfcc8ecf8b81025d24b3c5c816169e3e030ea4;hpb=f7379184b7c0ae4e53d7470809f84e2ad3239ec1

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 91ad27e1..8fa8725b 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -55,28 +55,23 @@ public:
 
   QVariant sessionState();
 
-  SignalProxy *signalProxy() const;
+  inline SignalProxy *signalProxy() const { return _signalProxy; }
 
   const AliasManager &aliasManager() const { return _aliasManager; }
   AliasManager &aliasManager() { return _aliasManager; }
 
   inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
 
-  void attachNetworkConnection(NetworkConnection *conn);
+//   void attachNetworkConnection(NetworkConnection *conn);
 
   //! Return necessary data for restoring the session after restarting the core
   void saveSessionState() const;
   void restoreSessionState();
 
 public slots:
-  void networkStateRequested();
-
   void addClient(QIODevice *device);
   void addClient(SignalProxy *proxy);
 
-  void connectToNetwork(NetworkId);
-  void disconnectFromNetwork(NetworkId id);
-
   void msgFromClient(BufferInfo, QString message);
 
   //! Create an identity and propagate the changes to the clients.
@@ -113,8 +108,6 @@ public slots:
    */
   void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
 
-  void channelJoined(NetworkId id, const QString &channel, const QString &key = QString());
-  void channelParted(NetworkId, const QString &channel);
   QHash<QString, QString> persistentChannels(NetworkId) const;
 
 signals:
@@ -125,11 +118,6 @@ signals:
   void displayMsg(Message message);
   void displayStatusMsg(QString, QString);
 
-  //void connectToIrc(QString net);
-  //void disconnectFromIrc(QString net);
-
-  void bufferInfoUpdated(BufferInfo);
-
   void scriptResult(QString result);
 
   //! Identity has been created.
@@ -154,20 +142,11 @@ private slots:
 
   void recvStatusMsgFromServer(QString msg);
   void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", Message::Flags flags = Message::None);
-  void networkConnected(NetworkId networkid);
-  void networkDisconnected(NetworkId networkid);
 
   void destroyNetwork(NetworkId);
 
   void identityUpdated(const QVariantMap &);
 
-  //! Called when storage updated a BufferInfo.
-  /** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.
-   *  \param user       The buffer's owner (not necessarily us)
-   *  \param bufferInfo The updated BufferInfo
-   */
-  void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
-
   void storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId);
 
   void scriptRequest(QString script);
@@ -183,7 +162,7 @@ private:
 
   SignalProxy *_signalProxy;
   CoreAliasManager _aliasManager;
-  QHash<NetworkId, NetworkConnection *> _connections;
+  // QHash<NetworkId, NetworkConnection *> _connections;
   QHash<NetworkId, CoreNetwork *> _networks;
   //  QHash<NetworkId, CoreNetwork *> _networksToRemove;
   QHash<IdentityId, Identity *> _identities;