properly handling disconnects - this might even fix an antique bug with duplicate...

[quassel.git] / src / client / client.h

diff --git a/src/client/client.h b/src/client/client.h
index 2d073c5..b8faf9f 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -154,16 +154,11 @@ public slots:
 
   void disconnectFromCore();
 
 
   void disconnectFromCore();
 

-  void setCoreConfiguration(const QVariantMap &settings);
-

   void bufferRemoved(BufferId bufferId);
   void bufferRenamed(BufferId bufferId, const QString &newName);
 
 private slots:
   void bufferRemoved(BufferId bufferId);
   void bufferRenamed(BufferId bufferId, const QString &newName);
 
 private slots:

-  //void coreSocketError(QAbstractSocket::SocketError);
-
-  //void networkConnected(NetworkId);
-  //void networkDisconnected(NetworkId);
+  void disconnectedFromCore();

 
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);
 
   void recvMessage(const Message &message);
   void recvStatusMsg(QString network, QString message);


@@ -175,6 +170,7 @@ private slots:
   void coreNetworkRemoved(NetworkId);
 
   void setConnectedToCore(QIODevice *socket, AccountId id);
   void coreNetworkRemoved(NetworkId);
 
   void setConnectedToCore(QIODevice *socket, AccountId id);

+  void setConnectedToInternalCore();

   void setSyncedToCore();
   void setSecuredConnection();
 
   void setSyncedToCore();
   void setSecuredConnection();
 


@@ -190,8 +186,6 @@ private:
 
   static QPointer<Client> instanceptr;
 
 
   static QPointer<Client> instanceptr;
 

-  QPointer<QIODevice> socket;
-

   SignalProxy * _signalProxy;
   AbstractUi * mainUi;
   NetworkModel * _networkModel;
   SignalProxy * _signalProxy;
   AbstractUi * mainUi;
   NetworkModel * _networkModel;