diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-19 16:55:18 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-19 17:05:35 +0100 |
| commit | c39dd2ef59c986576726cc356a27165486fd0d65 (patch) | |
| tree | c2cd0eadc85324335722dbd25fc897d37197840e /src/qt/editaddressdialog.cpp | |
| parent | 6324c68aa017ceb48fe3edfb5a2b141fcf0090fa (diff) | |
| parent | fab8a6f609d15863545955d6523c616c2a97eeab (diff) | |
| download | bitcoin-c39dd2ef59c986576726cc356a27165486fd0d65.tar.xz | |
Merge #12408: wallet: Change output type globals to members
fab8a6f60 wallet: Change output type globals to members (MarcoFalke)
Pull request description:
Output type is used by the wallet when generating addresses or transactions with change, thus it should be a member of `CWallet`.
Moreover, in light of multiwallet, it makes sense to prepare for per-wallet attributes instead of for-all-wallets globals.
Tree-SHA512: 4fa397cd82522e5bacf4870160a2a0f5e1f2dc046e4b9e2514dee18b187a0e1724d036315f77fa48e48f85533021d5e5525d798160a92d389d75512f3f9e1405
Diffstat (limited to 'src/qt/editaddressdialog.cpp')
| -rw-r--r-- | src/qt/editaddressdialog.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index a945fc6aa0..ba2f7d0d1d 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -11,7 +11,6 @@ #include <QDataWidgetMapper> #include <QMessageBox> -extern OutputType g_address_type; EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) : QDialog(parent), @@ -80,7 +79,7 @@ bool EditAddressDialog::saveCurrentRow() mode == NewSendingAddress ? AddressTableModel::Send : AddressTableModel::Receive, ui->labelEdit->text(), ui->addressEdit->text(), - g_address_type); + model->GetDefaultAddressType()); break; case EditReceivingAddress: case EditSendingAddress: |