X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=69b4c9e56dbead99f52b4dfce127e29565e5e33f;hb=4e452ee828fdb411e6b1db07c18e02681a30ff27;hp=f381c33fcd36b769ef495af80a8485c6e5ef3cc4;hpb=61aac1868f15babb7086d8bc6bbcff530346f438;p=quassel.git diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h index f381c33f..69b4c9e5 100644 --- a/src/client/coreconnection.h +++ b/src/client/coreconnection.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -73,7 +73,7 @@ public: //! Check if we consider the last connect as reconnect bool wasReconnect() const { return _wasReconnect; } - QPointer peer() { return _peer; } + QPointer peer() const; public slots: bool connectToCore(AccountId = 0); @@ -97,12 +97,11 @@ signals: void progressValueChanged(int value); void progressTextChanged(const QString &); - void startCoreSetup(const QVariantList &backendInfo, const QVariantList &authBackendInfo); + void startCoreSetup(const QVariantList &backendInfo, const QVariantList &authenticatorInfo); void coreSetupSuccess(); void coreSetupFailed(const QString &error); - void startInternalCore(); - void connectToInternalCore(InternalPeer *connection); + void connectToInternalCore(QPointer connection); // These signals MUST be handled synchronously! void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage = QString());