changeset 23706:5998ab270bf7

clean up old code from the moved traffic shaping
author Andrew Stone <g.andrew.stone@gmail.com>
date Fri, 04 Mar 2016 14:16:06 -0500
parents bac3c81409ed
children f5eb5416e1e0 f90bce4879d8
files src/qt/optionsdialog.cpp src/qt/optionsdialog.h src/qt/optionsmodel.cpp src/qt/optionsmodel.h
diffstat 4 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/optionsdialog.cpp	Thu Feb 25 14:44:27 2016 -0500
+++ b/src/qt/optionsdialog.cpp	Fri Mar 04 14:16:06 2016 -0500
@@ -35,7 +35,8 @@
 OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
     QDialog(parent),
     ui(new Ui::OptionsDialog),
-    portValidator(1, 65536, this),
+    portValidator(1, 65536, this),  // BU fix memory leaks
+    proxyPortValidator(1, 65536, this),
     model(0),
     mapper(0)
 {
@@ -57,7 +58,7 @@
 
     ui->proxyIpTor->setEnabled(false);
     ui->proxyPortTor->setEnabled(false);
-    ui->proxyPortTor->setValidator(new QIntValidator(1, 65535, this));
+    ui->proxyPortTor->setValidator(&proxyPortValidator);
 
     connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->proxyIp, SLOT(setEnabled(bool)));
     connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->proxyPort, SLOT(setEnabled(bool)));
--- a/src/qt/optionsdialog.h	Thu Feb 25 14:44:27 2016 -0500
+++ b/src/qt/optionsdialog.h	Fri Mar 04 14:16:06 2016 -0500
@@ -66,6 +66,7 @@
 private:
     Ui::OptionsDialog *ui;
     QIntValidator portValidator;
+    QIntValidator proxyPortValidator;
     OptionsModel *model;
     QDataWidgetMapper *mapper;
 };
--- a/src/qt/optionsmodel.cpp	Thu Feb 25 14:44:27 2016 -0500
+++ b/src/qt/optionsmodel.cpp	Fri Mar 04 14:16:06 2016 -0500
@@ -235,8 +235,6 @@
 bool OptionsModel::setData(const QModelIndex& index, const QVariant& value, int role)
 {
     bool successful = true; /* set to false on parse error */
-    bool changeSendShaper = false;
-    bool changeReceiveShaper = false;
     if (role == Qt::EditRole) {
         QSettings settings;
         switch (index.row()) {
--- a/src/qt/optionsmodel.h	Thu Feb 25 14:44:27 2016 -0500
+++ b/src/qt/optionsmodel.h	Fri Mar 04 14:16:06 2016 -0500
@@ -45,12 +45,6 @@
         DatabaseCache,          // int
         SpendZeroConfChange,    // bool
         Listen,                 // bool
-        UseReceiveShaping,      // bool
-        UseSendShaping,         // bool
-        ReceiveBurst,           // int
-        ReceiveAve,             // int
-        SendBurst,              // int
-        SendAve,                // int
         OptionIDRowCount,
     };