From 000495df8e8e7280288413f9df58618691f4c52d Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 9 Dec 2024 12:04:44 +0000
Subject: [PATCH] merge bitcoin#25338: Avoid incompatibility with CMake AUTOUIC
 feature

---
 src/Makefile.am                                 | 4 ++--
 src/banman.cpp                                  | 2 +-
 src/bitcoind.cpp                                | 2 +-
 src/httpserver.cpp                              | 2 +-
 src/index/base.cpp                              | 2 +-
 src/init.cpp                                    | 2 +-
 src/init/common.cpp                             | 2 +-
 src/llmq/chainlocks.cpp                         | 2 +-
 src/masternode/sync.cpp                         | 4 ++--
 src/net.cpp                                     | 2 +-
 src/node/{ui_interface.cpp => interface_ui.cpp} | 2 +-
 src/node/{ui_interface.h => interface_ui.h}     | 6 +++---
 src/node/interfaces.cpp                         | 2 +-
 src/noui.cpp                                    | 2 +-
 src/qt/bitcoin.cpp                              | 2 +-
 src/qt/bitcoingui.cpp                           | 2 +-
 src/qt/paymentserver.cpp                        | 2 +-
 src/qt/sendcoinsdialog.cpp                      | 2 +-
 src/qt/transactionview.cpp                      | 2 +-
 src/qt/walletframe.cpp                          | 2 +-
 src/qt/walletmodel.cpp                          | 2 +-
 src/qt/walletview.cpp                           | 2 +-
 src/shutdown.cpp                                | 2 +-
 src/timedata.cpp                                | 2 +-
 src/txdb.cpp                                    | 2 +-
 src/validation.cpp                              | 2 +-
 src/wallet/init.cpp                             | 2 +-
 27 files changed, 31 insertions(+), 31 deletions(-)
 rename src/node/{ui_interface.cpp => interface_ui.cpp} (99%)
 rename src/node/{ui_interface.h => interface_ui.h} (98%)

diff --git a/src/Makefile.am b/src/Makefile.am
index d26553a25f..7c615cc7dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -280,7 +280,7 @@ BITCOIN_CORE_H = \
   node/psbt.h \
   node/transaction.h \
   node/txreconciliation.h \
-  node/ui_interface.h \
+  node/interface_ui.h \
   node/utxo_snapshot.h \
   noui.h \
   outputtype.h \
@@ -513,7 +513,7 @@ libbitcoin_server_a_SOURCES = \
   node/psbt.cpp \
   node/transaction.cpp \
   node/txreconciliation.cpp \
-  node/ui_interface.cpp \
+  node/interface_ui.cpp \
   noui.cpp \
   policy/fees.cpp \
   policy/packages.cpp \
diff --git a/src/banman.cpp b/src/banman.cpp
index c162eb08fd..d319a2a996 100644
--- a/src/banman.cpp
+++ b/src/banman.cpp
@@ -6,7 +6,7 @@
 #include <banman.h>
 
 #include <netaddress.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <sync.h>
 #include <util/system.h>
 #include <util/time.h>
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index d026c7c1f3..c16167f412 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -15,7 +15,7 @@
 #include <interfaces/chain.h>
 #include <interfaces/init.h>
 #include <node/context.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <noui.h>
 #include <shutdown.h>
 #include <util/check.h>
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 504f3cf642..b4b263eb50 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -10,7 +10,7 @@
 
 #include <chainparamsbase.h>
 #include <netbase.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <rpc/protocol.h> // For HTTP status codes
 #include <shutdown.h>
 #include <sync.h>
diff --git a/src/index/base.cpp b/src/index/base.cpp
index cae1cc75fd..9cc326b9e9 100644
--- a/src/index/base.cpp
+++ b/src/index/base.cpp
@@ -5,7 +5,7 @@
 #include <chainparams.h>
 #include <index/base.h>
 #include <node/blockstorage.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <shutdown.h>
 #include <tinyformat.h>
 #include <util/thread.h>
diff --git a/src/init.cpp b/src/init.cpp
index fdd3d4a294..e85721ce74 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -39,7 +39,7 @@
 #include <netgroup.h>
 #include <node/blockstorage.h>
 #include <node/context.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <node/txreconciliation.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
diff --git a/src/init/common.cpp b/src/init/common.cpp
index 2a83ae16b7..f775810a72 100644
--- a/src/init/common.cpp
+++ b/src/init/common.cpp
@@ -11,7 +11,7 @@
 #include <crypto/sha256.h>
 #include <key.h>
 #include <logging.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <random.h>
 #include <util/string.h>
 #include <util/system.h>
diff --git a/src/llmq/chainlocks.cpp b/src/llmq/chainlocks.cpp
index 1ef7d22b91..1b6f56f5c8 100644
--- a/src/llmq/chainlocks.cpp
+++ b/src/llmq/chainlocks.cpp
@@ -12,7 +12,7 @@
 #include <consensus/validation.h>
 #include <masternode/sync.h>
 #include <node/blockstorage.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <scheduler.h>
 #include <spork.h>
 #include <txmempool.h>
diff --git a/src/masternode/sync.cpp b/src/masternode/sync.cpp
index dc8cc60f76..09d89d9f0e 100644
--- a/src/masternode/sync.cpp
+++ b/src/masternode/sync.cpp
@@ -8,11 +8,11 @@
 #include <governance/governance.h>
 #include <netfulfilledman.h>
 #include <netmessagemaker.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <shutdown.h>
-#include <validation.h>
 #include <util/time.h>
 #include <util/translation.h>
+#include <validation.h>
 
 class CMasternodeSync;
 
diff --git a/src/net.cpp b/src/net.cpp
index db234f4876..5f82196c42 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -25,7 +25,7 @@
 #include <net_permissions.h>
 #include <netaddress.h>
 #include <netbase.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <protocol.h>
 #include <random.h>
 #include <scheduler.h>
diff --git a/src/node/ui_interface.cpp b/src/node/interface_ui.cpp
similarity index 99%
rename from src/node/ui_interface.cpp
rename to src/node/interface_ui.cpp
index 23c5e2b255..b01d20bb3e 100644
--- a/src/node/ui_interface.cpp
+++ b/src/node/interface_ui.cpp
@@ -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 <node/ui_interface.h>
+#include <node/interface_ui.h>
 
 #include <util/translation.h>
 
diff --git a/src/node/ui_interface.h b/src/node/interface_ui.h
similarity index 98%
rename from src/node/ui_interface.h
rename to src/node/interface_ui.h
index a21ffb088d..3f8b683de2 100644
--- a/src/node/ui_interface.h
+++ b/src/node/interface_ui.h
@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_NODE_UI_INTERFACE_H
-#define BITCOIN_NODE_UI_INTERFACE_H
+#ifndef BITCOIN_NODE_INTERFACE_UI_H
+#define BITCOIN_NODE_INTERFACE_UI_H
 
 #include <functional>
 #include <memory>
@@ -131,4 +131,4 @@ constexpr auto AbortError = InitError;
 
 extern CClientUIInterface uiInterface;
 
-#endif // BITCOIN_NODE_UI_INTERFACE_H
+#endif // BITCOIN_NODE_INTERFACE_UI_H
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 154b447aa3..90a4c51d7e 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -30,7 +30,7 @@
 #include <node/blockstorage.h>
 #include <node/coin.h>
 #include <node/context.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <node/transaction.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
diff --git a/src/noui.cpp b/src/noui.cpp
index 57bbe39c90..11bfdbc80b 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -7,7 +7,7 @@
 #include <noui.h>
 
 #include <logging.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <util/translation.h>
 
 #include <string>
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 11b189b6c2..79a1db9002 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -16,7 +16,7 @@
 #include <interfaces/node.h>
 #include <net.h>
 #include <node/context.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <noui.h>
 #include <qt/bitcoingui.h>
 #include <qt/clientmodel.h>
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 734360d53f..4e2d32b031 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -36,7 +36,7 @@
 #include <interfaces/coinjoin.h>
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <qt/governancelist.h>
 #include <qt/masternodelist.h>
 #include <util/system.h>
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 72553e81bb..2eb28aca35 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -17,7 +17,7 @@
 #include <clientversion.h>
 #include <interfaces/node.h>
 #include <key_io.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <policy/policy.h>
 #include <util/system.h>
 
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 1319d1d836..5012e9342c 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -21,7 +21,7 @@
 #include <chainparams.h>
 #include <interfaces/node.h>
 #include <key_io.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <policy/fees.h>
 #include <txmempool.h>
 #include <wallet/coincontrol.h>
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 55760147c5..8102c53de6 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -18,7 +18,7 @@
 #include <qt/walletmodel.h>
 
 #include <interfaces/node.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 
 #include <optional>
 
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index d97b1d7553..9e177c673e 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -5,7 +5,7 @@
 #include <qt/walletframe.h>
 
 #include <fs.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <psbt.h>
 #include <qt/governancelist.h>
 #include <qt/guiutil.h>
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index f0ed7ef0fe..d4a88de83b 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -22,7 +22,7 @@
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
 #include <key_io.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <psbt.h>
 #include <util/system.h> // for GetBoolArg
 #include <util/translation.h>
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 1a99436660..390df73576 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -22,7 +22,7 @@
 #include <qt/walletmodel.h>
 
 #include <interfaces/node.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <util/strencodings.h>
 
 #include <QAction>
diff --git a/src/shutdown.cpp b/src/shutdown.cpp
index f500fa529e..fe88b3aa46 100644
--- a/src/shutdown.cpp
+++ b/src/shutdown.cpp
@@ -12,7 +12,7 @@
 #include <logging.h>
 #include <util/tokenpipe.h>
 
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <warnings.h>
 
 #include <assert.h>
diff --git a/src/timedata.cpp b/src/timedata.cpp
index a0b8c33e7a..54378a5cf1 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -9,7 +9,7 @@
 #include <timedata.h>
 
 #include <netaddress.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <sync.h>
 #include <tinyformat.h>
 #include <util/system.h>
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 23e2480c4c..f780b56b44 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -6,7 +6,7 @@
 #include <txdb.h>
 
 #include <chain.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <pow.h>
 #include <random.h>
 #include <shutdown.h>
diff --git a/src/validation.cpp b/src/validation.cpp
index 5f093aa1b2..d1681a265b 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -24,7 +24,7 @@
 #include <logging/timer.h>
 #include <node/blockstorage.h>
 #include <node/coinstats.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <node/utxo_snapshot.h>
 #include <policy/policy.h>
 #include <policy/settings.h>
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
index 15b3306f82..8f7a416939 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -9,7 +9,7 @@
 #include <interfaces/wallet.h>
 #include <net.h>
 #include <node/context.h>
-#include <node/ui_interface.h>
+#include <node/interface_ui.h>
 #include <univalue.h>
 #include <util/check.h>
 #include <util/error.h>