Respect autoconnect settings in CoreConnection

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

diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h
index 67b9b14..7a5d841 100644 (file)
--- a/src/client/coreconnection.h
+++ b/src/client/coreconnection.h
@@ -52,7 +52,6 @@ public:
   CoreConnection(CoreAccountModel *model, QObject *parent = 0);
 
   void init();
   CoreConnection(CoreAccountModel *model, QObject *parent = 0);
 
   void init();

-  void start();

 
   inline ConnectionState state() const;
   inline bool isConnected() const;
 
   inline ConnectionState state() const;
   inline bool isConnected() const;


@@ -64,7 +63,7 @@ public:
   inline QString progressText() const;
 
 public slots:
   inline QString progressText() const;
 
 public slots:

-  void connectToCore(AccountId);
+  bool connectToCore(AccountId = 0);

   void reconnectToCore();
   void disconnectFromCore();
 
   void reconnectToCore();
   void disconnectFromCore();
 


@@ -91,6 +90,8 @@ signals:
   void handleIgnoreWarnings(bool permanently);
 
 private slots:
   void handleIgnoreWarnings(bool permanently);
 
 private slots:

+  void connectToCurrentAccount();
+

   void socketStateChanged(QAbstractSocket::SocketState);
   void coreSocketError(QAbstractSocket::SocketError);
   void coreHasData();
   void socketStateChanged(QAbstractSocket::SocketState);
   void coreSocketError(QAbstractSocket::SocketError);
   void coreHasData();