X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=7951a49955decb3dd87d9c8d02e4a7b3dfb4c65c;hb=7cf8b4e04ae10dd68d344444c49499d4f916394c;hp=216e92536b884c4a21d6c169045a266aae10fc4a;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c;p=quassel.git diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h index 216e9253..7951a499 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 * @@ -20,6 +20,8 @@ #pragma once +#include "client-export.h" + #include #include #include @@ -41,7 +43,7 @@ class Network; class Peer; class SignalProxy; -class CoreConnection : public QObject +class CLIENT_EXPORT CoreConnection : public QObject { Q_OBJECT @@ -73,7 +75,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 +99,11 @@ signals: void progressValueChanged(int value); void progressTextChanged(const QString &); - void startCoreSetup(const QVariantList &backendInfo); + 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());