X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.h;h=74b21d66648e5535ee5a308a0bcb0925023e3dad;hp=b255793743ac2ded0c71ea08d569fcd255788cba;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=8265e0f7f750f7ae7a4a8a163b2bd42e8edb4998

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index b2557937..74b21d66 100644
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.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  *
@@ -38,15 +38,16 @@ 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:
     void widgetHasChanged();
@@ -56,7 +57,17 @@ private slots:
     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
+     *
+     * For example, this updates the SASL text to indicate the status is unknown.  Any actual
+     * information should be set by setNetworkCapStates()
+     *
+     * @see NetworksSettingsPage::setNetworkCapStates()
+     */
+    void resetNetworkCapStates();
 
     /**
      * Update the capability-dependent settings according to what the server supports
@@ -121,9 +132,9 @@ private:
 
     NetworkId currentId;
     QHash<NetworkId, NetworkInfo> networkInfos;
-    bool _ignoreWidgetChanges;
+    bool _ignoreWidgetChanges{false};
 #ifdef HAVE_SSL
-    CertIdentity *_cid;
+    CertIdentity *_cid{nullptr};
 #endif
 
     QIcon connectedIcon, connectingIcon, disconnectedIcon;
@@ -155,7 +166,7 @@ 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;
 
@@ -184,7 +195,7 @@ 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;
 
@@ -203,7 +214,7 @@ 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;
 
@@ -230,7 +241,7 @@ class SaveNetworksDlg : public QDialog
     Q_OBJECT
 
 public:
-    SaveNetworksDlg(const QList<NetworkInfo> &toCreate, const QList<NetworkInfo> &toUpdate, const QList<NetworkId> &toRemove, QWidget *parent = 0);
+    SaveNetworksDlg(const QList<NetworkInfo> &toCreate, const QList<NetworkInfo> &toUpdate, const QList<NetworkId> &toRemove, QWidget *parent = nullptr);
 
 private slots:
     void clientEvent();