X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=9ba9d6a3a5797ce483cb66c972b9ff5fdcb799e8;hb=5b69d94edcbc2f985243b1f19744f7b03f6e283b;hp=dcc914e97894b8fc12abb3f11cc0184d11a50253;hpb=0e1b154f362e13c2c9009f842e3fd6d8e7c346fc;p=quassel.git diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h index dcc914e9..9ba9d6a3 100644 --- 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,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;