X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=dcc914e97894b8fc12abb3f11cc0184d11a50253;hp=e04921ce4807c3b07a3bfd82aa7ae539db0f53e3;hb=0e1b154f362e13c2c9009f842e3fd6d8e7c346fc;hpb=c9e3e41c9446e58073225db379d28e1a08e15cd8

diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h
index e04921ce..dcc914e9 100644
--- a/src/client/coreconnection.h
+++ b/src/client/coreconnection.h
@@ -37,9 +37,11 @@
 #endif
 
 #include "coreaccount.h"
+#include "remoteconnection.h"
 #include "types.h"
 
 class CoreAccountModel;
+class InternalConnection;
 class Network;
 class SignalProxy;
 
@@ -105,7 +107,7 @@ signals:
     void coreSetupFailed(const QString &error);
 
     void startInternalCore();
-    void connectToInternalCore(SignalProxy *proxy);
+    void connectToInternalCore(InternalConnection *connection);
 
     // These signals MUST be handled synchronously!
     void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage = QString());
@@ -121,7 +123,7 @@ private slots:
 
     void socketStateChanged(QAbstractSocket::SocketState);
     void coreSocketError(QAbstractSocket::SocketError);
-    void coreHasData();
+    void coreHasData(const QVariant &item);
     void coreSocketConnected();
     void coreSocketDisconnected();
 
@@ -173,8 +175,8 @@ private:
     CoreAccount _account;
     QVariantMap _coreMsgBuffer;
 
-    QPointer<QAbstractSocket> _socket;
-    quint32 _blockSize;
+    QPointer<QTcpSocket> _socket;
+    QPointer<SignalProxy::AbstractPeer> _connection;
     ConnectionState _state;
 
     QTimer _reconnectTimer;
@@ -188,6 +190,7 @@ private:
     QString _coreInfoString(const QVariantMap &);
     bool _wasReconnect;
     bool _requestedDisconnect;
+    bool _resetting;
 
     inline CoreAccountModel *accountModel() const;