Simplify and fix (re)connection logic

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

diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h
index 836d8cc..0bf402e 100644 (file)
--- a/src/client/coreconnection.h
+++ b/src/client/coreconnection.h
@@ -43,6 +43,7 @@
 class CoreAccountModel;
 class InternalPeer;
 class Network;
+class Peer;
 class SignalProxy;
 
 class CoreConnection : public QObject
@@ -176,11 +177,12 @@ private:
     QVariantMap _coreMsgBuffer;
 
     QPointer<QTcpSocket> _socket;
-    QPointer<SignalProxy::AbstractPeer> _peer;
+    QPointer<Peer> _peer;
     ConnectionState _state;
 
     QTimer _reconnectTimer;
     bool _wantReconnect;
+    bool _wasReconnect;
 
     QSet<QObject *> _netsToSync;
     int _numNetsToSync;
@@ -188,8 +190,6 @@ private:
     QString _progressText;
 
     QString _coreInfoString(const QVariantMap &);
-    bool _wasReconnect;
-    bool _requestedDisconnect;
     bool _resetting;
 
     inline CoreAccountModel *accountModel() const;