[Qt] add defaultConfirmTarget constant to sendcoinsdialog

Philip Kaufmann · gavinandresen · commit e656560edb28 · 2015-05-14T10:37:19.000-04:00
- replaces some hard-coded values for the default confirmation target
- also simplify code that is using the new constant
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -590,12 +590,12 @@ void SendCoinsDialog::updateGlobalFeeVariables()
 {
     if (ui->radioSmartFee->isChecked())
     {
-        nTxConfirmTarget = (int)25 - (int)std::max(0, std::min(24, ui->sliderSmartFee->value()));
+        nTxConfirmTarget = defaultConfirmTarget - ui->sliderSmartFee->value();
         payTxFee = CFeeRate(0);
     }
     else
     {
-        nTxConfirmTarget = 25;
+        nTxConfirmTarget = defaultConfirmTarget;
         payTxFee = CFeeRate(ui->customFee->value());
         fPayAtLeastCustomFee = ui->radioCustomAtLeast->isChecked();
     }
@@ -629,7 +629,7 @@ void SendCoinsDialog::updateSmartFeeLabel()
     if(!model || !model->getOptionsModel())
         return;
 
-    int nBlocksToConfirm = (int)25 - (int)std::max(0, std::min(24, ui->sliderSmartFee->value()));
+    int nBlocksToConfirm = defaultConfirmTarget - ui->sliderSmartFee->value();
     CFeeRate feeRate = mempool.estimateFee(nBlocksToConfirm);
     if (feeRate <= CFeeRate(0)) // not enough data => minfee
     {
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
@@ -23,6 +23,8 @@ QT_BEGIN_NAMESPACE
 class QUrl;
 QT_END_NAMESPACE
 
+const int defaultConfirmTarget = 25;
+
 /** Dialog for sending bitcoins */
 class SendCoinsDialog : public QDialog
 {

Original file line number	Diff line number	Diff line change
`@@ -590,12 +590,12 @@ void SendCoinsDialog::updateGlobalFeeVariables()`
`590`	`590`	`{`
`591`	`591`	`if (ui->radioSmartFee->isChecked())`
`592`	`592`	`{`
`593`		`- nTxConfirmTarget = (int)25 - (int)std::max(0, std::min(24, ui->sliderSmartFee->value()));`
	`593`	`+ nTxConfirmTarget = defaultConfirmTarget - ui->sliderSmartFee->value();`
`594`	`594`	`payTxFee = CFeeRate(0);`
`595`	`595`	`}`
`596`	`596`	`else`
`597`	`597`	`{`
`598`		`- nTxConfirmTarget = 25;`
	`598`	`+ nTxConfirmTarget = defaultConfirmTarget;`
`599`	`599`	`payTxFee = CFeeRate(ui->customFee->value());`
`600`	`600`	`fPayAtLeastCustomFee = ui->radioCustomAtLeast->isChecked();`
`601`	`601`	`}`
`@@ -629,7 +629,7 @@ void SendCoinsDialog::updateSmartFeeLabel()`
`629`	`629`	`if(!model \|\| !model->getOptionsModel())`
`630`	`630`	`return;`
`631`	`631`
`632`		`- int nBlocksToConfirm = (int)25 - (int)std::max(0, std::min(24, ui->sliderSmartFee->value()));`
	`632`	`+ int nBlocksToConfirm = defaultConfirmTarget - ui->sliderSmartFee->value();`
`633`	`633`	`CFeeRate feeRate = mempool.estimateFee(nBlocksToConfirm);`
`634`	`634`	`if (feeRate <= CFeeRate(0)) // not enough data => minfee`
`635`	`635`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ QT_BEGIN_NAMESPACE`
`23`	`23`	`class QUrl;`
`24`	`24`	`QT_END_NAMESPACE`
`25`	`25`
	`26`	`+const int defaultConfirmTarget = 25;`
	`27`	`+`
`26`	`28`	`/** Dialog for sending bitcoins */`
`27`	`29`	`class SendCoinsDialog : public QDialog`
`28`	`30`	`{`