Yearly bump

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

diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h
index e04921c..f6ff7ef 100644 (file)
--- a/src/client/coreconnection.h
+++ b/src/client/coreconnection.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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;