mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-04 18:22:57 +02: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:
@@ -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),
|
||||
|
||||
Reference in New Issue
Block a user