projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use '= default' instead of empty ctor/dtor bodies
[quassel.git]
/
src
/
qtui
/
coreconfigwizard.h
diff --git
a/src/qtui/coreconfigwizard.h
b/src/qtui/coreconfigwizard.h
index
5b09a87
..
8f7f809
100644
(file)
--- a/
src/qtui/coreconfigwizard.h
+++ b/
src/qtui/coreconfigwizard.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 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 CoreConnection;
namespace CoreConfigWizardPages {
+
class SyncPage;
class SyncRelayPage;
class SyncPage;
class SyncRelayPage;
-};
+
+}
class CoreConfigWizard : public QWizard
{
class CoreConfigWizard : public QWizard
{
@@
-55,7
+57,7
@@
public:
ConclusionPage
};
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; }
inline CoreConnection *coreConnection() const { return _connection; }
@@
-64,7
+66,6
@@
signals:
void loginToCore(const QString &user, const QString &password, bool rememberPassword);
public slots:
void loginToCore(const QString &user, const QString &password, bool rememberPassword);
public slots:
- void loginSuccess();
void syncFinished();
private slots:
void syncFinished();
private slots:
@@
-82,13
+83,14
@@
private:
namespace CoreConfigWizardPages {
namespace CoreConfigWizardPages {
+
class IntroPage : public QWizardPage
{
Q_OBJECT
public:
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;
};
private:
Ui::CoreConfigWizardIntroPage ui;
};
@@
-99,22
+101,22
@@
class AdminUserPage : public QWizardPage
Q_OBJECT
public:
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;
};
private:
Ui::CoreConfigWizardAdminUserPage ui;
};
-// Authentication selection before storage selection.
+
class AuthenticationSelectionPage : public QWizardPage
{
Q_OBJECT
using FieldInfo = std::tuple<QString, QString, QVariant>;
public:
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;
QString displayName() const;
QString authenticator() const;
QVariantMap authProperties() const;
@@
-124,19
+126,19
@@
private slots:
private:
Ui::CoreConfigWizardAuthenticationSelectionPage ui;
private:
Ui::CoreConfigWizardAuthenticationSelectionPage ui;
- QGroupBox *_fieldBox {nullptr};
std::vector<QVariantMap> _authProperties;
std::vector<std::vector<FieldInfo>> _authFields;
};
std::vector<QVariantMap> _authProperties;
std::vector<std::vector<FieldInfo>> _authFields;
};
+
class StorageSelectionPage : public QWizardPage
{
Q_OBJECT
using FieldInfo = std::tuple<QString, QString, QVariant>;
public:
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;
QString displayName() const;
QString backend() const;
QVariantMap backendProperties() const;
@@
-146,20
+148,20
@@
private slots:
private:
Ui::CoreConfigWizardStorageSelectionPage ui;
private:
Ui::CoreConfigWizardStorageSelectionPage ui;
- QGroupBox *_fieldBox {nullptr};
std::vector<QVariantMap> _backendProperties;
std::vector<std::vector<FieldInfo>> _backendFields;
};
std::vector<QVariantMap> _backendProperties;
std::vector<std::vector<FieldInfo>> _backendFields;
};
+
class SyncPage : public QWizardPage
{
Q_OBJECT
public:
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);
public slots:
void setStatus(const QString &status);
@@
-181,8
+183,8
@@
class SyncRelayPage : public QWizardPage
Q_OBJECT
public:
Q_OBJECT
public:
- SyncRelayPage(QWidget *parent =
0
);
- int nextId() const;
+ SyncRelayPage(QWidget *parent =
nullptr
);
+ int nextId() const
override
;
enum Mode { Success, Error };
public slots:
enum Mode { Success, Error };
public slots:
@@
-194,4
+196,5
@@
signals:
private:
Mode mode;
};
private:
Mode mode;
};
+
}
}