From 17780d6f35a3951f649c3b7766b9283d9c18e39f Mon Sep 17 00:00:00 2001
From: Russell Yanofsky <russ@yanofsky.org>
Date: Sat, 7 Apr 2018 03:42:02 -0400
Subject: 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-
---
 src/qt/clientmodel.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/qt/clientmodel.h')

diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 9faa10b87e..a609222f7d 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -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;
-- 
cgit v1.2.3