GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge b9219b233f into merged_master (Bitcoin PR bitcoin-core/gui#590)

Browse source
This commit is contained in:
James Dorfman 2024-08-09 17:03:40 +00:00
commit 943cdfe167
2 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/qt/walletmodel.cpp
View file

@ -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;
}

16
src/qt/walletmodel.h
View file

@ -78,16 +78,16 @@ public:
Unlocked // wallet->IsCrypted() && !wallet->IsLocked()
};
OptionsModel *getOptionsModel();
AddressTableModel *getAddressTableModel();
TransactionTableModel *getTransactionTableModel();
RecentRequestsTableModel *getRecentRequestsTableModel();
OptionsModel* getOptionsModel() const;
AddressTableModel* getAddressTableModel() const;
TransactionTableModel* getTransactionTableModel() const;
RecentRequestsTableModel* getRecentRequestsTableModel() const;
std::set<CAsset> getAssetTypes() const;
EncryptionStatus getEncryptionStatus() const;
// Check address for validity
bool validateAddress(const QString &address);
bool validateAddress(const QString& address) const;
// Return status record for SendCoins, contains error id + information
struct SendCoinsReturn
@ -139,7 +139,7 @@ public:
UnlockContext requestUnlock();
bool bumpFee(uint256 hash, uint256& new_hash);
bool displayAddress(std::string sAddress);
bool displayAddress(std::string sAddress) const;
static bool isWalletEnabled();
@ -151,9 +151,7 @@ public:
QString getWalletName() const;
QString getDisplayName() const;
bool isMultiwallet();
AddressTableModel* getAddressTableModel() const { return addressTableModel; }
bool isMultiwallet() const;
void refresh(bool pk_hash_only = false);