Skip to content

Commit a149ca7

Browse files
PastaPastaPastaUdjinM6
authored andcommitted
Remove references to instantx and darksend in sendcoinsdialog.cpp (#2936)
* bUseInstantX -> bUseInstantSend & bUseDarkSend -> bUsePrivateSend and be backwords compatible Signed-off-by: Pasta <Pasta@dash.org> * remove old settings Signed-off-by: Pasta <Pasta@dash.org>
1 parent b74cd3e commit a149ca7

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

src/qt/sendcoinsdialog.cpp

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,24 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle, QWidget *p
7171

7272
// Dash specific
7373
QSettings settings;
74-
if (!settings.contains("bUseDarkSend"))
75-
settings.setValue("bUseDarkSend", false);
76-
if (!settings.contains("bUseInstantX"))
77-
settings.setValue("bUseInstantX", false);
74+
//TODO remove Darksend sometime after 0.14.1
75+
if (settings.contains("bUseDarkSend")) {
76+
settings.setValue("bUsePrivateSend", settings.value("bUseDarkSend").toBool());
77+
settings.remove("bUseDarkSend");
78+
}
79+
if (!settings.contains("bUsePrivateSend"))
80+
settings.setValue("bUsePrivateSend", false);
81+
82+
//TODO remove InstantX sometime after 0.14.1
83+
if (settings.contains("bUseInstantX")) {
84+
settings.setValue("bUseInstantSend", settings.value("bUseInstantX").toBool());
85+
settings.remove("bUseInstantX");
86+
}
87+
if (!settings.contains("bUseInstantSend"))
88+
settings.setValue("bUseInstantSend", false);
7889

79-
bool fUsePrivateSend = settings.value("bUseDarkSend").toBool();
80-
bool fUseInstantSend = settings.value("bUseInstantX").toBool();
90+
bool fUsePrivateSend = settings.value("bUsePrivateSend").toBool();
91+
bool fUseInstantSend = settings.value("bUseInstantSend").toBool();
8192
if(fLiteMode) {
8293
ui->checkUsePrivateSend->setChecked(false);
8394
ui->checkUsePrivateSend->setVisible(false);
@@ -586,7 +597,7 @@ void SendCoinsDialog::setBalance(const CAmount& balance, const CAmount& unconfir
586597
{
587598
uint64_t bal = 0;
588599
QSettings settings;
589-
settings.setValue("bUseDarkSend", ui->checkUsePrivateSend->isChecked());
600+
settings.setValue("bUsePrivateSend", ui->checkUsePrivateSend->isChecked());
590601
if(ui->checkUsePrivateSend->isChecked()) {
591602
bal = anonymizedBalance;
592603
} else {
@@ -611,7 +622,7 @@ void SendCoinsDialog::updateDisplayUnit()
611622
void SendCoinsDialog::updateInstantSend()
612623
{
613624
QSettings settings;
614-
settings.setValue("bUseInstantX", ui->checkUseInstantSend->isChecked());
625+
settings.setValue("bUseInstantSend", ui->checkUseInstantSend->isChecked());
615626
CoinControlDialog::coinControl->fUseInstantSend = model->IsOldInstantSendEnabled() && ui->checkUseInstantSend->isChecked();
616627
coinControlUpdateLabels();
617628
}

0 commit comments

Comments
 (0)