diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -280,7 +280,7 @@ torcontrol.cpp txdb.cpp txmempool.cpp - ui_interface.cpp + uiinterface.cpp validation.cpp validationinterface.cpp versionbits.cpp diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -195,7 +195,7 @@ torcontrol.h \ txdb.h \ txmempool.h \ - ui_interface.h \ + uiinterface.h \ undo.h \ util.h \ utilmoneystr.h \ @@ -272,7 +272,7 @@ torcontrol.cpp \ txdb.cpp \ txmempool.cpp \ - ui_interface.cpp \ + uiinterface.cpp \ validation.cpp \ validationinterface.cpp \ versionbits.cpp \ diff --git a/src/httprpc.cpp b/src/httprpc.cpp --- a/src/httprpc.cpp +++ b/src/httprpc.cpp @@ -13,7 +13,7 @@ #include "rpc/protocol.h" #include "rpc/server.h" #include "sync.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "utilstrencodings.h" diff --git a/src/httpserver.cpp b/src/httpserver.cpp --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -11,7 +11,7 @@ #include "netbase.h" #include "rpc/protocol.h" // For HTTP status codes #include "sync.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "utilstrencodings.h" diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -38,7 +38,7 @@ #include "torcontrol.h" #include "txdb.h" #include "txmempool.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "utilmoneystr.h" #include "validation.h" diff --git a/src/net.cpp b/src/net.cpp --- a/src/net.cpp +++ b/src/net.cpp @@ -20,7 +20,7 @@ #include "netbase.h" #include "primitives/transaction.h" #include "scheduler.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "utilstrencodings.h" #ifdef WIN32 diff --git a/src/net_processing.cpp b/src/net_processing.cpp --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -27,7 +27,7 @@ #include "scheduler.h" #include "tinyformat.h" #include "txmempool.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "utilmoneystr.h" #include "utilstrencodings.h" diff --git a/src/noui.cpp b/src/noui.cpp --- a/src/noui.cpp +++ b/src/noui.cpp @@ -5,7 +5,7 @@ #include "noui.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -29,7 +29,7 @@ #include "init.h" #include "rpc/server.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "uint256.h" #include "util.h" #include "warnings.h" diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -34,7 +34,7 @@ #include "chainparams.h" #include "init.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -15,7 +15,7 @@ #include "config.h" #include "net.h" #include "txmempool.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "validation.h" #include "warnings.h" diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -12,7 +12,7 @@ #include "config.h" #include "dstencode.h" #include "policy/policy.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "wallet/wallet.h" diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -18,7 +18,7 @@ #include "chainparams.h" #include "dstencode.h" #include "txmempool.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "validation.h" // mempool and minRelayTxFee #include "wallet/coincontrol.h" #include "wallet/fees.h" diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -12,7 +12,7 @@ #include "clientversion.h" #include "init.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "version.h" diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -17,7 +17,7 @@ #include "transactiontablemodel.h" #include "walletmodel.h" -#include "ui_interface.h" +#include "uiinterface.h" #include #include diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -17,7 +17,7 @@ #include "keystore.h" #include "net.h" // for g_connman #include "sync.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" // for GetBoolArg #include "validation.h" #include "wallet/coincontrol.h" diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -19,7 +19,7 @@ #include "transactionview.h" #include "walletmodel.h" -#include "ui_interface.h" +#include "uiinterface.h" #include #include diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -14,7 +14,7 @@ #include "protocol.h" #include "sync.h" #include "timedata.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "utilstrencodings.h" #include "validation.h" diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -12,7 +12,7 @@ #include "init.h" #include "random.h" #include "sync.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "utilstrencodings.h" diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -22,7 +22,7 @@ #include "script/sigcache.h" #include "txdb.h" #include "txmempool.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "validation.h" #include diff --git a/src/timedata.cpp b/src/timedata.cpp --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -10,7 +10,7 @@ #include "netaddress.h" #include "sync.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "utilstrencodings.h" #include "warnings.h" diff --git a/src/txdb.cpp b/src/txdb.cpp --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -10,7 +10,7 @@ #include "init.h" #include "pow.h" #include "random.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "uint256.h" #include "util.h" diff --git a/src/ui_interface.h b/src/uiinterface.h rename from src/ui_interface.h rename to src/uiinterface.h diff --git a/src/ui_interface.cpp b/src/uiinterface.cpp rename from src/ui_interface.cpp rename to src/uiinterface.cpp --- a/src/ui_interface.cpp +++ b/src/uiinterface.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 "ui_interface.h" +#include "uiinterface.h" #include "util.h" CClientUIInterface uiInterface; diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -36,7 +36,7 @@ #include "tinyformat.h" #include "txdb.h" #include "txmempool.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "undo.h" #include "util.h" #include "utilmoneystr.h" diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -12,7 +12,7 @@ #include "script/sign.h" #include "streams.h" #include "tinyformat.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "utilstrencodings.h" #include "validationinterface.h" #include "wallet/crypter.h" diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -25,7 +25,7 @@ #include "script/sign.h" #include "timedata.h" #include "txmempool.h" -#include "ui_interface.h" +#include "uiinterface.h" #include "util.h" #include "utilmoneystr.h" #include "validation.h"