X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=dff1f5a7c0546982f97756d4f95a11298e2264de;hp=f381c33fcd36b769ef495af80a8485c6e5ef3cc4;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=61aac1868f15babb7086d8bc6bbcff530346f438

diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h
index f381c33f..dff1f5a7 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 <QNetworkConfigurationManager>
 #include <QPointer>
 #include <QTimer>
@@ -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,12 +75,13 @@ public:
     //! Check if we consider the last connect as reconnect
     bool wasReconnect() const { return _wasReconnect; }
 
-    QPointer<Peer> peer() { return _peer; }
+    QPointer<Peer> peer() const;
 
 public slots:
     bool connectToCore(AccountId = 0);
     void reconnectToCore();
     void disconnectFromCore();
+    void internalSessionStateReceived(const Protocol::SessionState &sessionState);
 
     void setupCore(const Protocol::SetupData &setupData);
 
@@ -97,12 +100,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<InternalPeer> connection);
 
     // These signals MUST be handled synchronously!
     void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage = QString());
@@ -125,7 +127,6 @@ private slots:
 
     void loginToCore(const QString &user, const QString &password, bool remember); // for config wizard
     void syncToCore(const Protocol::SessionState &sessionState);
-    void internalSessionStateReceived(const Protocol::SessionState &sessionState);
 
     void resetConnection(bool wantReconnect = false);
 
@@ -151,18 +152,18 @@ private slots:
 private:
     QPointer<ClientAuthHandler> _authHandler;
     QPointer<Peer> _peer;
-    ConnectionState _state;
+    ConnectionState _state{Disconnected};
 
     QTimer _reconnectTimer;
-    bool _wantReconnect;
-    bool _wasReconnect;
+    bool _wantReconnect{false};
+    bool _wasReconnect{false};
 
     QSet<QObject *> _netsToSync;
     int _numNetsToSync;
-    int _progressMinimum, _progressMaximum, _progressValue;
+    int _progressMinimum{0}, _progressMaximum{-1}, _progressValue{-1};
     QString _progressText;
 
-    bool _resetting;
+    bool _resetting{false};
 
     CoreAccount _account;
     CoreAccountModel *accountModel() const;