sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: revert dashification of source and header filenames

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2022-07-08 14:10:53 +05:30
parent f02085e988
commit 887b4324d3
17 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile.am
View File

@ -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)

2
src/Makefile.bench.include
View File

@ -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 \

10
src/Makefile.qt.include
View File

@ -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"

0
src/bench/bench_dash.cpp → src/bench/bench_bitcoin.cpp
View File

0
src/dash-cli.cpp → src/bitcoin-cli.cpp
View File

0
src/dash-tx.cpp → src/bitcoin-tx.cpp
View File

0
src/dash-wallet.cpp → src/bitcoin-wallet.cpp
View File

2
src/dashd.cpp → src/bitcoind.cpp
View File

@ -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;

2
src/qt/dash.cpp → src/qt/bitcoin.cpp
View File

@ -7,7 +7,7 @@
#include <config/bitcoin-config.h>
#endif
#include <qt/dash.h>
#include <qt/bitcoin.h>
#include <qt/bitcoingui.h>
#include <chainparams.h>

0
src/qt/dash.h → src/qt/bitcoin.h
View File

4
src/qt/locale/dash_en.ts
View File

@ -418,7 +418,7 @@
<context>
<name>BitcoinGUI</name>
<message>
<location filename="../dash.cpp" line="+395"/>
<location filename="../bitcoin.cpp" line="+395"/>
<source>A fatal error occurred. Dash Core can no longer continue safely and will quit.</source>
<translation>A fatal error occurred. Dash Core can no longer continue safely and will quit.</translation>
</message>
@ -2719,7 +2719,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<context>
<name>QObject</name>
<message>
<location filename="../dash.cpp" line="+14"/>
<location filename="../bitcoin.cpp" line="+14"/>
<source>Choose data directory on startup (default: %u)</source>
<translation>Choose data directory on startup (default: %u)</translation>
</message>

2
src/qt/locale/dash_en.xlf
View File

@ -428,7 +428,7 @@
</trans-unit>
</group>
</body></file>
<file original="../dash.cpp" datatype="cpp" source-language="en" target-language="en"><body>
<file original="../bitcoin.cpp" datatype="cpp" source-language="en" target-language="en"><body>
<group restype="x-trolltech-linguist-context" resname="BitcoinGUI">
<trans-unit id="_msg77" approved="yes">
<source xml:space="preserve">A fatal error occurred. Dash Core can no longer continue safely and will quit.</source>

2
src/qt/main.cpp
View File

@ -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 <qt/dash.h>
#include <qt/bitcoin.h>
#include <util/translation.h>

2
src/qt/test/apptests.cpp
View File

@ -6,7 +6,7 @@
#include <chainparams.h>
#include <key.h>
#include <qt/dash.h>
#include <qt/bitcoin.h>
#include <qt/bitcoingui.h>
#include <qt/networkstyle.h>
#include <qt/rpcconsole.h>

2
src/qt/test/test_main.cpp
View File

@ -8,7 +8,7 @@
#endif
#include <interfaces/node.h>
#include <qt/dash.h>
#include <qt/bitcoin.h>
#include <qt/test/apptests.h>
#include <qt/test/rpcnestedtests.h>
#include <qt/test/uritests.h>

6
test/lint/lint-locale-dependence.sh
View File

@ -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"

2
test/sanitizer_suppressions/ubsan
View File

@ -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