X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=56a5a29eba702f997c078f1b4ba0d7bcb19ad620;hp=0019a534469f7c92b068ec1fe7975a6ef412d92b;hb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;hpb=d82f98b8cf9c7c83f3aab1d7f010ccf8bdd2c003 diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h index 0019a534..56a5a29e 100644 --- a/src/client/coreconnection.h +++ b/src/client/coreconnection.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 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 @@ -54,7 +56,7 @@ public: Synchronized }; - CoreConnection(QObject *parent = 0); + CoreConnection(QObject *parent = nullptr); void init(); @@ -73,6 +75,8 @@ public: //! Check if we consider the last connect as reconnect bool wasReconnect() const { return _wasReconnect; } + QPointer peer() const; + public slots: bool connectToCore(AccountId = 0); void reconnectToCore(); @@ -95,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());