mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-12 15:09:59 +01:00
scripted-diff: Avoid interface keyword to fix windows gitian build
Rename `interface` to `interfaces` Build failure reported by Chun Kuan Lee <ken2812221@gmail.com> https://github.com/bitcoin/bitcoin/pull/10244#issuecomment-379434756 -BEGIN VERIFY SCRIPT- git mv src/interface src/interfaces ren() { git grep -l "$1" | xargs sed -i "s,$1,$2,g"; } ren interface/ interfaces/ ren interface:: interfaces:: ren BITCOIN_INTERFACE_ BITCOIN_INTERFACES_ ren "namespace interface" "namespace interfaces" -END VERIFY SCRIPT-
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
#include <qt/sendcoinsentry.h>
|
||||
|
||||
#include <chainparams.h>
|
||||
#include <interface/node.h>
|
||||
#include <interfaces/node.h>
|
||||
#include <key_io.h>
|
||||
#include <wallet/coincontrol.h>
|
||||
#include <ui_interface.h>
|
||||
@@ -149,9 +149,9 @@ void SendCoinsDialog::setModel(WalletModel *_model)
|
||||
}
|
||||
}
|
||||
|
||||
interface::WalletBalances balances = _model->wallet().getBalances();
|
||||
interfaces::WalletBalances balances = _model->wallet().getBalances();
|
||||
setBalance(balances);
|
||||
connect(_model, SIGNAL(balanceChanged(interface::WalletBalances)), this, SLOT(setBalance(interface::WalletBalances)));
|
||||
connect(_model, SIGNAL(balanceChanged(interfaces::WalletBalances)), this, SLOT(setBalance(interfaces::WalletBalances)));
|
||||
connect(_model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
|
||||
updateDisplayUnit();
|
||||
|
||||
@@ -515,7 +515,7 @@ bool SendCoinsDialog::handlePaymentRequest(const SendCoinsRecipient &rv)
|
||||
return true;
|
||||
}
|
||||
|
||||
void SendCoinsDialog::setBalance(const interface::WalletBalances& balances)
|
||||
void SendCoinsDialog::setBalance(const interfaces::WalletBalances& balances)
|
||||
{
|
||||
if(model && model->getOptionsModel())
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user