From 887b4324d337ee22224d66fa75df2b90c21e4995 Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com> Date: Fri, 8 Jul 2022 14:10:53 +0530 Subject: [PATCH] trivial: revert dashification of source and header filenames --- src/Makefile.am | 8 ++++---- src/Makefile.bench.include | 2 +- src/Makefile.qt.include | 10 +++++----- src/bench/{bench_dash.cpp => bench_bitcoin.cpp} | 0 src/{dash-cli.cpp => bitcoin-cli.cpp} | 0 src/{dash-tx.cpp => bitcoin-tx.cpp} | 0 src/{dash-wallet.cpp => bitcoin-wallet.cpp} | 0 src/{dashd.cpp => bitcoind.cpp} | 2 +- src/qt/{dash.cpp => bitcoin.cpp} | 2 +- src/qt/{dash.h => bitcoin.h} | 0 src/qt/locale/dash_en.ts | 4 ++-- src/qt/locale/dash_en.xlf | 2 +- src/qt/main.cpp | 2 +- src/qt/test/apptests.cpp | 2 +- src/qt/test/test_main.cpp | 2 +- test/lint/lint-locale-dependence.sh | 6 +++--- test/sanitizer_suppressions/ubsan | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) rename src/bench/{bench_dash.cpp => bench_bitcoin.cpp} (100%) rename src/{dash-cli.cpp => bitcoin-cli.cpp} (100%) rename src/{dash-tx.cpp => bitcoin-tx.cpp} (100%) rename src/{dash-wallet.cpp => bitcoin-wallet.cpp} (100%) rename src/{dashd.cpp => bitcoind.cpp} (98%) rename src/qt/{dash.cpp => bitcoin.cpp} (99%) rename src/qt/{dash.h => bitcoin.h} (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 75100555bc..19608f9272 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -738,7 +738,7 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # # dashd binary # -dashd_SOURCES = dashd.cpp +dashd_SOURCES = bitcoind.cpp dashd_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) dashd_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) dashd_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) @@ -767,7 +767,7 @@ dashd_LDADD = \ dashd_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(BLS_LIBS) $(GMP_LIBS) # dash-cli binary # -dash_cli_SOURCES = dash-cli.cpp +dash_cli_SOURCES = bitcoin-cli.cpp dash_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) dash_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) dash_cli_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) @@ -785,7 +785,7 @@ dash_cli_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(EVENT_LIBS) $(BLS_LIBS) $(GMP # # dash-tx binary # -dash_tx_SOURCES = dash-tx.cpp +dash_tx_SOURCES = bitcoin-tx.cpp dash_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) dash_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) dash_tx_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) @@ -806,7 +806,7 @@ dash_tx_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(BLS_LIBS) $(GMP_LIBS) # # dash-wallet binary # -dash_wallet_SOURCES = dash-wallet.cpp +dash_wallet_SOURCES = bitcoin-wallet.cpp dash_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) dash_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) dash_wallet_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index e83523d2fc..1dbf03d941 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -13,7 +13,7 @@ GENERATED_BENCH_FILES = $(RAW_BENCH_FILES:.raw=.raw.h) bench_bench_dash_SOURCES = \ $(RAW_BENCH_FILES) \ - bench/bench_dash.cpp \ + bench/bench_bitcoin.cpp \ bench/bench.cpp \ bench/bench.h \ bench/block_assemble.cpp \ diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 4ab659397c..7139345520 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -40,6 +40,7 @@ QT_MOC_CPP = \ qt/moc_askpassphrasedialog.cpp \ qt/moc_createwalletdialog.cpp \ qt/moc_bantablemodel.cpp \ + qt/moc_bitcoin.cpp \ qt/moc_bitcoinaddressvalidator.cpp \ qt/moc_bitcoinamountfield.cpp \ qt/moc_bitcoingui.cpp \ @@ -48,7 +49,6 @@ QT_MOC_CPP = \ qt/moc_coincontroldialog.cpp \ qt/moc_coincontroltreewidget.cpp \ qt/moc_csvmodelwriter.cpp \ - qt/moc_dash.cpp \ qt/moc_editaddressdialog.cpp \ qt/moc_governancelist.cpp \ qt/moc_guiutil.cpp \ @@ -99,7 +99,7 @@ QT_MOC = \ qt/overviewpage.moc \ qt/rpcconsole.moc -QT_QRC_CPP = qt/qrc_dash.cpp +QT_QRC_CPP = qt/qrc_bitcoin.cpp QT_QRC = qt/dash.qrc QT_QRC_LOCALE_CPP = qt/qrc_dash_locale.cpp QT_QRC_LOCALE = qt/dash_locale.qrc @@ -110,6 +110,7 @@ BITCOIN_QT_H = \ qt/appearancewidget.h \ qt/askpassphrasedialog.h \ qt/bantablemodel.h \ + qt/bitcoin.h \ qt/bitcoinaddressvalidator.h \ qt/bitcoinamountfield.h \ qt/bitcoingui.h \ @@ -119,7 +120,6 @@ BITCOIN_QT_H = \ qt/coincontroltreewidget.h \ qt/createwalletdialog.h \ qt/csvmodelwriter.h \ - qt/dash.h \ qt/editaddressdialog.h \ qt/governancelist.h \ qt/guiconstants.h \ @@ -201,7 +201,7 @@ RES_ICONS = \ BITCOIN_QT_BASE_CPP = \ qt/appearancewidget.cpp \ qt/bantablemodel.cpp \ - qt/dash.cpp \ + qt/bitcoin.cpp \ qt/bitcoinaddressvalidator.cpp \ qt/bitcoinamountfield.cpp \ qt/bitcoingui.cpp \ @@ -403,7 +403,7 @@ $(srcdir)/qt/dashstrings.cpp: FORCE @test -n $(XGETTEXT) || echo "xgettext is required for updating translations" $(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" $(PYTHON) ../share/qt/extract_strings_qt.py $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) $(libbitcoin_util_a_SOURCES) -translate: $(srcdir)/qt/dashstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/dash.cpp $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) +translate: $(srcdir)/qt/dashstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/bitcoin.cpp $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) @test -n $(LUPDATE) || echo "lupdate is required for updating translations" $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -I$(srcdir) -locations relative -no-obsolete -ts $(srcdir)/qt/locale/dash_en.ts @test -n $(LCONVERT) || echo "lconvert is required for updating translations" diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_bitcoin.cpp similarity index 100% rename from src/bench/bench_dash.cpp rename to src/bench/bench_bitcoin.cpp diff --git a/src/dash-cli.cpp b/src/bitcoin-cli.cpp similarity index 100% rename from src/dash-cli.cpp rename to src/bitcoin-cli.cpp diff --git a/src/dash-tx.cpp b/src/bitcoin-tx.cpp similarity index 100% rename from src/dash-tx.cpp rename to src/bitcoin-tx.cpp diff --git a/src/dash-wallet.cpp b/src/bitcoin-wallet.cpp similarity index 100% rename from src/dash-wallet.cpp rename to src/bitcoin-wallet.cpp diff --git a/src/dashd.cpp b/src/bitcoind.cpp similarity index 98% rename from src/dashd.cpp rename to src/bitcoind.cpp index a616958cab..a82080495c 100644 --- a/src/dashd.cpp +++ b/src/bitcoind.cpp @@ -50,7 +50,7 @@ static bool AppInit(int argc, char* argv[]) util::ThreadSetInternalName("init"); - // If Qt is used, parameters/dash.conf are parsed in qt/dash.cpp's main() + // If Qt is used, parameters/dash.conf are parsed in qt/bitcoin.cpp's main() SetupServerArgs(node); ArgsManager& args = *Assert(node.args); std::string error; diff --git a/src/qt/dash.cpp b/src/qt/bitcoin.cpp similarity index 99% rename from src/qt/dash.cpp rename to src/qt/bitcoin.cpp index a61e7c92b1..4ee2d11fb0 100644 --- a/src/qt/dash.cpp +++ b/src/qt/bitcoin.cpp @@ -7,7 +7,7 @@ #include #endif -#include +#include #include #include diff --git a/src/qt/dash.h b/src/qt/bitcoin.h similarity index 100% rename from src/qt/dash.h rename to src/qt/bitcoin.h diff --git a/src/qt/locale/dash_en.ts b/src/qt/locale/dash_en.ts index 8f60242434..a269f55073 100644 --- a/src/qt/locale/dash_en.ts +++ b/src/qt/locale/dash_en.ts @@ -418,7 +418,7 @@ BitcoinGUI - + A fatal error occurred. Dash Core can no longer continue safely and will quit. A fatal error occurred. Dash Core can no longer continue safely and will quit. @@ -2719,7 +2719,7 @@ https://www.transifex.com/projects/p/dash/ QObject - + Choose data directory on startup (default: %u) Choose data directory on startup (default: %u) diff --git a/src/qt/locale/dash_en.xlf b/src/qt/locale/dash_en.xlf index afc2bd1c8c..c4049253d9 100644 --- a/src/qt/locale/dash_en.xlf +++ b/src/qt/locale/dash_en.xlf @@ -428,7 +428,7 @@ - + A fatal error occurred. Dash Core can no longer continue safely and will quit. diff --git a/src/qt/main.cpp b/src/qt/main.cpp index 4424aa3cf8..a05234589f 100644 --- a/src/qt/main.cpp +++ b/src/qt/main.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 +#include #include diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp index 4171dd8bfe..4486464cb8 100644 --- a/src/qt/test/apptests.cpp +++ b/src/qt/test/apptests.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index 0a80cd9729..f237b70d2b 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -8,7 +8,7 @@ #endif #include -#include +#include #include #include #include diff --git a/test/lint/lint-locale-dependence.sh b/test/lint/lint-locale-dependence.sh index 5fafdaa4c4..79bd82beac 100755 --- a/test/lint/lint-locale-dependence.sh +++ b/test/lint/lint-locale-dependence.sh @@ -8,9 +8,9 @@ export LC_ALL=C KNOWN_VIOLATIONS=( "src/bench/string_cast.cpp.*atoi" "src/bench/string_cast.cpp.*std::to_string" - "src/dash-tx.cpp.*stoul" - "src/dash-tx.cpp.*std::to_string" - "src/dash-tx.cpp.*trim_right" + "src/bitcoin-tx.cpp.*stoul" + "src/bitcoin-tx.cpp.*std::to_string" + "src/bitcoin-tx.cpp.*trim_right" "src/dbwrapper.cpp.*stoul" "src/dbwrapper.cpp:.*vsnprintf" "src/governance/vote.cpp.*std::to_string" diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan index 7da8e30ffd..d4886076d0 100644 --- a/test/sanitizer_suppressions/ubsan +++ b/test/sanitizer_suppressions/ubsan @@ -16,7 +16,7 @@ unsigned-integer-overflow:*/include/c++/*/bits/basic_string.tcc unsigned-integer-overflow:arith_uint256.h unsigned-integer-overflow:basic_string.h unsigned-integer-overflow:bench/bench.h -unsigned-integer-overflow:dash-tx.cpp +unsigned-integer-overflow:bitcoin-tx.cpp unsigned-integer-overflow:bloom.cpp unsigned-integer-overflow:chain.cpp unsigned-integer-overflow:chain.h