X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.h;h=a35bc0476550c67fde104b70cdce76f7aa131d0c;hp=1e32ccd1a7b1b60fd8094ee9a1756e0f55980d7f;hb=52209badc8e769e50aa3019b63689dda0e79e9d0;hpb=c17297c5f5bcec99c59f731fd879055a04f1edb8 diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h index 1e32ccd1..a35bc047 100644 --- a/src/qtui/settingspages/networkssettingspage.h +++ b/src/qtui/settingspages/networkssettingspage.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,30 +23,30 @@ #include +#include "clientidentity.h" #include "network.h" #include "settingspage.h" -#include "clientidentity.h" -#include "ui_networkssettingspage.h" #include "ui_networkadddlg.h" #include "ui_networkeditdlg.h" -#include "ui_servereditdlg.h" +#include "ui_networkssettingspage.h" #include "ui_saveidentitiesdlg.h" +#include "ui_servereditdlg.h" class NetworksSettingsPage : public SettingsPage { Q_OBJECT public: - NetworksSettingsPage(QWidget *parent = 0); + NetworksSettingsPage(QWidget* parent = nullptr); - virtual inline bool needsCoreConnection() const { return true; } + inline bool needsCoreConnection() const override { return true; } - bool aboutToSave(); + bool aboutToSave() override; public slots: - void save(); - void load(); + void save() override; + void load() override; void bufferList_Open(NetworkId); private slots: @@ -54,10 +54,10 @@ private slots: void setWidgetStates(); void coreConnectionStateChanged(bool); void networkConnectionStateChanged(Network::ConnectionState state); - void networkConnectionError(const QString &msg); + void networkConnectionError(const QString& msg); void displayNetwork(NetworkId); - void setItemState(NetworkId, QListWidgetItem *item = 0); + void setItemState(NetworkId, QListWidgetItem* item = nullptr); /** * Reset the capability-dependent settings to the default unknown states @@ -120,7 +120,8 @@ private: /** * Status of capability support */ - enum CapSupportStatus { + enum CapSupportStatus + { Unknown, ///< Old core, or otherwise unknown, can't make assumptions Disconnected, ///< Disconnected from network, can't determine MaybeUnsupported, ///< Server does not advertise support at this moment @@ -132,9 +133,9 @@ private: NetworkId currentId; QHash networkInfos; - bool _ignoreWidgetChanges; + bool _ignoreWidgetChanges{false}; #ifdef HAVE_SSL - CertIdentity *_cid; + CertIdentity* _cid{nullptr}; #endif QIcon connectedIcon, connectingIcon, disconnectedIcon; @@ -146,10 +147,10 @@ private: void reset(); bool testHasChanged(); - QListWidgetItem *insertNetwork(NetworkId); - QListWidgetItem *insertNetwork(const NetworkInfo &info); - QListWidgetItem *networkItem(NetworkId) const; - void saveToNetworkInfo(NetworkInfo &); + QListWidgetItem* insertNetwork(NetworkId); + QListWidgetItem* insertNetwork(const NetworkInfo& info); + QListWidgetItem* networkItem(NetworkId) const; + void saveToNetworkInfo(NetworkInfo&); IdentityId defaultIdentity() const; /** @@ -160,13 +161,12 @@ private: void setSASLStatus(const CapSupportStatus saslStatus); }; - class NetworkAddDlg : public QDialog { Q_OBJECT public: - NetworkAddDlg(const QStringList &existing = QStringList(), QWidget *parent = 0); + NetworkAddDlg(QStringList existing = QStringList(), QWidget* parent = nullptr); NetworkInfo networkInfo() const; @@ -189,18 +189,17 @@ private: QStringList existing; }; - class NetworkEditDlg : public QDialog { Q_OBJECT public: - NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0); + NetworkEditDlg(const QString& old, QStringList existing = QStringList(), QWidget* parent = nullptr); QString networkName() const; private slots: - void on_networkEdit_textChanged(const QString &); + void on_networkEdit_textChanged(const QString&); private: Ui::NetworkEditDlg ui; @@ -208,13 +207,12 @@ private: QStringList existing; }; - class ServerEditDlg : public QDialog { Q_OBJECT public: - ServerEditDlg(const Network::Server &server = Network::Server(), QWidget *parent = 0); + ServerEditDlg(const Network::Server& server = Network::Server(), QWidget* parent = nullptr); Network::Server serverData() const; @@ -235,13 +233,15 @@ private: Ui::ServerEditDlg ui; }; - class SaveNetworksDlg : public QDialog { Q_OBJECT public: - SaveNetworksDlg(const QList &toCreate, const QList &toUpdate, const QList &toRemove, QWidget *parent = 0); + SaveNetworksDlg(const QList& toCreate, + const QList& toUpdate, + const QList& toRemove, + QWidget* parent = nullptr); private slots: void clientEvent(); @@ -252,5 +252,4 @@ private: int numevents, rcvevents; }; - #endif