highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-20 04:36:08 +01:00
Code Issues Packages Projects Releases 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
parent becd8dd2ec 17780d6f35
commit 048ac8326b
57 changed files with 211 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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());