diff options
| author | Russell Yanofsky <[email protected]> | 2018-04-07 03:42:02 -0400 |
|---|---|---|
| committer | Russell Yanofsky <[email protected]> | 2018-04-07 03:42:02 -0400 |
| commit | 17780d6f35a3951f649c3b7766b9283d9c18e39f (patch) | |
| tree | c858c2d92b028d96118983415f40da5b3a0c48e6 /src/qt/clientmodel.cpp | |
| parent | Merge #10244: Refactor: separate gui from wallet and node (diff) | |
| download | discoin-17780d6f35a3951f649c3b7766b9283d9c18e39f.tar.xz discoin-17780d6f35a3951f649c3b7766b9283d9c18e39f.zip | |
scripted-diff: Avoid `interface` keyword to fix windows gitian build
Rename `interface` to `interfaces`
Build failure reported by Chun Kuan Lee <[email protected]>
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-
Diffstat (limited to 'src/qt/clientmodel.cpp')
| -rw-r--r-- | src/qt/clientmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 1dbfc815b..37fd06ccc 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -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), |