LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #12906: Avoid interface keyword to fix windows gitian build

Browse source 
17780d6f35 scripted-diff: Avoid `interface` keyword to fix windows gitian build (Russell Yanofsky)

Pull request description:

  Rename `interface` to `interfaces`

  Build failure reported by ken2812221 in https://github.com/bitcoin/bitcoin/pull/10244#issuecomment-379434756

Tree-SHA512: e02c97c728540f344202c13b036f9f63af23bd25e25ed7a5cfe9e2c2f201a12ff232cc94a93fbe37ef6fb6bf9e036fe62210ba798ecd30de191d09338754a8d0
This commit is contained in:
MarcoFalke 2018-04-07 15:19:43 -04:00
commit 048ac8326b
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
57 changed files with 211 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/developer-notes.md
View file

@ -623,7 +623,7 @@ GUI
holds: try to not directly access core data structures from Views.
- Avoid adding slow or blocking code in the GUI thread. In particular do not
add new `interface::Node` and `interface::Wallet` method calls, even if they
add new `interfaces::Node` and `interfaces::Wallet` method calls, even if they
may be fast now, in case they are changed to lock or communicate across
processes in the future.

12
src/Makefile.am
View file

@ -105,9 +105,9 @@ BITCOIN_CORE_H = \
httpserver.h \
indirectmap.h \
init.h \
interface/handler.h \
interface/node.h \
interface/wallet.h \
interfaces/handler.h \
interfaces/node.h \
interfaces/wallet.h \
key.h \
key_io.h \
keystore.h \
@ -248,7 +248,7 @@ endif
libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_wallet_a_SOURCES = \
interface/wallet.cpp \
interfaces/wallet.cpp \
wallet/crypter.cpp \
wallet/db.cpp \
wallet/feebumper.cpp \
@ -361,8 +361,8 @@ libbitcoin_util_a_SOURCES = \
compat/glibcxx_sanity.cpp \
compat/strnlen.cpp \
fs.cpp \
interface/handler.cpp \
interface/node.cpp \
interfaces/handler.cpp \
interfaces/node.cpp \
random.cpp \
rpc/protocol.cpp \
rpc/util.cpp \

0
src/interface/README.md → src/interfaces/README.md
View file

6
src/interface/handler.cpp → src/interfaces/handler.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <interface/handler.h>
#include <interfaces/handler.h>
#include <util.h>
@ -10,7 +10,7 @@
#include <memory>
#include <utility>
namespace interface {
namespace interfaces {
namespace {
class HandlerImpl : public Handler
@ -30,4 +30,4 @@ std::unique_ptr<Handler> MakeHandler(boost::signals2::connection connection)
return MakeUnique<HandlerImpl>(std::move(connection));
}
} // namespace interface
} // namespace interfaces

10
src/interface/handler.h → src/interfaces/handler.h
View file

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_INTERFACE_HANDLER_H
#define BITCOIN_INTERFACE_HANDLER_H
#ifndef BITCOIN_INTERFACES_HANDLER_H
#define BITCOIN_INTERFACES_HANDLER_H
#include <memory>
@ -13,7 +13,7 @@ class connection;
} // namespace signals2
} // namespace boost
namespace interface {
namespace interfaces {
//! Generic interface for managing an event handler or callback function
//! registered with another interface. Has a single disconnect method to cancel
@ -30,6 +30,6 @@ public:
//! Return handler wrapping a boost signal connection.
std::unique_ptr<Handler> MakeHandler(boost::signals2::connection connection);
} // namespace interface
} // namespace interfaces
#endif // BITCOIN_INTERFACE_HANDLER_H
#endif // BITCOIN_INTERFACES_HANDLER_H

10
src/interface/node.cpp → src/interfaces/node.cpp
View file

@ -2,15 +2,15 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <interface/node.h>
#include <interfaces/node.h>
#include <addrdb.h>
#include <amount.h>
#include <chain.h>
#include <chainparams.h>
#include <init.h>
#include <interface/handler.h>
#include <interface/wallet.h>
#include <interfaces/handler.h>
#include <interfaces/wallet.h>
#include <net.h>
#include <net_processing.h>
#include <netaddress.h>
@ -43,7 +43,7 @@
#include <boost/thread/thread.hpp>
#include <univalue.h>
namespace interface {
namespace interfaces {
namespace {
class NodeImpl : public Node
@ -305,4 +305,4 @@ class NodeImpl : public Node
std::unique_ptr<Node> MakeNode() { return MakeUnique<NodeImpl>(); }
} // namespace interface
} // namespace interfaces

10
src/interface/node.h → src/interfaces/node.h
View file

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_INTERFACE_NODE_H
#define BITCOIN_INTERFACE_NODE_H
#ifndef BITCOIN_INTERFACES_NODE_H
#define BITCOIN_INTERFACES_NODE_H
#include <addrdb.h> // For banmap_t
#include <amount.h> // For CAmount
@ -29,7 +29,7 @@ class proxyType;
enum class FeeReason;
struct CNodeStateStats;
namespace interface {
namespace interfaces {
class Handler;
class Wallet;
@ -254,6 +254,6 @@ public:
//! Return implementation of Node interface.
std::unique_ptr<Node> MakeNode();
} // namespace interface
} // namespace interfaces
#endif // BITCOIN_INTERFACE_NODE_H
#endif // BITCOIN_INTERFACES_NODE_H

10
src/interface/wallet.cpp → src/interfaces/wallet.cpp
View file

@ -2,12 +2,12 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <interface/wallet.h>
#include <interfaces/wallet.h>
#include <amount.h>
#include <chain.h>
#include <consensus/validation.h>
#include <interface/handler.h>
#include <interfaces/handler.h>
#include <net.h>
#include <policy/policy.h>
#include <primitives/transaction.h>
@ -24,7 +24,7 @@
#include <memory>
namespace interface {
namespace interfaces {
namespace {
class PendingWalletTxImpl : public PendingWalletTx
@ -283,7 +283,7 @@ public:
return result;
}
bool tryGetTxStatus(const uint256& txid,
interface::WalletTxStatus& tx_status,
interfaces::WalletTxStatus& tx_status,
int& num_blocks,
int64_t& adjusted_time) override
{
@ -438,4 +438,4 @@ public:
std::unique_ptr<Wallet> MakeWallet(CWallet& wallet) { return MakeUnique<WalletImpl>(wallet); }
} // namespace interface
} // namespace interfaces

10
src/interface/wallet.h → src/interfaces/wallet.h
View file

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_INTERFACE_WALLET_H
#define BITCOIN_INTERFACE_WALLET_H
#ifndef BITCOIN_INTERFACES_WALLET_H
#define BITCOIN_INTERFACES_WALLET_H
#include <amount.h> // For CAmount
#include <pubkey.h> // For CTxDestination (CKeyID and CScriptID)
@ -27,7 +27,7 @@ class CWallet;
enum class OutputType;
struct CRecipient;
namespace interface {
namespace interfaces {
class Handler;
class PendingWalletTx;
@ -347,6 +347,6 @@ struct WalletTxOut
//! in builds where ENABLE_WALLET is false.
std::unique_ptr<Wallet> MakeWallet(CWallet& wallet);
} // namespace interface
} // namespace interfaces
#endif // BITCOIN_INTERFACE_WALLET_H
#endif // BITCOIN_INTERFACES_WALLET_H

4
src/qt/addresstablemodel.cpp
View file

@ -7,7 +7,7 @@
#include <qt/guiutil.h>
#include <qt/walletmodel.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <key_io.h>
#include <wallet/wallet.h>
@ -74,7 +74,7 @@ public:
AddressTablePriv(AddressTableModel *_parent):
parent(_parent) {}
void refreshAddressTable(interface::Wallet& wallet)
void refreshAddressTable(interfaces::Wallet& wallet)
{
cachedAddressTable.clear();
{

2
src/qt/addresstablemodel.h
View file

@ -13,7 +13,7 @@ enum class OutputType;
class AddressTablePriv;
class WalletModel;
namespace interface {
namespace interfaces {
class Wallet;
}

6
src/qt/bantablemodel.cpp
View file

@ -8,7 +8,7 @@
#include <qt/guiconstants.h>
#include <qt/guiutil.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <sync.h>
#include <utiltime.h>
@ -46,7 +46,7 @@ public:
Qt::SortOrder sortOrder;
/** Pull a full list of banned nodes from CNode into our cache */
void refreshBanlist(interface::Node& node)
void refreshBanlist(interfaces::Node& node)
{
banmap_t banMap;
node.getBanned(banMap);
@ -82,7 +82,7 @@ public:
}
};
BanTableModel::BanTableModel(interface::Node& node, ClientModel *parent) :
BanTableModel::BanTableModel(interfaces::Node& node, ClientModel *parent) :
QAbstractTableModel(parent),
m_node(node),
clientModel(parent)

6
src/qt/bantablemodel.h
View file

@ -15,7 +15,7 @@
class ClientModel;
class BanTablePriv;
namespace interface {
namespace interfaces {
class Node;
}
@ -45,7 +45,7 @@ class BanTableModel : public QAbstractTableModel
Q_OBJECT
public:
explicit BanTableModel(interface::Node& node, ClientModel *parent = 0);
explicit BanTableModel(interfaces::Node& node, ClientModel *parent = 0);
~BanTableModel();
void startAutoRefresh();
void stopAutoRefresh();
@ -71,7 +71,7 @@ public Q_SLOTS:
void refresh();
private:
interface::Node& m_node;
interfaces::Node& m_node;
ClientModel *clientModel;
QStringList columns;
std::unique_ptr<BanTablePriv> priv;

20
src/qt/bitcoin.cpp
View file

@ -27,8 +27,8 @@
#endif
#include <init.h>
#include <interface/handler.h>
#include <interface/node.h>
#include <interfaces/handler.h>
#include <interfaces/node.h>
#include <rpc/server.h>
#include <ui_interface.h>
#include <uint256.h>
@ -179,7 +179,7 @@ class BitcoinCore: public QObject
{
Q_OBJECT
public:
explicit BitcoinCore(interface::Node& node);
explicit BitcoinCore(interfaces::Node& node);
public Q_SLOTS:
void initialize();
@ -194,7 +194,7 @@ private:
/// Pass fatal exception message to UI thread
void handleRunawayException(const std::exception *e);
interface::Node& m_node;
interfaces::Node& m_node;
};
/** Main Bitcoin application object */
@ -202,7 +202,7 @@ class BitcoinApplication: public QApplication
{
Q_OBJECT
public:
explicit BitcoinApplication(interface::Node& node, int &argc, char **argv);
explicit BitcoinApplication(interfaces::Node& node, int &argc, char **argv);
~BitcoinApplication();
#ifdef ENABLE_WALLET
@ -243,7 +243,7 @@ Q_SIGNALS:
private:
QThread *coreThread;
interface::Node& m_node;
interfaces::Node& m_node;
OptionsModel *optionsModel;
ClientModel *clientModel;
BitcoinGUI *window;
@ -261,7 +261,7 @@ private:
#include <qt/bitcoin.moc>
BitcoinCore::BitcoinCore(interface::Node& node) :
BitcoinCore::BitcoinCore(interfaces::Node& node) :
QObject(), m_node(node)
{
}
@ -301,7 +301,7 @@ void BitcoinCore::shutdown()
}
}
BitcoinApplication::BitcoinApplication(interface::Node& node, int &argc, char **argv):
BitcoinApplication::BitcoinApplication(interfaces::Node& node, int &argc, char **argv):
QApplication(argc, argv),
coreThread(0),
m_node(node),
@ -532,7 +532,7 @@ int main(int argc, char *argv[])
{
SetupEnvironment();
std::unique_ptr<interface::Node> node = interface::MakeNode();
std::unique_ptr<interfaces::Node> node = interfaces::MakeNode();
/// 1. Parse command-line options. These take precedence over anything else.
// Command-line options take precedence:
@ -679,7 +679,7 @@ int main(int argc, char *argv[])
app.createOptionsModel(gArgs.GetBoolArg("-resetguisettings", false));
// Subscribe to global signals from core
std::unique_ptr<interface::Handler> handler = node->handleInitMessage(InitMessage);
std::unique_ptr<interfaces::Handler> handler = node->handleInitMessage(InitMessage);
if (gArgs.GetBoolArg("-splash", DEFAULT_SPLASHSCREEN) && !gArgs.GetBoolArg("-min", false))
app.createSplashScreen(networkStyle.data());

6
src/qt/bitcoingui.cpp
View file

@ -30,8 +30,8 @@
#include <chainparams.h>
#include <init.h>
#include <interface/handler.h>
#include <interface/node.h>
#include <interfaces/handler.h>
#include <interfaces/node.h>
#include <ui_interface.h>
#include <util.h>
@ -74,7 +74,7 @@ const std::string BitcoinGUI::DEFAULT_UIPLATFORM =
#endif
;
BitcoinGUI::BitcoinGUI(interface::Node& node, const PlatformStyle *_platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformStyle, const NetworkStyle *networkStyle, QWidget *parent) :
QMainWindow(parent),
enableWallet(false),
m_node(node),

10
src/qt/bitcoingui.h
View file

@ -33,7 +33,7 @@ class WalletModel;
class HelpMessageDialog;
class ModalOverlay;
namespace interface {
namespace interfaces {
class Handler;
class Node;
}
@ -56,7 +56,7 @@ class BitcoinGUI : public QMainWindow
public:
static const std::string DEFAULT_UIPLATFORM;
explicit BitcoinGUI(interface::Node& node, const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent = 0);
explicit BitcoinGUI(interfaces::Node& node, const PlatformStyle *platformStyle, const NetworkStyle *networkStyle, QWidget *parent = 0);
~BitcoinGUI();
/** Set the client model.
@ -83,9 +83,9 @@ protected:
bool eventFilter(QObject *object, QEvent *event);
private:
interface::Node& m_node;
std::unique_ptr<interface::Handler> m_handler_message_box;
std::unique_ptr<interface::Handler> m_handler_question;
interfaces::Node& m_node;
std::unique_ptr<interfaces::Handler> m_handler_message_box;
std::unique_ptr<interfaces::Handler> m_handler_question;
ClientModel *clientModel;
WalletFrame *walletFrame;

6
src/qt/clientmodel.cpp
View file

@ -13,8 +13,8 @@
#include <chainparams.h>
#include <checkpoints.h>
#include <clientversion.h>
#include <interface/handler.h>
#include <interface/node.h>
#include <interfaces/handler.h>
#include <interfaces/node.h>
#include <validation.h>
#include <net.h>
#include <txmempool.h>
@ -32,7 +32,7 @@ class CBlockIndex;
static int64_t nLastHeaderTipUpdateNotification = 0;
static int64_t nLastBlockTipUpdateNotification = 0;
ClientModel::ClientModel(interface::Node& node, OptionsModel *_optionsModel, QObject *parent) :
ClientModel::ClientModel(interfaces::Node& node, OptionsModel *_optionsModel, QObject *parent) :
QObject(parent),
m_node(node),
optionsModel(_optionsModel),

22
src/qt/clientmodel.h
View file

@ -17,7 +17,7 @@ class PeerTableModel;
class CBlockIndex;
namespace interface {
namespace interfaces {
class Handler;
class Node;
}
@ -46,10 +46,10 @@ class ClientModel : public QObject
Q_OBJECT
public:
explicit ClientModel(interface::Node& node, OptionsModel *optionsModel, QObject *parent = 0);
explicit ClientModel(interfaces::Node& node, OptionsModel *optionsModel, QObject *parent = 0);
~ClientModel();
interface::Node& node() const { return m_node; }
interfaces::Node& node() const { return m_node; }
OptionsModel *getOptionsModel();
PeerTableModel *getPeerTableModel();
BanTableModel *getBanTableModel();
@ -75,14 +75,14 @@ public:
mutable std::atomic<int64_t> cachedBestHeaderTime;
private:
interface::Node& m_node;
std::unique_ptr<interface::Handler> m_handler_show_progress;
std::unique_ptr<interface::Handler> m_handler_notify_num_connections_changed;
std::unique_ptr<interface::Handler> m_handler_notify_network_active_changed;
std::unique_ptr<interface::Handler> m_handler_notify_alert_changed;
std::unique_ptr<interface::Handler> m_handler_banned_list_changed;
std::unique_ptr<interface::Handler> m_handler_notify_block_tip;
std::unique_ptr<interface::Handler> m_handler_notify_header_tip;
interfaces::Node& m_node;
std::unique_ptr<interfaces::Handler> m_handler_show_progress;
std::unique_ptr<interfaces::Handler> m_handler_notify_num_connections_changed;
std::unique_ptr<interfaces::Handler> m_handler_notify_network_active_changed;
std::unique_ptr<interfaces::Handler> m_handler_notify_alert_changed;
std::unique_ptr<interfaces::Handler> m_handler_banned_list_changed;
std::unique_ptr<interfaces::Handler> m_handler_notify_block_tip;
std::unique_ptr<interfaces::Handler> m_handler_notify_header_tip;
OptionsModel *optionsModel;
PeerTableModel *peerTableModel;
BanTableModel *banTableModel;

4
src/qt/coincontroldialog.cpp
View file

@ -14,7 +14,7 @@
#include <qt/walletmodel.h>
#include <wallet/coincontrol.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <key_io.h>
#include <policy/fees.h>
#include <policy/policy.h>
@ -648,7 +648,7 @@ void CoinControlDialog::updateView()
int nChildren = 0;
for (const auto& outpair : coins.second) {
const COutPoint& output = std::get<0>(outpair);
const interface::WalletTxOut& out = std::get<1>(outpair);
const interfaces::WalletTxOut& out = std::get<1>(outpair);
nSum += out.txout.nValue;
nChildren++;

4
src/qt/guiutil.cpp
View file

@ -13,7 +13,7 @@
#include <chainparams.h>
#include <primitives/transaction.h>
#include <key_io.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <policy/policy.h>
#include <protocol.h>
#include <script/script.h>
@ -232,7 +232,7 @@ QString formatBitcoinURI(const SendCoinsRecipient &info)
return ret;
}
bool isDust(interface::Node& node, const QString& address, const CAmount& amount)
bool isDust(interfaces::Node& node, const QString& address, const CAmount& amount)
{
CTxDestination dest = DecodeDestination(address.toStdString());
CScript script = GetScriptForDestination(dest);

4
src/qt/guiutil.h
View file

@ -20,7 +20,7 @@
class QValidatedLineEdit;
class SendCoinsRecipient;
namespace interface
namespace interfaces
{
class Node;
}
@ -54,7 +54,7 @@ namespace GUIUtil
QString formatBitcoinURI(const SendCoinsRecipient &info);
// Returns true if given address+amount meets "dust" definition
bool isDust(interface::Node& node, const QString& address, const CAmount& amount);
bool isDust(interfaces::Node& node, const QString& address, const CAmount& amount);
// HTML escaping for rich text controls
QString HtmlEscape(const QString& str, bool fMultiLine=false);

4
src/qt/intro.cpp
View file

@ -12,7 +12,7 @@
#include <qt/guiutil.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <util.h>
#include <QFileDialog>
@ -187,7 +187,7 @@ QString Intro::getDefaultDataDirectory()
return GUIUtil::boostPathToQString(GetDefaultDataDir());
}
bool Intro::pickDataDirectory(interface::Node& node)
bool Intro::pickDataDirectory(interfaces::Node& node)
{
QSettings settings;
/* If data directory provided on command line, no need to look at settings

4
src/qt/intro.h
View file

@ -13,7 +13,7 @@ static const bool DEFAULT_CHOOSE_DATADIR = false;
class FreespaceChecker;
namespace interface {
namespace interfaces {
class Node;
}
@ -45,7 +45,7 @@ public:
* @note do NOT call global GetDataDir() before calling this function, this
* will cause the wrong path to be cached.
*/
static bool pickDataDirectory(interface::Node& node);
static bool pickDataDirectory(interfaces::Node& node);
/**
* Determine default data directory for operating system.

2
src/qt/optionsdialog.cpp
View file

@ -13,7 +13,7 @@
#include <qt/guiutil.h>
#include <qt/optionsmodel.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <validation.h> // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS
#include <netbase.h>
#include <txdb.h> // for -dbcache defaults

4
src/qt/optionsmodel.cpp
View file

@ -11,7 +11,7 @@
#include <qt/bitcoinunits.h>
#include <qt/guiutil.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <validation.h> // For DEFAULT_SCRIPTCHECK_THREADS
#include <net.h>
#include <netbase.h>
@ -24,7 +24,7 @@
const char *DEFAULT_GUI_PROXY_HOST = "127.0.0.1";
OptionsModel::OptionsModel(interface::Node& node, QObject *parent, bool resetSettings) :
OptionsModel::OptionsModel(interfaces::Node& node, QObject *parent, bool resetSettings) :
QAbstractListModel(parent), m_node(node)
{
Init(resetSettings);

8
src/qt/optionsmodel.h
View file

@ -9,7 +9,7 @@
#include <QAbstractListModel>
namespace interface {
namespace interfaces {
class Node;
}
@ -31,7 +31,7 @@ class OptionsModel : public QAbstractListModel
Q_OBJECT
public:
explicit OptionsModel(interface::Node& node, QObject *parent = 0, bool resetSettings = false);
explicit OptionsModel(interfaces::Node& node, QObject *parent = 0, bool resetSettings = false);
enum OptionID {
StartAtStartup, // bool
@ -79,10 +79,10 @@ public:
void setRestartRequired(bool fRequired);
bool isRestartRequired() const;
interface::Node& node() const { return m_node; }
interfaces::Node& node() const { return m_node; }
private:
interface::Node& m_node;
interfaces::Node& m_node;
/* Qt-only settings */
bool fHideTrayIcon;
bool fMinimizeToTray;

10
src/qt/overviewpage.cpp
View file

@ -21,7 +21,7 @@
#define DECORATION_SIZE 54
#define NUM_ITEMS 5
Q_DECLARE_METATYPE(interface::WalletBalances)
Q_DECLARE_METATYPE(interfaces::WalletBalances)
class TxViewDelegate : public QAbstractItemDelegate
{
@ -157,7 +157,7 @@ OverviewPage::~OverviewPage()
delete ui;
}
void OverviewPage::setBalance(const interface::WalletBalances& balances)
void OverviewPage::setBalance(const interfaces::WalletBalances& balances)
{
int unit = walletModel->getOptionsModel()->getDisplayUnit();
m_balances = balances;
@ -224,10 +224,10 @@ void OverviewPage::setWalletModel(WalletModel *model)
ui->listTransactions->setModelColumn(TransactionTableModel::ToAddress);
// Keep up to date with wallet
interface::Wallet& wallet = model->wallet();
interface::WalletBalances balances = wallet.getBalances();
interfaces::Wallet& wallet = model->wallet();
interfaces::WalletBalances balances = 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()));

6
src/qt/overviewpage.h
View file

@ -5,7 +5,7 @@
#ifndef BITCOIN_QT_OVERVIEWPAGE_H
#define BITCOIN_QT_OVERVIEWPAGE_H
#include <interface/wallet.h>
#include <interfaces/wallet.h>
#include <QWidget>
#include <memory>
@ -38,7 +38,7 @@ public:
void showOutOfSyncWarning(bool fShow);
public Q_SLOTS:
void setBalance(const interface::WalletBalances& balances);
void setBalance(const interfaces::WalletBalances& balances);
Q_SIGNALS:
void transactionClicked(const QModelIndex &index);
@ -48,7 +48,7 @@ private:
Ui::OverviewPage *ui;
ClientModel *clientModel;
WalletModel *walletModel;
interface::WalletBalances m_balances;
interfaces::WalletBalances m_balances;
TxViewDelegate *txdelegate;
std::unique_ptr<TransactionFilterProxy> filter;

6
src/qt/paymentserver.cpp
View file

@ -9,7 +9,7 @@
#include <qt/optionsmodel.h>
#include <chainparams.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <policy/policy.h>
#include <key_io.h>
#include <ui_interface.h>
@ -201,7 +201,7 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)
// Warning: ipcSendCommandLine() is called early in init,
// so don't use "Q_EMIT message()", but "QMessageBox::"!
//
void PaymentServer::ipcParseCommandLine(interface::Node& node, int argc, char* argv[])
void PaymentServer::ipcParseCommandLine(interfaces::Node& node, int argc, char* argv[])
{
for (int i = 1; i < argc; i++)
{
@ -760,7 +760,7 @@ void PaymentServer::handlePaymentACK(const QString& paymentACKMsg)
Q_EMIT message(tr("Payment acknowledged"), paymentACKMsg, CClientUIInterface::ICON_INFORMATION | CClientUIInterface::MODAL);
}
bool PaymentServer::verifyNetwork(interface::Node& node, const payments::PaymentDetails& requestDetails)
bool PaymentServer::verifyNetwork(interfaces::Node& node, const payments::PaymentDetails& requestDetails)
{
bool fVerified = requestDetails.network() == node.getNetwork();
if (!fVerified) {

4
src/qt/paymentserver.h
View file

@ -60,7 +60,7 @@ class PaymentServer : public QObject
public:
// Parse URIs on command line
// Returns false on error
static void ipcParseCommandLine(interface::Node& node, int argc, char *argv[]);
static void ipcParseCommandLine(interfaces::Node& node, int argc, char *argv[]);
// Returns true if there were URIs on the command line
// which were successfully sent to an already-running
@ -87,7 +87,7 @@ public:
void setOptionsModel(OptionsModel *optionsModel);
// Verify that the payment request network matches the client network
static bool verifyNetwork(interface::Node& node, const payments::PaymentDetails& requestDetails);
static bool verifyNetwork(interfaces::Node& node, const payments::PaymentDetails& requestDetails);
// Verify if the payment request is expired
static bool verifyExpired(const payments::PaymentDetails& requestDetails);
// Verify the payment request size is valid as per BIP70

8
src/qt/peertablemodel.cpp
View file

@ -8,7 +8,7 @@
#include <qt/guiconstants.h>
#include <qt/guiutil.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <validation.h> // for cs_main
#include <sync.h>
@ -57,12 +57,12 @@ public:
std::map<NodeId, int> mapNodeRows;
/** Pull a full list of peers from vNodes into our cache */
void refreshPeers(interface::Node& node)
void refreshPeers(interfaces::Node& node)
{
{
cachedNodeStats.clear();
interface::Node::NodesStats nodes_stats;
interfaces::Node::NodesStats nodes_stats;
node.getNodesStats(nodes_stats);
#if QT_VERSION >= 0x040700
cachedNodeStats.reserve(nodes_stats.size());
@ -102,7 +102,7 @@ public:
}
};
PeerTableModel::PeerTableModel(interface::Node& node, ClientModel *parent) :
PeerTableModel::PeerTableModel(interfaces::Node& node, ClientModel *parent) :
QAbstractTableModel(parent),
m_node(node),
clientModel(parent),

6
src/qt/peertablemodel.h
View file

@ -16,7 +16,7 @@
class ClientModel;
class PeerTablePriv;
namespace interface {
namespace interfaces {
class Node;
}
@ -51,7 +51,7 @@ class PeerTableModel : public QAbstractTableModel
Q_OBJECT
public:
explicit PeerTableModel(interface::Node& node, ClientModel *parent = 0);
explicit PeerTableModel(interfaces::Node& node, ClientModel *parent = 0);
~PeerTableModel();
const CNodeCombinedStats *getNodeStats(int idx);
int getRowByNodeId(NodeId nodeid);
@ -82,7 +82,7 @@ public Q_SLOTS:
void refresh();
private:
interface::Node& m_node;
interfaces::Node& m_node;
ClientModel *clientModel;
QStringList columns;
std::unique_ptr<PeerTablePriv> priv;

12
src/qt/rpcconsole.cpp
View file

@ -14,7 +14,7 @@
#include <qt/platformstyle.h>
#include <qt/walletmodel.h>
#include <chainparams.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <netbase.h>
#include <rpc/server.h>
#include <rpc/client.h>
@ -85,7 +85,7 @@ class RPCExecutor : public QObject
{
Q_OBJECT
public:
RPCExecutor(interface::Node& node) : m_node(node) {}
RPCExecutor(interfaces::Node& node) : m_node(node) {}
public Q_SLOTS:
void request(const QString &command, const QString &walletID);
@ -94,7 +94,7 @@ Q_SIGNALS:
void reply(int category, const QString &command);
private:
interface::Node& m_node;
interfaces::Node& m_node;
};
/** Class for handling RPC timers
@ -153,7 +153,7 @@ public:
* @param[out] pstrFilteredOut Command line, filtered to remove any sensitive data
*/
bool RPCConsole::RPCParseCommandLine(interface::Node* node, std::string &strResult, const std::string &strCommand, const bool fExecute, std::string * const pstrFilteredOut, const std::string *walletID)
bool RPCConsole::RPCParseCommandLine(interfaces::Node* node, std::string &strResult, const std::string &strCommand, const bool fExecute, std::string * const pstrFilteredOut, const std::string *walletID)
{
std::vector< std::vector<std::string> > stack;
stack.push_back(std::vector<std::string>());
@ -451,7 +451,7 @@ void RPCExecutor::request(const QString &command, const QString &walletID)
}
}
RPCConsole::RPCConsole(interface::Node& node, const PlatformStyle *_platformStyle, QWidget *parent) :
RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformStyle, QWidget *parent) :
QWidget(parent),
m_node(node),
ui(new Ui::RPCConsole),
@ -575,7 +575,7 @@ void RPCConsole::setClientModel(ClientModel *model)
setNumConnections(model->getNumConnections());
connect(model, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
interface::Node& node = clientModel->node();
interfaces::Node& node = clientModel->node();
setNumBlocks(node.getNumBlocks(), QDateTime::fromTime_t(node.getLastBlockTime()), node.getVerificationProgress(), false);
connect(model, SIGNAL(numBlocksChanged(int,QDateTime,double,bool)), this, SLOT(setNumBlocks(int,QDateTime,double,bool)));

10
src/qt/rpcconsole.h
View file

@ -19,7 +19,7 @@ class PlatformStyle;
class RPCTimerInterface;
class WalletModel;
namespace interface {
namespace interfaces {
class Node;
}
@ -38,11 +38,11 @@ class RPCConsole: public QWidget
Q_OBJECT
public:
explicit RPCConsole(interface::Node& node, const PlatformStyle *platformStyle, QWidget *parent);
explicit RPCConsole(interfaces::Node& node, const PlatformStyle *platformStyle, QWidget *parent);
~RPCConsole();
static bool RPCParseCommandLine(interface::Node* node, std::string &strResult, const std::string &strCommand, bool fExecute, std::string * const pstrFilteredOut = nullptr, const std::string *walletID = nullptr);
static bool RPCExecuteCommandLine(interface::Node& node, std::string &strResult, const std::string &strCommand, std::string * const pstrFilteredOut = nullptr, const std::string *walletID = nullptr) {
static bool RPCParseCommandLine(interfaces::Node* node, std::string &strResult, const std::string &strCommand, bool fExecute, std::string * const pstrFilteredOut = nullptr, const std::string *walletID = nullptr);
static bool RPCExecuteCommandLine(interfaces::Node& node, std::string &strResult, const std::string &strCommand, std::string * const pstrFilteredOut = nullptr, const std::string *walletID = nullptr) {
return RPCParseCommandLine(&node, strResult, strCommand, true, pstrFilteredOut, walletID);
}
@ -144,7 +144,7 @@ private:
};
interface::Node& m_node;
interfaces::Node& m_node;
Ui::RPCConsole *ui;
ClientModel *clientModel;
QStringList history;

8
src/qt/sendcoinsdialog.cpp
View file

@ -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())
{

2
src/qt/sendcoinsdialog.h
View file

@ -51,7 +51,7 @@ public Q_SLOTS:
void accept();
SendCoinsEntry *addEntry();
void updateTabsAndLabels();
void setBalance(const interface::WalletBalances& balances);
void setBalance(const interfaces::WalletBalances& balances);
Q_SIGNALS:
void coinsSent(const uint256& txid);

2
src/qt/sendcoinsentry.cpp
View file

@ -127,7 +127,7 @@ void SendCoinsEntry::useAvailableBalanceClicked()
Q_EMIT useAvailableBalance(this);
}
bool SendCoinsEntry::validate(interface::Node& node)
bool SendCoinsEntry::validate(interfaces::Node& node)
{
if (!model)
return false;

2
src/qt/sendcoinsentry.h
View file

@ -30,7 +30,7 @@ public:
~SendCoinsEntry();
void setModel(WalletModel *model);
bool validate(interface::Node& node);
bool validate(interfaces::Node& node);
SendCoinsRecipient getValue();
/** Return whether the entry is still empty and unedited */

12
src/qt/splashscreen.cpp
View file

@ -12,9 +12,9 @@
#include <clientversion.h>
#include <init.h>
#include <interface/handler.h>
#include <interface/node.h>
#include <interface/wallet.h>
#include <interfaces/handler.h>
#include <interfaces/node.h>
#include <interfaces/wallet.h>
#include <util.h>
#include <ui_interface.h>
#include <version.h>
@ -25,7 +25,7 @@
#include <QPainter>
#include <QRadialGradient>
SplashScreen::SplashScreen(interface::Node& node, Qt::WindowFlags f, const NetworkStyle *networkStyle) :
SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const NetworkStyle *networkStyle) :
QWidget(0, f), curAlignment(0), m_node(node)
{
// set reference point, paddings
@ -177,7 +177,7 @@ static void ShowProgress(SplashScreen *splash, const std::string &title, int nPr
strprintf("\n%d", nProgress) + "%");
}
#ifdef ENABLE_WALLET
void SplashScreen::ConnectWallet(std::unique_ptr<interface::Wallet> wallet)
void SplashScreen::ConnectWallet(std::unique_ptr<interfaces::Wallet> wallet)
{
m_connected_wallet_handlers.emplace_back(wallet->handleShowProgress(boost::bind(ShowProgress, this, _1, _2, false)));
m_connected_wallets.emplace_back(std::move(wallet));
@ -190,7 +190,7 @@ void SplashScreen::subscribeToCoreSignals()
m_handler_init_message = m_node.handleInitMessage(boost::bind(InitMessage, this, _1));
m_handler_show_progress = m_node.handleShowProgress(boost::bind(ShowProgress, this, _1, _2, _3));
#ifdef ENABLE_WALLET
m_handler_load_wallet = m_node.handleLoadWallet([this](std::unique_ptr<interface::Wallet> wallet) { ConnectWallet(std::move(wallet)); });
m_handler_load_wallet = m_node.handleLoadWallet([this](std::unique_ptr<interfaces::Wallet> wallet) { ConnectWallet(std::move(wallet)); });
#endif
}

18
src/qt/splashscreen.h
View file

@ -12,7 +12,7 @@
class NetworkStyle;
namespace interface {
namespace interfaces {
class Handler;
class Node;
class Wallet;
@ -29,7 +29,7 @@ class SplashScreen : public QWidget
Q_OBJECT
public:
explicit SplashScreen(interface::Node& node, Qt::WindowFlags f, const NetworkStyle *networkStyle);
explicit SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const NetworkStyle *networkStyle);
~SplashScreen();
protected:
@ -52,19 +52,19 @@ private:
/** Disconnect core signals to splash screen */
void unsubscribeFromCoreSignals();
/** Connect wallet signals to splash screen */
void ConnectWallet(std::unique_ptr<interface::Wallet> wallet);
void ConnectWallet(std::unique_ptr<interfaces::Wallet> wallet);
QPixmap pixmap;
QString curMessage;
QColor curColor;
int curAlignment;
interface::Node& m_node;
std::unique_ptr<interface::Handler> m_handler_init_message;
std::unique_ptr<interface::Handler> m_handler_show_progress;
std::unique_ptr<interface::Handler> m_handler_load_wallet;
std::list<std::unique_ptr<interface::Wallet>> m_connected_wallets;
std::list<std::unique_ptr<interface::Handler>> m_connected_wallet_handlers;
interfaces::Node& m_node;
std::unique_ptr<interfaces::Handler> m_handler_init_message;
std::unique_ptr<interfaces::Handler> m_handler_show_progress;
std::unique_ptr<interfaces::Handler> m_handler_load_wallet;
std::list<std::unique_ptr<interfaces::Wallet>> m_connected_wallets;
std::list<std::unique_ptr<interfaces::Handler>> m_connected_wallet_handlers;
};
#endif // BITCOIN_QT_SPLASHSCREEN_H

4
src/qt/test/paymentservertests.cpp
View file

@ -9,7 +9,7 @@
#include <amount.h>
#include <chainparams.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <random.h>
#include <script/script.h>
#include <script/standard.h>
@ -67,7 +67,7 @@ static SendCoinsRecipient handleRequest(PaymentServer* server, std::vector<unsig
void PaymentServerTests::paymentServerTests()
{
SelectParams(CBaseChainParams::MAIN);
auto node = interface::MakeNode();
auto node = interfaces::MakeNode();
OptionsModel optionsModel(*node);
PaymentServer* server = new PaymentServer(nullptr, false);
X509_STORE* caStore = X509_STORE_new();

4
src/qt/test/rpcnestedtests.cpp
View file

@ -7,7 +7,7 @@
#include <chainparams.h>
#include <consensus/validation.h>
#include <fs.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <validation.h>
#include <rpc/register.h>
#include <rpc/server.h>
@ -46,7 +46,7 @@ void RPCNestedTests::rpcNestedTests()
std::string result;
std::string result2;
std::string filtered;
auto node = interface::MakeNode();
auto node = interfaces::MakeNode();
RPCConsole::RPCExecuteCommandLine(*node, result, "getblockchaininfo()[chain]", &filtered); //simple result filtering with path
QVERIFY(result=="main");
QVERIFY(filtered == "getblockchaininfo()[chain]");

4
src/qt/test/wallettests.cpp
View file

@ -1,6 +1,6 @@
#include <qt/test/wallettests.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <qt/bitcoinamountfield.h>
#include <qt/callback.h>
#include <qt/optionsmodel.h>
@ -178,7 +178,7 @@ void TestGUI()
std::unique_ptr<const PlatformStyle> platformStyle(PlatformStyle::instantiate("other"));
SendCoinsDialog sendCoinsDialog(platformStyle.get());
TransactionView transactionView(platformStyle.get());
auto node = interface::MakeNode();
auto node = interfaces::MakeNode();
OptionsModel optionsModel(*node);
vpwallets.insert(vpwallets.begin(), &wallet);
WalletModel walletModel(std::move(node->getWallets()[0]), *node, platformStyle.get(), &optionsModel);

2
src/qt/trafficgraphwidget.cpp
View file

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <interface/node.h>
#include <interfaces/node.h>
#include <qt/trafficgraphwidget.h>
#include <qt/clientmodel.h>

12
src/qt/transactiondesc.cpp
View file

@ -10,7 +10,7 @@
#include <qt/transactionrecord.h>
#include <consensus/consensus.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <key_io.h>
#include <validation.h>
#include <script/script.h>
@ -23,7 +23,7 @@
#include <stdint.h>
#include <string>
QString TransactionDesc::FormatTxStatus(const interface::WalletTx& wtx, const interface::WalletTxStatus& status, bool inMempool, int numBlocks, int64_t adjustedTime)
QString TransactionDesc::FormatTxStatus(const interfaces::WalletTx& wtx, const interfaces::WalletTxStatus& status, bool inMempool, int numBlocks, int64_t adjustedTime)
{
if (!status.is_final)
{
@ -48,14 +48,14 @@ QString TransactionDesc::FormatTxStatus(const interface::WalletTx& wtx, const in
}
}
QString TransactionDesc::toHTML(interface::Node& node, interface::Wallet& wallet, TransactionRecord *rec, int unit)
QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wallet, TransactionRecord *rec, int unit)
{
int numBlocks;
int64_t adjustedTime;
interface::WalletTxStatus status;
interface::WalletOrderForm orderForm;
interfaces::WalletTxStatus status;
interfaces::WalletOrderForm orderForm;
bool inMempool;
interface::WalletTx wtx = wallet.getWalletTxDetails(rec->hash, status, orderForm, inMempool, numBlocks, adjustedTime);
interfaces::WalletTx wtx = wallet.getWalletTxDetails(rec->hash, status, orderForm, inMempool, numBlocks, adjustedTime);
QString strHTML;

6
src/qt/transactiondesc.h
View file

@ -10,7 +10,7 @@
class TransactionRecord;
namespace interface {
namespace interfaces {
class Node;
class Wallet;
struct WalletTx;
@ -24,12 +24,12 @@ class TransactionDesc: public QObject
Q_OBJECT
public:
static QString toHTML(interface::Node& node, interface::Wallet& wallet, TransactionRecord *rec, int unit);
static QString toHTML(interfaces::Node& node, interfaces::Wallet& wallet, TransactionRecord *rec, int unit);
private:
TransactionDesc() {}
static QString FormatTxStatus(const interface::WalletTx& wtx, const interface::WalletTxStatus& status, bool inMempool, int numBlocks, int64_t adjustedTime);
static QString FormatTxStatus(const interfaces::WalletTx& wtx, const interfaces::WalletTxStatus& status, bool inMempool, int numBlocks, int64_t adjustedTime);
};
#endif // BITCOIN_QT_TRANSACTIONDESC_H

6
src/qt/transactionrecord.cpp
View file

@ -5,7 +5,7 @@
#include <qt/transactionrecord.h>
#include <consensus/consensus.h>
#include <interface/wallet.h>
#include <interfaces/wallet.h>
#include <key_io.h>
#include <timedata.h>
#include <validation.h>
@ -25,7 +25,7 @@ bool TransactionRecord::showTransaction()
/*
* Decompose CWallet transaction to model transaction records.
*/
QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface::WalletTx& wtx)
QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interfaces::WalletTx& wtx)
{
QList<TransactionRecord> parts;
int64_t nTime = wtx.time;
@ -158,7 +158,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
return parts;
}
void TransactionRecord::updateStatus(const interface::WalletTxStatus& wtx, int numBlocks, int64_t adjustedTime)
void TransactionRecord::updateStatus(const interfaces::WalletTxStatus& wtx, int numBlocks, int64_t adjustedTime)
{
// Determine transaction status

6
src/qt/transactionrecord.h
View file

@ -11,7 +11,7 @@
#include <QList>
#include <QString>
namespace interface {
namespace interfaces {
class Node;
class Wallet;
struct WalletTx;
@ -111,7 +111,7 @@ public:
/** Decompose CWallet transaction to model transaction records.
*/
static bool showTransaction();
static QList<TransactionRecord> decomposeTransaction(const interface::WalletTx& wtx);
static QList<TransactionRecord> decomposeTransaction(const interfaces::WalletTx& wtx);
/** @name Immutable transaction attributes
@{*/
@ -140,7 +140,7 @@ public:
/** Update status from core wallet tx.
*/
void updateStatus(const interface::WalletTxStatus& wtx, int numBlocks, int64_t adjustedTime);
void updateStatus(const interfaces::WalletTxStatus& wtx, int numBlocks, int64_t adjustedTime);
/** Return whether a status update is needed.
*/

18
src/qt/transactiontablemodel.cpp
View file

@ -14,8 +14,8 @@
#include <qt/walletmodel.h>
#include <core_io.h>
#include <interface/handler.h>
#include <interface/node.h>
#include <interfaces/handler.h>
#include <interfaces/node.h>
#include <validation.h>
#include <sync.h>
#include <uint256.h>
@ -73,7 +73,7 @@ public:
/* Query entire wallet anew from core.
*/
void refreshWallet(interface::Wallet& wallet)
void refreshWallet(interfaces::Wallet& wallet)
{
qDebug() << "TransactionTablePriv::refreshWallet";
cachedWallet.clear();
@ -91,7 +91,7 @@ public:
Call with transaction that was added, removed or changed.
*/
void updateWallet(interface::Wallet& wallet, const uint256 &hash, int status, bool showTransaction)
void updateWallet(interfaces::Wallet& wallet, const uint256 &hash, int status, bool showTransaction)
{
qDebug() << "TransactionTablePriv::updateWallet: " + QString::fromStdString(hash.ToString()) + " " + QString::number(status);
@ -127,7 +127,7 @@ public:
if(showTransaction)
{
// Find transaction in wallet
interface::WalletTx wtx = wallet.getWalletTx(hash);
interfaces::WalletTx wtx = wallet.getWalletTx(hash);
if(!wtx.tx)
{
qWarning() << "TransactionTablePriv::updateWallet: Warning: Got CT_NEW, but transaction is not in wallet";
@ -176,7 +176,7 @@ public:
return cachedWallet.size();
}
TransactionRecord *index(interface::Wallet& wallet, int idx)
TransactionRecord *index(interfaces::Wallet& wallet, int idx)
{
if(idx >= 0 && idx < cachedWallet.size())
{
@ -189,7 +189,7 @@ public:
// If a status update is needed (blocks came in since last check),
// update the status of this transaction from the wallet. Otherwise,
// simply re-use the cached status.
interface::WalletTxStatus wtx;
interfaces::WalletTxStatus wtx;
int numBlocks;
int64_t adjustedTime;
if (wallet.tryGetTxStatus(rec->hash, wtx, numBlocks, adjustedTime) && rec->statusUpdateNeeded(numBlocks)) {
@ -200,12 +200,12 @@ public:
return 0;
}
QString describe(interface::Node& node, interface::Wallet& wallet, TransactionRecord *rec, int unit)
QString describe(interfaces::Node& node, interfaces::Wallet& wallet, TransactionRecord *rec, int unit)
{
return TransactionDesc::toHTML(node, wallet, rec, unit);
}
QString getTxHex(interface::Wallet& wallet, TransactionRecord *rec)
QString getTxHex(interfaces::Wallet& wallet, TransactionRecord *rec)
{
auto tx = wallet.getTx(rec->hash);
if (tx) {

6
src/qt/transactiontablemodel.h
View file

@ -12,7 +12,7 @@
#include <memory>
namespace interface {
namespace interfaces {
class Handler;
}
@ -85,8 +85,8 @@ public:
private:
WalletModel *walletModel;
std::unique_ptr<interface::Handler> m_handler_transaction_changed;
std::unique_ptr<interface::Handler> m_handler_show_progress;
std::unique_ptr<interfaces::Handler> m_handler_transaction_changed;
std::unique_ptr<interfaces::Handler> m_handler_show_progress;
QStringList columns;
TransactionTablePriv *priv;
bool fProcessingQueuedTransactions;

4
src/qt/utilitydialog.cpp
View file

@ -19,7 +19,7 @@
#include <clientversion.h>
#include <init.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <util.h>
#include <stdio.h>
@ -32,7 +32,7 @@
#include <QVBoxLayout>
/** "Help message" or "About" dialog box */
HelpMessageDialog::HelpMessageDialog(interface::Node& node, QWidget *parent, bool about) :
HelpMessageDialog::HelpMessageDialog(interfaces::Node& node, QWidget *parent, bool about) :
QDialog(parent),
ui(new Ui::HelpMessageDialog)
{

4
src/qt/utilitydialog.h
View file

@ -10,7 +10,7 @@
class BitcoinGUI;
namespace interface {
namespace interfaces {
class Node;
}
@ -24,7 +24,7 @@ class HelpMessageDialog : public QDialog
Q_OBJECT
public:
explicit HelpMessageDialog(interface::Node& node, QWidget *parent, bool about);
explicit HelpMessageDialog(interfaces::Node& node, QWidget *parent, bool about);
~HelpMessageDialog();
void printToConsole();

10
src/qt/walletmodel.cpp
View file

@ -12,8 +12,8 @@
#include <qt/sendcoinsdialog.h>
#include <qt/transactiontablemodel.h>
#include <interface/handler.h>
#include <interface/node.h>
#include <interfaces/handler.h>
#include <interfaces/node.h>
#include <key_io.h>
#include <ui_interface.h>
#include <util.h> // for GetBoolArg
@ -28,7 +28,7 @@
#include <QTimer>
WalletModel::WalletModel(std::unique_ptr<interface::Wallet> wallet, interface::Node& node, const PlatformStyle *platformStyle, OptionsModel *_optionsModel, QObject *parent) :
WalletModel::WalletModel(std::unique_ptr<interfaces::Wallet> wallet, interfaces::Node& node, const PlatformStyle *platformStyle, OptionsModel *_optionsModel, QObject *parent) :
QObject(parent), m_wallet(std::move(wallet)), m_node(node), optionsModel(_optionsModel), addressTableModel(0),
transactionTableModel(0),
recentRequestsTableModel(0),
@ -70,7 +70,7 @@ void WalletModel::pollBalanceChanged()
// avoids the GUI from getting stuck on periodical polls if the core is
// holding the locks for a longer time - for example, during a wallet
// rescan.
interface::WalletBalances new_balances;
interfaces::WalletBalances new_balances;
int numBlocks = -1;
if (!m_wallet->tryGetBalances(new_balances, numBlocks)) {
return;
@ -89,7 +89,7 @@ void WalletModel::pollBalanceChanged()
}
}
void WalletModel::checkBalanceChanged(const interface::WalletBalances& new_balances)
void WalletModel::checkBalanceChanged(const interfaces::WalletBalances& new_balances)
{
if(new_balances.balanceChanged(m_cached_balances)) {
m_cached_balances = new_balances;

32
src/qt/walletmodel.h
View file

@ -13,7 +13,7 @@
#include <qt/paymentrequestplus.h>
#include <qt/walletmodeltransaction.h>
#include <interface/wallet.h>
#include <interfaces/wallet.h>
#include <support/allocators/secure.h>
#include <map>
@ -37,9 +37,9 @@ class COutput;
class CPubKey;
class uint256;
namespace interface {
namespace interfaces {
class Node;
} // namespace interface
} // namespace interfaces
QT_BEGIN_NAMESPACE
class QTimer;
@ -111,7 +111,7 @@ class WalletModel : public QObject
Q_OBJECT
public:
explicit WalletModel(std::unique_ptr<interface::Wallet> wallet, interface::Node& node, const PlatformStyle *platformStyle, OptionsModel *optionsModel, QObject *parent = 0);
explicit WalletModel(std::unique_ptr<interfaces::Wallet> wallet, interfaces::Node& node, const PlatformStyle *platformStyle, OptionsModel *optionsModel, QObject *parent = 0);
~WalletModel();
enum StatusCode // Returned by sendCoins
@ -198,20 +198,20 @@ public:
static bool isWalletEnabled();
interface::Node& node() const { return m_node; }
interface::Wallet& wallet() const { return *m_wallet; }
interfaces::Node& node() const { return m_node; }
interfaces::Wallet& wallet() const { return *m_wallet; }
QString getWalletName() const;
bool isMultiwallet();
private:
std::unique_ptr<interface::Wallet> m_wallet;
std::unique_ptr<interface::Handler> m_handler_status_changed;
std::unique_ptr<interface::Handler> m_handler_address_book_changed;
std::unique_ptr<interface::Handler> m_handler_transaction_changed;
std::unique_ptr<interface::Handler> m_handler_show_progress;
std::unique_ptr<interface::Handler> m_handler_watch_only_changed;
interface::Node& m_node;
std::unique_ptr<interfaces::Wallet> m_wallet;
std::unique_ptr<interfaces::Handler> m_handler_status_changed;
std::unique_ptr<interfaces::Handler> m_handler_address_book_changed;
std::unique_ptr<interfaces::Handler> m_handler_transaction_changed;
std::unique_ptr<interfaces::Handler> m_handler_show_progress;
std::unique_ptr<interfaces::Handler> m_handler_watch_only_changed;
interfaces::Node& m_node;
bool fHaveWatchOnly;
bool fForceCheckBalanceChanged;
@ -225,7 +225,7 @@ private:
RecentRequestsTableModel *recentRequestsTableModel;
// Cache some values to be able to detect changes
interface::WalletBalances m_cached_balances;
interfaces::WalletBalances m_cached_balances;
EncryptionStatus cachedEncryptionStatus;
int cachedNumBlocks;
@ -233,11 +233,11 @@ private:
void subscribeToCoreSignals();
void unsubscribeFromCoreSignals();
void checkBalanceChanged(const interface::WalletBalances& new_balances);
void checkBalanceChanged(const interfaces::WalletBalances& new_balances);
Q_SIGNALS:
// Signal that balance in wallet changed
void balanceChanged(const interface::WalletBalances& balances);
void balanceChanged(const interfaces::WalletBalances& balances);
// Encryption status of wallet changed
void encryptionStatusChanged();

4
src/qt/walletmodeltransaction.cpp
View file

@ -4,7 +4,7 @@
#include <qt/walletmodeltransaction.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <policy/policy.h>
WalletModelTransaction::WalletModelTransaction(const QList<SendCoinsRecipient> &_recipients) :
@ -18,7 +18,7 @@ QList<SendCoinsRecipient> WalletModelTransaction::getRecipients() const
return recipients;
}
std::unique_ptr<interface::PendingWalletTx>& WalletModelTransaction::getWtx()
std::unique_ptr<interfaces::PendingWalletTx>& WalletModelTransaction::getWtx()
{
return wtx;
}

6
src/qt/walletmodeltransaction.h
View file

@ -13,7 +13,7 @@
class SendCoinsRecipient;
namespace interface {
namespace interfaces {
class Node;
class PendingWalletTx;
}
@ -26,7 +26,7 @@ public:
QList<SendCoinsRecipient> getRecipients() const;
std::unique_ptr<interface::PendingWalletTx>& getWtx();
std::unique_ptr<interfaces::PendingWalletTx>& getWtx();
unsigned int getTransactionSize();
void setTransactionFee(const CAmount& newFee);
@ -38,7 +38,7 @@ public:
private:
QList<SendCoinsRecipient> recipients;
std::unique_ptr<interface::PendingWalletTx> wtx;
std::unique_ptr<interfaces::PendingWalletTx> wtx;
CAmount fee;
};

2
src/qt/walletview.cpp
View file

@ -19,7 +19,7 @@
#include <qt/transactionview.h>
#include <qt/walletmodel.h>
#include <interface/node.h>
#include <interfaces/node.h>
#include <ui_interface.h>
#include <QAction>