X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=11c8d500afde784b9e40f753436b829ca4cd2b4e;hp=2f9d7cc4734611418b680e434b9307e9ddfb2d0b;hb=4ae8f86c1ce452582d6fe576956c7c1bc1460adf;hpb=f8c55c528ed7e5e1fd0090b4bbd6ef30d9c0f251

diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h
index 2f9d7cc4..11c8d500 100644
--- a/src/client/coreconnection.h
+++ b/src/client/coreconnection.h
@@ -24,6 +24,7 @@
 // TODO: support system application proxy (new in Qt 4.6)
 
 #include "QPointer"
+#include "QTimer"
 
 #ifdef HAVE_SSL
 #  include <QSslSocket>
@@ -31,6 +32,10 @@
 #  include <QTcpSocket>
 #endif
 
+#ifdef HAVE_KDE
+#  include <Solid/Networking>
+#endif
+
 #include "coreaccount.h"
 #include "types.h"
 
@@ -54,17 +59,21 @@ public:
 
   void init();
 
-  inline ConnectionState state() const;
   inline bool isConnected() const;
+  inline ConnectionState state() const;
   inline CoreAccount currentAccount() const;
 
   bool isEncrypted() const;
+  bool isLocalConnection() const;
 
   inline int progressMinimum() const;
   inline int progressMaximum() const;
   inline int progressValue() const;
   inline QString progressText() const;
 
+  //! Check if we consider the last connect as reconnect
+  inline bool wasReconnect() const { return _wasReconnect; }
+
 #ifdef HAVE_SSL
   inline const QSslSocket *sslSocket() const;
 #endif
@@ -72,12 +81,13 @@ public:
 public slots:
   bool connectToCore(AccountId = 0);
   void reconnectToCore();
-  void disconnectFromCore(const QString &errorString = QString());
+  void disconnectFromCore();
 
 signals:
   void stateChanged(CoreConnection::ConnectionState);
   void encrypted(bool isEncrypted = true);
   void synchronized();
+  void lagUpdated(int msecs);
 
   void connectionError(const QString &errorMsg);
   void connectionErrorPopup(const QString &errorMsg);
@@ -106,6 +116,7 @@ signals:
 
 private slots:
   void connectToCurrentAccount();
+  void disconnectFromCore(const QString &errorString, bool wantReconnect = true);
 
   void socketStateChanged(QAbstractSocket::SocketState);
   void coreSocketError(QAbstractSocket::SocketError);
@@ -123,7 +134,7 @@ private slots:
   void internalSessionStateReceived(const QVariant &packedState);
   void sessionStateReceived(const QVariantMap &state);
 
-  void resetConnection();
+  void resetConnection(bool wantReconnect = false);
   void connectionReady();
 
   void loginToCore(const QString &user, const QString &password, bool remember); // for config wizard
@@ -147,21 +158,35 @@ private slots:
   void sslErrors();
 #endif
 
+  void networkDetectionModeChanged(const QVariant &mode);
+  void pingTimeoutIntervalChanged(const QVariant &interval);
+  void reconnectIntervalChanged(const QVariant &interval);
+  void reconnectTimeout();
+
+#ifdef HAVE_KDE
+  void solidNetworkStatusChanged(Solid::Networking::Status status);
+#endif
+
 private:
   CoreAccountModel *_model;
   CoreAccount _account;
   QVariantMap _coreMsgBuffer;
 
-  QPointer<QIODevice> _socket;
+  QPointer<QAbstractSocket> _socket;
   quint32 _blockSize;
   ConnectionState _state;
 
-  QSet<Network *> _netsToSync;
+  QTimer _reconnectTimer;
+  bool _wantReconnect;
+
+  QSet<QObject *> _netsToSync;
   int _numNetsToSync;
   int _progressMinimum, _progressMaximum, _progressValue;
   QString _progressText;
 
   QString _coreInfoString(const QVariantMap &);
+  bool _wasReconnect;
+  bool _requestedDisconnect;
 
   inline CoreAccountModel *accountModel() const;