X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fcoreconfigwizard.h;h=8f7f8099c423f94e0ddb632d15d8e99f8a56fac5;hb=8582c2ad5708a1972c85bea1cf8d81ad3ece4814;hp=5b09a872655ca15079278d5a588fcecf1a4c3e21;hpb=cfbd4daee17dbb3c4052d938bf33edd08711d728;p=quassel.git

diff --git a/src/qtui/coreconfigwizard.h b/src/qtui/coreconfigwizard.h
index 5b09a872..8f7f8099 100644
--- a/src/qtui/coreconfigwizard.h
+++ b/src/qtui/coreconfigwizard.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  *
@@ -35,9 +35,11 @@
 class CoreConnection;
 
 namespace CoreConfigWizardPages {
+
 class SyncPage;
 class SyncRelayPage;
-};
+
+}
 
 class CoreConfigWizard : public QWizard
 {
@@ -55,7 +57,7 @@ public:
         ConclusionPage
     };
 
-    CoreConfigWizard(CoreConnection *connection, const QVariantList &backendInfos, const QVariantList &authInfos, QWidget *parent = 0);
+    CoreConfigWizard(CoreConnection *connection, const QVariantList &backendInfos, const QVariantList &authInfos, QWidget *parent = nullptr);
 
     inline CoreConnection *coreConnection() const { return _connection; }
 
@@ -64,7 +66,6 @@ signals:
     void loginToCore(const QString &user, const QString &password, bool rememberPassword);
 
 public slots:
-    void loginSuccess();
     void syncFinished();
 
 private slots:
@@ -82,13 +83,14 @@ private:
 
 
 namespace CoreConfigWizardPages {
+
 class IntroPage : public QWizardPage
 {
     Q_OBJECT
 
 public:
-    IntroPage(QWidget *parent = 0);
-    int nextId() const;
+    IntroPage(QWidget *parent = nullptr);
+    int nextId() const override;
 private:
     Ui::CoreConfigWizardIntroPage ui;
 };
@@ -99,22 +101,22 @@ class AdminUserPage : public QWizardPage
     Q_OBJECT
 
 public:
-    AdminUserPage(QWidget *parent = 0);
-    int nextId() const;
-    bool isComplete() const;
+    AdminUserPage(QWidget *parent = nullptr);
+    int nextId() const override;
+    bool isComplete() const override;
 private:
     Ui::CoreConfigWizardAdminUserPage ui;
 };
 
-// Authentication selection before storage selection.
+
 class AuthenticationSelectionPage : public QWizardPage
 {
     Q_OBJECT
     using FieldInfo = std::tuple<QString, QString, QVariant>;
 
 public:
-    AuthenticationSelectionPage(const QVariantList &authInfos, QWidget *parent = 0);
-    int nextId() const;
+    AuthenticationSelectionPage(const QVariantList &authInfos, QWidget *parent = nullptr);
+    int nextId() const override;
     QString displayName() const;
     QString authenticator() const;
     QVariantMap authProperties() const;
@@ -124,19 +126,19 @@ private slots:
 
 private:
     Ui::CoreConfigWizardAuthenticationSelectionPage ui;
-    QGroupBox *_fieldBox {nullptr};
     std::vector<QVariantMap> _authProperties;
     std::vector<std::vector<FieldInfo>> _authFields;
 };
 
+
 class StorageSelectionPage : public QWizardPage
 {
     Q_OBJECT
     using FieldInfo = std::tuple<QString, QString, QVariant>;
 
 public:
-    StorageSelectionPage(const QVariantList &backendInfos, QWidget *parent = 0);
-    int nextId() const;
+    StorageSelectionPage(const QVariantList &backendInfos, QWidget *parent = nullptr);
+    int nextId() const override;
     QString displayName() const;
     QString backend() const;
     QVariantMap backendProperties() const;
@@ -146,20 +148,20 @@ private slots:
 
 private:
     Ui::CoreConfigWizardStorageSelectionPage ui;
-    QGroupBox *_fieldBox {nullptr};
     std::vector<QVariantMap> _backendProperties;
     std::vector<std::vector<FieldInfo>> _backendFields;
 };
 
+
 class SyncPage : public QWizardPage
 {
     Q_OBJECT
 
 public:
-    SyncPage(QWidget *parent = 0);
-    void initializePage();
-    int nextId() const;
-    bool isComplete() const;
+    SyncPage(QWidget *parent = nullptr);
+    void initializePage() override;
+    int nextId() const override;
+    bool isComplete() const override;
 
 public slots:
     void setStatus(const QString &status);
@@ -181,8 +183,8 @@ class SyncRelayPage : public QWizardPage
     Q_OBJECT
 
 public:
-    SyncRelayPage(QWidget *parent = 0);
-    int nextId() const;
+    SyncRelayPage(QWidget *parent = nullptr);
+    int nextId() const override;
     enum Mode { Success, Error };
 
 public slots:
@@ -194,4 +196,5 @@ signals:
 private:
     Mode mode;
 };
+
 }