X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=9ba9d6a3a5797ce483cb66c972b9ff5fdcb799e8;hb=33f69bd2139607510b17991425e92ce79ba56b16;hp=f6ff7ef8e9585bc476d6f090d43c459168d1ecba;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49;p=quassel.git diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h index f6ff7ef8..9ba9d6a3 100644 --- a/src/client/coreconnection.h +++ b/src/client/coreconnection.h @@ -37,12 +37,13 @@ #endif #include "coreaccount.h" -#include "remoteconnection.h" +#include "remotepeer.h" #include "types.h" class CoreAccountModel; -class InternalConnection; +class InternalPeer; class Network; +class Peer; class SignalProxy; class CoreConnection : public QObject @@ -107,7 +108,7 @@ signals: void coreSetupFailed(const QString &error); void startInternalCore(); - void connectToInternalCore(InternalConnection *connection); + void connectToInternalCore(InternalPeer *connection); // These signals MUST be handled synchronously! void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage = QString()); @@ -176,7 +177,7 @@ private: QVariantMap _coreMsgBuffer; QPointer _socket; - QPointer _connection; + QPointer _peer; ConnectionState _state; QTimer _reconnectTimer;