mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge b9219b233f into merged_master (Bitcoin PR bitcoin-core/gui#590)
This commit is contained in:
commit
943cdfe167
2 changed files with 14 additions and 16 deletions
|
|
@ -175,7 +175,7 @@ void WalletModel::updateWatchOnlyFlag(bool fHaveWatchonly)
|
|||
Q_EMIT notifyWatchonlyChanged(fHaveWatchonly);
|
||||
}
|
||||
|
||||
bool WalletModel::validateAddress(const QString &address)
|
||||
bool WalletModel::validateAddress(const QString& address) const
|
||||
{
|
||||
return IsValidDestinationString(address.toStdString());
|
||||
}
|
||||
|
|
@ -323,22 +323,22 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
|
|||
return SendCoinsReturn(OK);
|
||||
}
|
||||
|
||||
OptionsModel *WalletModel::getOptionsModel()
|
||||
OptionsModel* WalletModel::getOptionsModel() const
|
||||
{
|
||||
return optionsModel;
|
||||
}
|
||||
|
||||
AddressTableModel *WalletModel::getAddressTableModel()
|
||||
AddressTableModel* WalletModel::getAddressTableModel() const
|
||||
{
|
||||
return addressTableModel;
|
||||
}
|
||||
|
||||
TransactionTableModel *WalletModel::getTransactionTableModel()
|
||||
TransactionTableModel* WalletModel::getTransactionTableModel() const
|
||||
{
|
||||
return transactionTableModel;
|
||||
}
|
||||
|
||||
RecentRequestsTableModel *WalletModel::getRecentRequestsTableModel()
|
||||
RecentRequestsTableModel* WalletModel::getRecentRequestsTableModel() const
|
||||
{
|
||||
return recentRequestsTableModel;
|
||||
}
|
||||
|
|
@ -596,7 +596,7 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool WalletModel::displayAddress(std::string sAddress)
|
||||
bool WalletModel::displayAddress(std::string sAddress) const
|
||||
{
|
||||
CTxDestination dest = DecodeDestination(sAddress);
|
||||
bool res = false;
|
||||
|
|
@ -624,7 +624,7 @@ QString WalletModel::getDisplayName() const
|
|||
return name.isEmpty() ? "["+tr("default wallet")+"]" : name;
|
||||
}
|
||||
|
||||
bool WalletModel::isMultiwallet()
|
||||
bool WalletModel::isMultiwallet() const
|
||||
{
|
||||
return m_node.walletLoader().getWallets().size() > 1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue