X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcoreaccountsettingspage.h;h=ebfed62cd0b01a147738d1ce84557a725f22bb12;hb=a0e333e994dce2d949a84930293382020e724596;hp=f9a0c6481af3c25f6f15693015d6df8ae361c6d5;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222;p=quassel.git

diff --git a/src/qtui/settingspages/coreaccountsettingspage.h b/src/qtui/settingspages/coreaccountsettingspage.h
index f9a0c648..ebfed62c 100644
--- a/src/qtui/settingspages/coreaccountsettingspage.h
+++ b/src/qtui/settingspages/coreaccountsettingspage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 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  *
@@ -21,6 +21,7 @@
 #ifndef COREACCOUNTSETTINGSPAGE_H_
 #define COREACCOUNTSETTINGSPAGE_H_
 
+#include <QNetworkProxy>
 #include <QSortFilterProxyModel>
 
 #include "settingspage.h"
@@ -38,16 +39,16 @@ class CoreAccountSettingsPage : public SettingsPage
     Q_OBJECT
 
 public:
-    CoreAccountSettingsPage(QWidget *parent = 0);
+    CoreAccountSettingsPage(QWidget *parent = nullptr);
 
-    inline bool hasDefaults() const { return false; }
+    inline bool hasDefaults() const override { return false; }
     inline bool isStandAlone() const { return _standalone; }
 
     AccountId selectedAccount() const;
 
 public slots:
-    void save();
-    void load();
+    void save() override;
+    void load() override;
 
     void setSelectedAccount(AccountId accId);
     void setStandAlone(bool);
@@ -76,13 +77,13 @@ private:
     inline FilteredCoreAccountModel *filteredModel() const { return _filteredModel; }
 
     AccountId _lastAccountId, _lastAutoConnectId;
-    bool _standalone;
+    bool _standalone{false};
 
     void editAccount(const QModelIndex &);
 
     bool testHasChanged();
 
-    inline QString settingsKey() const { return QString("CoreAccounts"); }
+    inline QString settingsKey() const override { return QString("CoreAccounts"); }
 };
 
 
@@ -94,7 +95,7 @@ class CoreAccountEditDlg : public QDialog
     Q_OBJECT
 
 public:
-    CoreAccountEditDlg(const CoreAccount &account, QWidget *parent = 0);
+    CoreAccountEditDlg(const CoreAccount &account, QWidget *parent = nullptr);
 
     CoreAccount account();
 
@@ -102,12 +103,14 @@ private slots:
     void on_hostName_textChanged(const QString &);
     void on_accountName_textChanged(const QString &);
     void on_user_textChanged(const QString &);
+    void on_radioButtonManualProxy_toggled(bool checked);
 
     void setWidgetStates();
 
 private:
     Ui::CoreAccountEditDlg ui;
     CoreAccount _account;
+    enum ProxyType { NoProxy, SystemProxy, ManualProxy };
 };
 
 
@@ -121,10 +124,10 @@ class FilteredCoreAccountModel : public QSortFilterProxyModel
     Q_OBJECT
 
 public:
-    FilteredCoreAccountModel(CoreAccountModel *model, QObject *parent = 0);
+    FilteredCoreAccountModel(CoreAccountModel *model, QObject *parent = nullptr);
 
 protected:
-    virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
 
 private:
     AccountId _internalAccount;