projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Enable tests in Travis
[quassel.git]
/
src
/
qtui
/
coreconfigwizard.h
diff --git
a/src/qtui/coreconfigwizard.h
b/src/qtui/coreconfigwizard.h
index
70512e7
..
8f7f809
100644
(file)
--- a/
src/qtui/coreconfigwizard.h
+++ b/
src/qtui/coreconfigwizard.h
@@
-57,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; }
@@
-89,8
+89,8
@@
class IntroPage : public QWizardPage
Q_OBJECT
public:
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;
};
@@
-101,9
+101,9
@@
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;
};
@@
-115,8
+115,8
@@
class AuthenticationSelectionPage : public QWizardPage
using FieldInfo = std::tuple<QString, QString, QVariant>;
public:
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;
@@
-137,8
+137,8
@@
class StorageSelectionPage : public QWizardPage
using FieldInfo = std::tuple<QString, QString, QVariant>;
public:
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;
@@
-158,10
+158,10
@@
class SyncPage : public QWizardPage
Q_OBJECT
public:
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);
@@
-183,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: