From 3d953055b070bf943de2223cbc8757ddf9cbb2a2 Mon Sep 17 00:00:00 2001 From: barrystyle Date: Thu, 30 May 2019 05:51:29 +0800 Subject: [PATCH] rebrand codebase --- configure.ac | 12 +- src/Makefile.am | 230 +++++++------- src/Makefile.qt.include | 286 +++++++++--------- src/{bitcoin-cli-res.rc => nyc3-cli-res.rc} | 0 src/{bitcoin-cli.cpp => nyc3-cli.cpp} | 0 src/{bitcoin-tx-res.rc => nyc3-tx-res.rc} | 0 src/{bitcoin-tx.cpp => nyc3-tx.cpp} | 0 ...tcoin-wallet-res.rc => nyc3-wallet-res.rc} | 0 src/{bitcoin-wallet.cpp => nyc3-wallet.cpp} | 0 src/{bitcoind-res.rc => nyc3d-res.rc} | 0 src/{bitcoind.cpp => nyc3d.cpp} | 0 src/qt/addressbookpage.cpp | 2 +- src/qt/bitcoin_locale.qrc | 90 ------ src/qt/coincontroldialog.cpp | 2 +- src/qt/forms/receivecoinsdialog.ui | 6 +- src/qt/forms/sendcoinsdialog.ui | 6 +- src/qt/forms/sendcoinsentry.ui | 10 +- src/qt/guiutil.cpp | 4 +- src/qt/locale/{bitcoin_af.ts => nyc3_af.ts} | 0 .../{bitcoin_af_ZA.ts => nyc3_af_ZA.ts} | 0 src/qt/locale/{bitcoin_am.ts => nyc3_am.ts} | 0 src/qt/locale/{bitcoin_ar.ts => nyc3_ar.ts} | 0 .../{bitcoin_be_BY.ts => nyc3_be_BY.ts} | 0 src/qt/locale/{bitcoin_bg.ts => nyc3_bg.ts} | 0 .../{bitcoin_bg_BG.ts => nyc3_bg_BG.ts} | 0 src/qt/locale/{bitcoin_ca.ts => nyc3_ca.ts} | 0 ...oin_ca@valencia.ts => nyc3_ca@valencia.ts} | 0 .../{bitcoin_ca_ES.ts => nyc3_ca_ES.ts} | 0 src/qt/locale/{bitcoin_cs.ts => nyc3_cs.ts} | 0 src/qt/locale/{bitcoin_cy.ts => nyc3_cy.ts} | 0 src/qt/locale/{bitcoin_da.ts => nyc3_da.ts} | 0 src/qt/locale/{bitcoin_de.ts => nyc3_de.ts} | 0 src/qt/locale/{bitcoin_el.ts => nyc3_el.ts} | 0 .../{bitcoin_el_GR.ts => nyc3_el_GR.ts} | 0 src/qt/locale/{bitcoin_en.ts => nyc3_en.ts} | 0 .../{bitcoin_en_GB.ts => nyc3_en_GB.ts} | 0 src/qt/locale/{bitcoin_eo.ts => nyc3_eo.ts} | 0 src/qt/locale/{bitcoin_es.ts => nyc3_es.ts} | 0 .../{bitcoin_es_AR.ts => nyc3_es_AR.ts} | 0 .../{bitcoin_es_CL.ts => nyc3_es_CL.ts} | 0 .../{bitcoin_es_CO.ts => nyc3_es_CO.ts} | 0 .../{bitcoin_es_DO.ts => nyc3_es_DO.ts} | 0 .../{bitcoin_es_ES.ts => nyc3_es_ES.ts} | 0 .../{bitcoin_es_MX.ts => nyc3_es_MX.ts} | 0 .../{bitcoin_es_UY.ts => nyc3_es_UY.ts} | 0 .../{bitcoin_es_VE.ts => nyc3_es_VE.ts} | 0 src/qt/locale/{bitcoin_et.ts => nyc3_et.ts} | 0 .../{bitcoin_et_EE.ts => nyc3_et_EE.ts} | 0 .../{bitcoin_eu_ES.ts => nyc3_eu_ES.ts} | 0 src/qt/locale/{bitcoin_fa.ts => nyc3_fa.ts} | 0 .../{bitcoin_fa_IR.ts => nyc3_fa_IR.ts} | 0 src/qt/locale/{bitcoin_fi.ts => nyc3_fi.ts} | 0 src/qt/locale/{bitcoin_fr.ts => nyc3_fr.ts} | 0 .../{bitcoin_fr_CA.ts => nyc3_fr_CA.ts} | 0 .../{bitcoin_fr_FR.ts => nyc3_fr_FR.ts} | 0 src/qt/locale/{bitcoin_gl.ts => nyc3_gl.ts} | 0 src/qt/locale/{bitcoin_he.ts => nyc3_he.ts} | 0 .../{bitcoin_hi_IN.ts => nyc3_hi_IN.ts} | 0 src/qt/locale/{bitcoin_hr.ts => nyc3_hr.ts} | 0 src/qt/locale/{bitcoin_hu.ts => nyc3_hu.ts} | 0 src/qt/locale/{bitcoin_id.ts => nyc3_id.ts} | 0 .../{bitcoin_id_ID.ts => nyc3_id_ID.ts} | 0 src/qt/locale/{bitcoin_is.ts => nyc3_is.ts} | 0 src/qt/locale/{bitcoin_it.ts => nyc3_it.ts} | 0 .../{bitcoin_it_IT.ts => nyc3_it_IT.ts} | 0 src/qt/locale/{bitcoin_ja.ts => nyc3_ja.ts} | 0 src/qt/locale/{bitcoin_ka.ts => nyc3_ka.ts} | 0 .../{bitcoin_kk_KZ.ts => nyc3_kk_KZ.ts} | 0 src/qt/locale/{bitcoin_ko.ts => nyc3_ko.ts} | 0 .../{bitcoin_ko_KR.ts => nyc3_ko_KR.ts} | 0 .../{bitcoin_ku_IQ.ts => nyc3_ku_IQ.ts} | 0 src/qt/locale/{bitcoin_ky.ts => nyc3_ky.ts} | 0 src/qt/locale/{bitcoin_la.ts => nyc3_la.ts} | 0 src/qt/locale/{bitcoin_lt.ts => nyc3_lt.ts} | 0 .../{bitcoin_lv_LV.ts => nyc3_lv_LV.ts} | 0 .../{bitcoin_mk_MK.ts => nyc3_mk_MK.ts} | 0 src/qt/locale/{bitcoin_ml.ts => nyc3_ml.ts} | 0 src/qt/locale/{bitcoin_mn.ts => nyc3_mn.ts} | 0 .../{bitcoin_ms_MY.ts => nyc3_ms_MY.ts} | 0 src/qt/locale/{bitcoin_nb.ts => nyc3_nb.ts} | 0 src/qt/locale/{bitcoin_ne.ts => nyc3_ne.ts} | 0 src/qt/locale/{bitcoin_nl.ts => nyc3_nl.ts} | 0 src/qt/locale/{bitcoin_pam.ts => nyc3_pam.ts} | 0 src/qt/locale/{bitcoin_pl.ts => nyc3_pl.ts} | 0 .../{bitcoin_pt_BR.ts => nyc3_pt_BR.ts} | 0 .../{bitcoin_pt_PT.ts => nyc3_pt_PT.ts} | 0 src/qt/locale/{bitcoin_ro.ts => nyc3_ro.ts} | 0 .../{bitcoin_ro_RO.ts => nyc3_ro_RO.ts} | 0 src/qt/locale/{bitcoin_ru.ts => nyc3_ru.ts} | 0 .../{bitcoin_ru_RU.ts => nyc3_ru_RU.ts} | 0 src/qt/locale/{bitcoin_sk.ts => nyc3_sk.ts} | 0 .../{bitcoin_sl_SI.ts => nyc3_sl_SI.ts} | 0 src/qt/locale/{bitcoin_sn.ts => nyc3_sn.ts} | 0 src/qt/locale/{bitcoin_sq.ts => nyc3_sq.ts} | 0 src/qt/locale/{bitcoin_sr.ts => nyc3_sr.ts} | 0 .../{bitcoin_sr@latin.ts => nyc3_sr@latin.ts} | 0 src/qt/locale/{bitcoin_sv.ts => nyc3_sv.ts} | 0 src/qt/locale/{bitcoin_szl.ts => nyc3_szl.ts} | 0 src/qt/locale/{bitcoin_ta.ts => nyc3_ta.ts} | 0 .../{bitcoin_th_TH.ts => nyc3_th_TH.ts} | 0 src/qt/locale/{bitcoin_tr.ts => nyc3_tr.ts} | 0 .../{bitcoin_tr_TR.ts => nyc3_tr_TR.ts} | 0 src/qt/locale/{bitcoin_uk.ts => nyc3_uk.ts} | 0 .../{bitcoin_ur_PK.ts => nyc3_ur_PK.ts} | 0 .../{bitcoin_uz@Cyrl.ts => nyc3_uz@Cyrl.ts} | 0 src/qt/locale/{bitcoin_vi.ts => nyc3_vi.ts} | 0 .../{bitcoin_vi_VN.ts => nyc3_vi_VN.ts} | 0 src/qt/locale/{bitcoin_zh.ts => nyc3_zh.ts} | 0 .../{bitcoin_zh_CN.ts => nyc3_zh_CN.ts} | 0 .../{bitcoin_zh_HK.ts => nyc3_zh_HK.ts} | 0 .../{bitcoin_zh_TW.ts => nyc3_zh_TW.ts} | 0 src/qt/main.cpp | 2 +- src/qt/{bitcoin.cpp => nyc3.cpp} | 8 +- src/qt/{bitcoin.h => nyc3.h} | 0 src/qt/{bitcoin.qrc => nyc3.qrc} | 2 +- src/qt/nyc3_locale.qrc | 90 ++++++ ...validator.cpp => nyc3addressvalidator.cpp} | 2 +- ...ressvalidator.h => nyc3addressvalidator.h} | 6 +- ...oinamountfield.cpp => nyc3amountfield.cpp} | 42 +-- ...bitcoinamountfield.h => nyc3amountfield.h} | 10 +- src/qt/{bitcoingui.cpp => nyc3gui.cpp} | 4 +- src/qt/{bitcoingui.h => nyc3gui.h} | 0 .../{bitcoinstrings.cpp => nyc3strings.cpp} | 0 src/qt/{bitcoinunits.cpp => nyc3units.cpp} | 2 +- src/qt/{bitcoinunits.h => nyc3units.h} | 0 src/qt/optionsdialog.cpp | 2 +- src/qt/optionsmodel.cpp | 2 +- src/qt/overviewpage.cpp | 2 +- src/qt/paymentserver.cpp | 2 +- src/qt/qvalidatedlineedit.cpp | 2 +- src/qt/receivecoinsdialog.cpp | 2 +- src/qt/receiverequestdialog.cpp | 2 +- src/qt/recentrequeststablemodel.cpp | 2 +- src/qt/res/icons/connect0.png | Bin 2446 -> 3477 bytes src/qt/res/icons/connect1.png | Bin 2163 -> 282 bytes src/qt/res/icons/connect2.png | Bin 1927 -> 463 bytes src/qt/res/icons/connect3.png | Bin 1750 -> 736 bytes src/qt/res/icons/connect4.png | Bin 1548 -> 1012 bytes src/qt/res/icons/{bitcoin.icns => nyc3.icns} | Bin src/qt/res/icons/{bitcoin.ico => nyc3.ico} | Bin src/qt/res/icons/{bitcoin.png => nyc3.png} | Bin .../{bitcoin_testnet.ico => nyc3_testnet.ico} | Bin src/qt/sendcoinsdialog.cpp | 4 +- src/qt/sendcoinsentry.cpp | 2 +- src/qt/test/addressbooktests.cpp | 2 +- src/qt/test/apptests.cpp | 4 +- src/qt/test/rpcnestedtests.cpp | 2 +- src/qt/test/test_main.cpp | 2 +- src/qt/test/wallettests.cpp | 8 +- src/qt/transactiondesc.cpp | 2 +- src/qt/transactiontablemodel.h | 2 +- src/qt/transactionview.cpp | 2 +- src/qt/utilitydialog.cpp | 2 +- src/qt/walletframe.cpp | 2 +- src/qt/walletview.cpp | 2 +- ...bitcoinconsensus.cpp => nyc3consensus.cpp} | 2 +- .../{bitcoinconsensus.h => nyc3consensus.h} | 0 157 files changed, 435 insertions(+), 435 deletions(-) rename src/{bitcoin-cli-res.rc => nyc3-cli-res.rc} (100%) rename src/{bitcoin-cli.cpp => nyc3-cli.cpp} (100%) rename src/{bitcoin-tx-res.rc => nyc3-tx-res.rc} (100%) rename src/{bitcoin-tx.cpp => nyc3-tx.cpp} (100%) rename src/{bitcoin-wallet-res.rc => nyc3-wallet-res.rc} (100%) rename src/{bitcoin-wallet.cpp => nyc3-wallet.cpp} (100%) rename src/{bitcoind-res.rc => nyc3d-res.rc} (100%) rename src/{bitcoind.cpp => nyc3d.cpp} (100%) delete mode 100644 src/qt/bitcoin_locale.qrc rename src/qt/locale/{bitcoin_af.ts => nyc3_af.ts} (100%) rename src/qt/locale/{bitcoin_af_ZA.ts => nyc3_af_ZA.ts} (100%) rename src/qt/locale/{bitcoin_am.ts => nyc3_am.ts} (100%) rename src/qt/locale/{bitcoin_ar.ts => nyc3_ar.ts} (100%) rename src/qt/locale/{bitcoin_be_BY.ts => nyc3_be_BY.ts} (100%) rename src/qt/locale/{bitcoin_bg.ts => nyc3_bg.ts} (100%) rename src/qt/locale/{bitcoin_bg_BG.ts => nyc3_bg_BG.ts} (100%) rename src/qt/locale/{bitcoin_ca.ts => nyc3_ca.ts} (100%) rename src/qt/locale/{bitcoin_ca@valencia.ts => nyc3_ca@valencia.ts} (100%) rename src/qt/locale/{bitcoin_ca_ES.ts => nyc3_ca_ES.ts} (100%) rename src/qt/locale/{bitcoin_cs.ts => nyc3_cs.ts} (100%) rename src/qt/locale/{bitcoin_cy.ts => nyc3_cy.ts} (100%) rename src/qt/locale/{bitcoin_da.ts => nyc3_da.ts} (100%) rename src/qt/locale/{bitcoin_de.ts => nyc3_de.ts} (100%) rename src/qt/locale/{bitcoin_el.ts => nyc3_el.ts} (100%) rename src/qt/locale/{bitcoin_el_GR.ts => nyc3_el_GR.ts} (100%) rename src/qt/locale/{bitcoin_en.ts => nyc3_en.ts} (100%) rename src/qt/locale/{bitcoin_en_GB.ts => nyc3_en_GB.ts} (100%) rename src/qt/locale/{bitcoin_eo.ts => nyc3_eo.ts} (100%) rename src/qt/locale/{bitcoin_es.ts => nyc3_es.ts} (100%) rename src/qt/locale/{bitcoin_es_AR.ts => nyc3_es_AR.ts} (100%) rename src/qt/locale/{bitcoin_es_CL.ts => nyc3_es_CL.ts} (100%) rename src/qt/locale/{bitcoin_es_CO.ts => nyc3_es_CO.ts} (100%) rename src/qt/locale/{bitcoin_es_DO.ts => nyc3_es_DO.ts} (100%) rename src/qt/locale/{bitcoin_es_ES.ts => nyc3_es_ES.ts} (100%) rename src/qt/locale/{bitcoin_es_MX.ts => nyc3_es_MX.ts} (100%) rename src/qt/locale/{bitcoin_es_UY.ts => nyc3_es_UY.ts} (100%) rename src/qt/locale/{bitcoin_es_VE.ts => nyc3_es_VE.ts} (100%) rename src/qt/locale/{bitcoin_et.ts => nyc3_et.ts} (100%) rename src/qt/locale/{bitcoin_et_EE.ts => nyc3_et_EE.ts} (100%) rename src/qt/locale/{bitcoin_eu_ES.ts => nyc3_eu_ES.ts} (100%) rename src/qt/locale/{bitcoin_fa.ts => nyc3_fa.ts} (100%) rename src/qt/locale/{bitcoin_fa_IR.ts => nyc3_fa_IR.ts} (100%) rename src/qt/locale/{bitcoin_fi.ts => nyc3_fi.ts} (100%) rename src/qt/locale/{bitcoin_fr.ts => nyc3_fr.ts} (100%) rename src/qt/locale/{bitcoin_fr_CA.ts => nyc3_fr_CA.ts} (100%) rename src/qt/locale/{bitcoin_fr_FR.ts => nyc3_fr_FR.ts} (100%) rename src/qt/locale/{bitcoin_gl.ts => nyc3_gl.ts} (100%) rename src/qt/locale/{bitcoin_he.ts => nyc3_he.ts} (100%) rename src/qt/locale/{bitcoin_hi_IN.ts => nyc3_hi_IN.ts} (100%) rename src/qt/locale/{bitcoin_hr.ts => nyc3_hr.ts} (100%) rename src/qt/locale/{bitcoin_hu.ts => nyc3_hu.ts} (100%) rename src/qt/locale/{bitcoin_id.ts => nyc3_id.ts} (100%) rename src/qt/locale/{bitcoin_id_ID.ts => nyc3_id_ID.ts} (100%) rename src/qt/locale/{bitcoin_is.ts => nyc3_is.ts} (100%) rename src/qt/locale/{bitcoin_it.ts => nyc3_it.ts} (100%) rename src/qt/locale/{bitcoin_it_IT.ts => nyc3_it_IT.ts} (100%) rename src/qt/locale/{bitcoin_ja.ts => nyc3_ja.ts} (100%) rename src/qt/locale/{bitcoin_ka.ts => nyc3_ka.ts} (100%) rename src/qt/locale/{bitcoin_kk_KZ.ts => nyc3_kk_KZ.ts} (100%) rename src/qt/locale/{bitcoin_ko.ts => nyc3_ko.ts} (100%) rename src/qt/locale/{bitcoin_ko_KR.ts => nyc3_ko_KR.ts} (100%) rename src/qt/locale/{bitcoin_ku_IQ.ts => nyc3_ku_IQ.ts} (100%) rename src/qt/locale/{bitcoin_ky.ts => nyc3_ky.ts} (100%) rename src/qt/locale/{bitcoin_la.ts => nyc3_la.ts} (100%) rename src/qt/locale/{bitcoin_lt.ts => nyc3_lt.ts} (100%) rename src/qt/locale/{bitcoin_lv_LV.ts => nyc3_lv_LV.ts} (100%) rename src/qt/locale/{bitcoin_mk_MK.ts => nyc3_mk_MK.ts} (100%) rename src/qt/locale/{bitcoin_ml.ts => nyc3_ml.ts} (100%) rename src/qt/locale/{bitcoin_mn.ts => nyc3_mn.ts} (100%) rename src/qt/locale/{bitcoin_ms_MY.ts => nyc3_ms_MY.ts} (100%) rename src/qt/locale/{bitcoin_nb.ts => nyc3_nb.ts} (100%) rename src/qt/locale/{bitcoin_ne.ts => nyc3_ne.ts} (100%) rename src/qt/locale/{bitcoin_nl.ts => nyc3_nl.ts} (100%) rename src/qt/locale/{bitcoin_pam.ts => nyc3_pam.ts} (100%) rename src/qt/locale/{bitcoin_pl.ts => nyc3_pl.ts} (100%) rename src/qt/locale/{bitcoin_pt_BR.ts => nyc3_pt_BR.ts} (100%) rename src/qt/locale/{bitcoin_pt_PT.ts => nyc3_pt_PT.ts} (100%) rename src/qt/locale/{bitcoin_ro.ts => nyc3_ro.ts} (100%) rename src/qt/locale/{bitcoin_ro_RO.ts => nyc3_ro_RO.ts} (100%) rename src/qt/locale/{bitcoin_ru.ts => nyc3_ru.ts} (100%) rename src/qt/locale/{bitcoin_ru_RU.ts => nyc3_ru_RU.ts} (100%) rename src/qt/locale/{bitcoin_sk.ts => nyc3_sk.ts} (100%) rename src/qt/locale/{bitcoin_sl_SI.ts => nyc3_sl_SI.ts} (100%) rename src/qt/locale/{bitcoin_sn.ts => nyc3_sn.ts} (100%) rename src/qt/locale/{bitcoin_sq.ts => nyc3_sq.ts} (100%) rename src/qt/locale/{bitcoin_sr.ts => nyc3_sr.ts} (100%) rename src/qt/locale/{bitcoin_sr@latin.ts => nyc3_sr@latin.ts} (100%) rename src/qt/locale/{bitcoin_sv.ts => nyc3_sv.ts} (100%) rename src/qt/locale/{bitcoin_szl.ts => nyc3_szl.ts} (100%) rename src/qt/locale/{bitcoin_ta.ts => nyc3_ta.ts} (100%) rename src/qt/locale/{bitcoin_th_TH.ts => nyc3_th_TH.ts} (100%) rename src/qt/locale/{bitcoin_tr.ts => nyc3_tr.ts} (100%) rename src/qt/locale/{bitcoin_tr_TR.ts => nyc3_tr_TR.ts} (100%) rename src/qt/locale/{bitcoin_uk.ts => nyc3_uk.ts} (100%) rename src/qt/locale/{bitcoin_ur_PK.ts => nyc3_ur_PK.ts} (100%) rename src/qt/locale/{bitcoin_uz@Cyrl.ts => nyc3_uz@Cyrl.ts} (100%) rename src/qt/locale/{bitcoin_vi.ts => nyc3_vi.ts} (100%) rename src/qt/locale/{bitcoin_vi_VN.ts => nyc3_vi_VN.ts} (100%) rename src/qt/locale/{bitcoin_zh.ts => nyc3_zh.ts} (100%) rename src/qt/locale/{bitcoin_zh_CN.ts => nyc3_zh_CN.ts} (100%) rename src/qt/locale/{bitcoin_zh_HK.ts => nyc3_zh_HK.ts} (100%) rename src/qt/locale/{bitcoin_zh_TW.ts => nyc3_zh_TW.ts} (100%) rename src/qt/{bitcoin.cpp => nyc3.cpp} (99%) rename src/qt/{bitcoin.h => nyc3.h} (100%) rename src/qt/{bitcoin.qrc => nyc3.qrc} (99%) create mode 100644 src/qt/nyc3_locale.qrc rename src/qt/{bitcoinaddressvalidator.cpp => nyc3addressvalidator.cpp} (98%) rename src/qt/{bitcoinaddressvalidator.h => nyc3addressvalidator.h} (85%) rename src/qt/{bitcoinamountfield.cpp => nyc3amountfield.cpp} (87%) rename src/qt/{bitcoinamountfield.h => nyc3amountfield.h} (90%) rename src/qt/{bitcoingui.cpp => nyc3gui.cpp} (99%) rename src/qt/{bitcoingui.h => nyc3gui.h} (100%) rename src/qt/{bitcoinstrings.cpp => nyc3strings.cpp} (100%) rename src/qt/{bitcoinunits.cpp => nyc3units.cpp} (99%) rename src/qt/{bitcoinunits.h => nyc3units.h} (100%) rename src/qt/res/icons/{bitcoin.icns => nyc3.icns} (100%) rename src/qt/res/icons/{bitcoin.ico => nyc3.ico} (100%) rename src/qt/res/icons/{bitcoin.png => nyc3.png} (100%) rename src/qt/res/icons/{bitcoin_testnet.ico => nyc3_testnet.ico} (100%) rename src/script/{bitcoinconsensus.cpp => nyc3consensus.cpp} (99%) rename src/script/{bitcoinconsensus.h => nyc3consensus.h} (100%) diff --git a/configure.ac b/configure.ac index a07a9d150..732cff873 100644 --- a/configure.ac +++ b/configure.ac @@ -8,18 +8,18 @@ define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2019) define(_COPYRIGHT_HOLDERS,[The %s developers]) -define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]]) +define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[nyc3]]) AC_INIT([Bitcoin Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/]) AC_CONFIG_SRCDIR([src/validation.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) -BITCOIN_DAEMON_NAME=bitcoind -BITCOIN_GUI_NAME=bitcoin-qt -BITCOIN_CLI_NAME=bitcoin-cli -BITCOIN_TX_NAME=bitcoin-tx -BITCOIN_WALLET_TOOL_NAME=bitcoin-wallet +BITCOIN_DAEMON_NAME=nyc3d +BITCOIN_GUI_NAME=nyc3-qt +BITCOIN_CLI_NAME=nyc3-cli +BITCOIN_TX_NAME=nyc3-tx +BITCOIN_WALLET_TOOL_NAME=nyc3-wallet dnl Unless the user specified ARFLAGS, force it to be cr AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to if not set]) diff --git a/src/Makefile.am b/src/Makefile.am index 44113a220..fc2a16676 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,37 +24,37 @@ BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFL BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) -LIBBITCOIN_SERVER=libbitcoin_server.a -LIBBITCOIN_COMMON=libbitcoin_common.a -LIBBITCOIN_CONSENSUS=libbitcoin_consensus.a -LIBBITCOIN_CLI=libbitcoin_cli.a -LIBBITCOIN_UTIL=libbitcoin_util.a -LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.a -LIBBITCOINQT=qt/libbitcoinqt.a +LIBBITCOIN_SERVER=libnyc3_server.a +LIBBITCOIN_COMMON=libnyc3_common.a +LIBBITCOIN_CONSENSUS=libnyc3_consensus.a +LIBBITCOIN_CLI=libnyc3_cli.a +LIBBITCOIN_UTIL=libnyc3_util.a +LIBBITCOIN_CRYPTO_BASE=crypto/libnyc3_crypto_base.a +LIBBITCOINQT=qt/libnyc3qt.a LIBSECP256K1=secp256k1/libsecp256k1.la if ENABLE_ZMQ -LIBBITCOIN_ZMQ=libbitcoin_zmq.a +LIBBITCOIN_ZMQ=libnyc3_zmq.a endif if BUILD_BITCOIN_LIBS -LIBBITCOINCONSENSUS=libbitcoinconsensus.la +LIBBITCOINCONSENSUS=libnyc3consensus.la endif if ENABLE_WALLET -LIBBITCOIN_WALLET=libbitcoin_wallet.a -LIBBITCOIN_WALLET_TOOL=libbitcoin_wallet_tool.a +LIBBITCOIN_WALLET=libnyc3_wallet.a +LIBBITCOIN_WALLET_TOOL=libnyc3_wallet_tool.a endif LIBBITCOIN_CRYPTO= $(LIBBITCOIN_CRYPTO_BASE) if ENABLE_SSE41 -LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.a +LIBBITCOIN_CRYPTO_SSE41 = crypto/libnyc3_crypto_sse41.a LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41) endif if ENABLE_AVX2 -LIBBITCOIN_CRYPTO_AVX2 = crypto/libbitcoin_crypto_avx2.a +LIBBITCOIN_CRYPTO_AVX2 = crypto/libnyc3_crypto_avx2.a LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_AVX2) endif if ENABLE_SHANI -LIBBITCOIN_CRYPTO_SHANI = crypto/libbitcoin_crypto_shani.a +LIBBITCOIN_CRYPTO_SHANI = crypto/libnyc3_crypto_shani.a LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SHANI) endif @@ -82,23 +82,23 @@ TESTS = BENCHMARKS = if BUILD_BITCOIND - bin_PROGRAMS += bitcoind + bin_PROGRAMS += nyc3d endif if BUILD_BITCOIN_CLI - bin_PROGRAMS += bitcoin-cli + bin_PROGRAMS += nyc3-cli endif if BUILD_BITCOIN_TX - bin_PROGRAMS += bitcoin-tx + bin_PROGRAMS += nyc3-tx endif if ENABLE_WALLET if BUILD_BITCOIN_WALLET - bin_PROGRAMS += bitcoin-wallet + bin_PROGRAMS += nyc3-wallet endif endif .PHONY: FORCE check-symbols check-security -# bitcoin core # +# nyc3 core # BITCOIN_CORE_H = \ addrdb.h \ addrman.h \ @@ -232,12 +232,12 @@ obj/build.h: FORCE @$(MKDIR_P) $(builddir)/obj @$(top_srcdir)/share/genbuild.sh "$(abs_top_builddir)/src/obj/build.h" \ "$(abs_top_srcdir)" -libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h +libnyc3_util_a-clientversion.$(OBJEXT): obj/build.h -# server: shared between bitcoind and bitcoin-qt -libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_server_a_SOURCES = \ +# server: shared between nyc3d and nyc3-qt +libnyc3_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) +libnyc3_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libnyc3_server_a_SOURCES = \ addrdb.cpp \ addrman.cpp \ banman.cpp \ @@ -288,13 +288,13 @@ libbitcoin_server_a_SOURCES = \ $(BITCOIN_CORE_H) if !ENABLE_WALLET -libbitcoin_server_a_SOURCES += dummywallet.cpp +libnyc3_server_a_SOURCES += dummywallet.cpp endif if ENABLE_ZMQ -libbitcoin_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS) -libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_zmq_a_SOURCES = \ +libnyc3_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS) +libnyc3_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libnyc3_zmq_a_SOURCES = \ zmq/zmqabstractnotifier.cpp \ zmq/zmqnotificationinterface.cpp \ zmq/zmqpublishnotifier.cpp \ @@ -302,11 +302,11 @@ libbitcoin_zmq_a_SOURCES = \ endif -# wallet: shared between bitcoind and bitcoin-qt, but only linked +# wallet: shared between nyc3d and nyc3-qt, but only linked # when wallet enabled -libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_wallet_a_SOURCES = \ +libnyc3_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libnyc3_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libnyc3_wallet_a_SOURCES = \ interfaces/wallet.cpp \ wallet/coincontrol.cpp \ wallet/crypter.cpp \ @@ -323,16 +323,16 @@ libbitcoin_wallet_a_SOURCES = \ wallet/coinselection.cpp \ $(BITCOIN_CORE_H) -libbitcoin_wallet_tool_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_wallet_tool_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_wallet_tool_a_SOURCES = \ +libnyc3_wallet_tool_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libnyc3_wallet_tool_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libnyc3_wallet_tool_a_SOURCES = \ wallet/wallettool.cpp \ $(BITCOIN_CORE_H) # crypto primitives library -crypto_libbitcoin_crypto_base_a_CPPFLAGS = $(AM_CPPFLAGS) $(SSL_CFLAGS) -crypto_libbitcoin_crypto_base_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libbitcoin_crypto_base_a_SOURCES = \ +crypto_libnyc3_crypto_base_a_CPPFLAGS = $(AM_CPPFLAGS) $(SSL_CFLAGS) +crypto_libnyc3_crypto_base_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libnyc3_crypto_base_a_SOURCES = \ crypto/aes.cpp \ crypto/aes.h \ crypto/chacha20.h \ @@ -363,31 +363,31 @@ crypto_libbitcoin_crypto_base_a_SOURCES = \ crypto/parallel/sha512.h if USE_ASM -crypto_libbitcoin_crypto_base_a_SOURCES += crypto/sha256_sse4.cpp +crypto_libnyc3_crypto_base_a_SOURCES += crypto/sha256_sse4.cpp endif -crypto_libbitcoin_crypto_sse41_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libbitcoin_crypto_sse41_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libbitcoin_crypto_sse41_a_CXXFLAGS += $(SSE41_CXXFLAGS) -crypto_libbitcoin_crypto_sse41_a_CPPFLAGS += -DENABLE_SSE41 -crypto_libbitcoin_crypto_sse41_a_SOURCES = crypto/sha256_sse41.cpp +crypto_libnyc3_crypto_sse41_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libnyc3_crypto_sse41_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libnyc3_crypto_sse41_a_CXXFLAGS += $(SSE41_CXXFLAGS) +crypto_libnyc3_crypto_sse41_a_CPPFLAGS += -DENABLE_SSE41 +crypto_libnyc3_crypto_sse41_a_SOURCES = crypto/sha256_sse41.cpp -crypto_libbitcoin_crypto_avx2_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libbitcoin_crypto_avx2_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libbitcoin_crypto_avx2_a_CXXFLAGS += $(AVX2_CXXFLAGS) -crypto_libbitcoin_crypto_avx2_a_CPPFLAGS += -DENABLE_AVX2 -crypto_libbitcoin_crypto_avx2_a_SOURCES = crypto/sha256_avx2.cpp +crypto_libnyc3_crypto_avx2_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libnyc3_crypto_avx2_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libnyc3_crypto_avx2_a_CXXFLAGS += $(AVX2_CXXFLAGS) +crypto_libnyc3_crypto_avx2_a_CPPFLAGS += -DENABLE_AVX2 +crypto_libnyc3_crypto_avx2_a_SOURCES = crypto/sha256_avx2.cpp -crypto_libbitcoin_crypto_shani_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -crypto_libbitcoin_crypto_shani_a_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libbitcoin_crypto_shani_a_CXXFLAGS += $(SHANI_CXXFLAGS) -crypto_libbitcoin_crypto_shani_a_CPPFLAGS += -DENABLE_SHANI -crypto_libbitcoin_crypto_shani_a_SOURCES = crypto/sha256_shani.cpp +crypto_libnyc3_crypto_shani_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +crypto_libnyc3_crypto_shani_a_CPPFLAGS = $(AM_CPPFLAGS) +crypto_libnyc3_crypto_shani_a_CXXFLAGS += $(SHANI_CXXFLAGS) +crypto_libnyc3_crypto_shani_a_CPPFLAGS += -DENABLE_SHANI +crypto_libnyc3_crypto_shani_a_SOURCES = crypto/sha256_shani.cpp # consensus: shared between all executables that validate any consensus rules. -libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_consensus_a_SOURCES = \ +libnyc3_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libnyc3_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libnyc3_consensus_a_SOURCES = \ amount.h \ arith_uint256.cpp \ arith_uint256.h \ @@ -404,7 +404,7 @@ libbitcoin_consensus_a_SOURCES = \ primitives/transaction.h \ pubkey.cpp \ pubkey.h \ - script/bitcoinconsensus.cpp \ + script/nyc3consensus.cpp \ script/interpreter.cpp \ script/interpreter.h \ script/script.cpp \ @@ -420,10 +420,10 @@ libbitcoin_consensus_a_SOURCES = \ util/strencodings.h \ version.h -# common: shared between bitcoind, and bitcoin-qt and non-server tools -libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_common_a_SOURCES = \ +# common: shared between nyc3d, and nyc3-qt and non-server tools +libnyc3_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libnyc3_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libnyc3_common_a_SOURCES = \ base58.cpp \ bech32.cpp \ chainparams.cpp \ @@ -451,9 +451,9 @@ libbitcoin_common_a_SOURCES = \ # util: shared between all executables. # This library *must* be included to make sure that the glibc # backward-compatibility objects and their sanity checks are linked. -libbitcoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_util_a_SOURCES = \ +libnyc3_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libnyc3_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libnyc3_util_a_SOURCES = \ support/lockedpool.cpp \ chainparamsbase.cpp \ clientversion.cpp \ @@ -476,31 +476,31 @@ libbitcoin_util_a_SOURCES = \ $(BITCOIN_CORE_H) if GLIBC_BACK_COMPAT -libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp +libnyc3_util_a_SOURCES += compat/glibc_compat.cpp AM_LDFLAGS += $(COMPAT_LDFLAGS) endif -# cli: shared between bitcoin-cli and bitcoin-qt -libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libbitcoin_cli_a_SOURCES = \ +# cli: shared between nyc3-cli and nyc3-qt +libnyc3_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libnyc3_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libnyc3_cli_a_SOURCES = \ rpc/client.cpp \ $(BITCOIN_CORE_H) -nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h +nodist_libnyc3_util_a_SOURCES = $(srcdir)/obj/build.h # -# bitcoind binary # -bitcoind_SOURCES = bitcoind.cpp -bitcoind_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -bitcoind_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# nyc3d binary # +nyc3d_SOURCES = nyc3d.cpp +nyc3d_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +nyc3d_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +nyc3d_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoind_SOURCES += bitcoind-res.rc +nyc3d_SOURCES += nyc3d-res.rc endif -bitcoind_LDADD = \ +nyc3d_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_WALLET) \ $(LIBBITCOIN_SERVER) \ @@ -515,38 +515,38 @@ bitcoind_LDADD = \ $(LIBMEMENV) \ $(LIBSECP256K1) -bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) +nyc3d_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) -# bitcoin-cli binary # -bitcoin_cli_SOURCES = bitcoin-cli.cpp -bitcoin_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) -bitcoin_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# nyc3-cli binary # +nyc3_cli_SOURCES = nyc3-cli.cpp +nyc3_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) +nyc3_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +nyc3_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoin_cli_SOURCES += bitcoin-cli-res.rc +nyc3_cli_SOURCES += nyc3-cli-res.rc endif -bitcoin_cli_LDADD = \ +nyc3_cli_LDADD = \ $(LIBBITCOIN_CLI) \ $(LIBUNIVALUE) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CRYPTO) -bitcoin_cli_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS) +nyc3_cli_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS) # -# bitcoin-tx binary # -bitcoin_tx_SOURCES = bitcoin-tx.cpp -bitcoin_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -bitcoin_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# nyc3-tx binary # +nyc3_tx_SOURCES = nyc3-tx.cpp +nyc3_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +nyc3_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +nyc3_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoin_tx_SOURCES += bitcoin-tx-res.rc +nyc3_tx_SOURCES += nyc3-tx-res.rc endif -bitcoin_tx_LDADD = \ +nyc3_tx_LDADD = \ $(LIBUNIVALUE) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ @@ -554,20 +554,20 @@ bitcoin_tx_LDADD = \ $(LIBBITCOIN_CRYPTO) \ $(LIBSECP256K1) -bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) +nyc3_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) # -# bitcoin-wallet binary # -bitcoin_wallet_SOURCES = bitcoin-wallet.cpp -bitcoin_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -bitcoin_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoin_wallet_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# nyc3-wallet binary # +nyc3_wallet_SOURCES = nyc3-wallet.cpp +nyc3_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +nyc3_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +nyc3_wallet_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -bitcoin_wallet_SOURCES += bitcoin-wallet-res.rc +nyc3_wallet_SOURCES += nyc3-wallet-res.rc endif -bitcoin_wallet_LDADD = \ +nyc3_wallet_LDADD = \ $(LIBBITCOIN_WALLET_TOOL) \ $(LIBBITCOIN_WALLET) \ $(LIBBITCOIN_SERVER) \ @@ -580,22 +580,22 @@ bitcoin_wallet_LDADD = \ $(LIBMEMENV) \ $(LIBSECP256K1) -bitcoin_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) +nyc3_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) # -# bitcoinconsensus library # +# nyc3consensus library # if BUILD_BITCOIN_LIBS -include_HEADERS = script/bitcoinconsensus.h -libbitcoinconsensus_la_SOURCES = $(crypto_libbitcoin_crypto_base_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) +include_HEADERS = script/nyc3consensus.h +libnyc3consensus_la_SOURCES = $(crypto_libnyc3_crypto_base_a_SOURCES) $(libnyc3_consensus_a_SOURCES) if GLIBC_BACK_COMPAT - libbitcoinconsensus_la_SOURCES += compat/glibc_compat.cpp + libnyc3consensus_la_SOURCES += compat/glibc_compat.cpp endif -libbitcoinconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) -libbitcoinconsensus_la_LIBADD = $(LIBSECP256K1) $(CRYPTO_LIBS) -libbitcoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL $(SSL_CFLAGS) -libbitcoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libnyc3consensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) +libnyc3consensus_la_LIBADD = $(LIBSECP256K1) $(CRYPTO_LIBS) +libnyc3consensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL $(SSL_CFLAGS) +libnyc3consensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) endif # @@ -625,12 +625,12 @@ CLEANFILES += obj/build.h EXTRA_DIST = $(CTAES_DIST) -config/bitcoin-config.h: config/stamp-h1 +config/nyc3-config.h: config/stamp-h1 @$(MAKE) -C $(top_builddir) $(subdir)/$(@) -config/stamp-h1: $(top_srcdir)/$(subdir)/config/bitcoin-config.h.in $(top_builddir)/config.status +config/stamp-h1: $(top_srcdir)/$(subdir)/config/nyc3-config.h.in $(top_builddir)/config.status $(AM_V_at)$(MAKE) -C $(top_builddir) $(subdir)/$(@) -$(top_srcdir)/$(subdir)/config/bitcoin-config.h.in: $(am__configure_deps) - $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/bitcoin-config.h.in +$(top_srcdir)/$(subdir)/config/nyc3-config.h.in: $(am__configure_deps) + $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/nyc3-config.h.in clean-local: -$(MAKE) -C secp256k1 clean diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index ba6523d7c..267b80ecb 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -2,97 +2,97 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -bin_PROGRAMS += qt/bitcoin-qt -EXTRA_LIBRARIES += qt/libbitcoinqt.a +bin_PROGRAMS += qt/nyc3-qt +EXTRA_LIBRARIES += qt/libnyc3qt.a -# bitcoin qt core # +# nyc3 qt core # QT_TS = \ - qt/locale/bitcoin_af.ts \ - qt/locale/bitcoin_af_ZA.ts \ - qt/locale/bitcoin_ar.ts \ - qt/locale/bitcoin_be_BY.ts \ - qt/locale/bitcoin_bg_BG.ts \ - qt/locale/bitcoin_bg.ts \ - qt/locale/bitcoin_ca_ES.ts \ - qt/locale/bitcoin_ca.ts \ - qt/locale/bitcoin_ca@valencia.ts \ - qt/locale/bitcoin_cs.ts \ - qt/locale/bitcoin_cy.ts \ - qt/locale/bitcoin_da.ts \ - qt/locale/bitcoin_de.ts \ - qt/locale/bitcoin_el_GR.ts \ - qt/locale/bitcoin_el.ts \ - qt/locale/bitcoin_en_GB.ts \ - qt/locale/bitcoin_en.ts \ - qt/locale/bitcoin_eo.ts \ - qt/locale/bitcoin_es_AR.ts \ - qt/locale/bitcoin_es_CL.ts \ - qt/locale/bitcoin_es_CO.ts \ - qt/locale/bitcoin_es_DO.ts \ - qt/locale/bitcoin_es_ES.ts \ - qt/locale/bitcoin_es_MX.ts \ - qt/locale/bitcoin_es.ts \ - qt/locale/bitcoin_es_UY.ts \ - qt/locale/bitcoin_es_VE.ts \ - qt/locale/bitcoin_et_EE.ts \ - qt/locale/bitcoin_et.ts \ - qt/locale/bitcoin_eu_ES.ts \ - qt/locale/bitcoin_fa_IR.ts \ - qt/locale/bitcoin_fa.ts \ - qt/locale/bitcoin_fi.ts \ - qt/locale/bitcoin_fr_CA.ts \ - qt/locale/bitcoin_fr_FR.ts \ - qt/locale/bitcoin_fr.ts \ - qt/locale/bitcoin_gl.ts \ - qt/locale/bitcoin_he.ts \ - qt/locale/bitcoin_hi_IN.ts \ - qt/locale/bitcoin_hr.ts \ - qt/locale/bitcoin_hu.ts \ - qt/locale/bitcoin_id_ID.ts \ - qt/locale/bitcoin_it_IT.ts \ - qt/locale/bitcoin_it.ts \ - qt/locale/bitcoin_ja.ts \ - qt/locale/bitcoin_ka.ts \ - qt/locale/bitcoin_kk_KZ.ts \ - qt/locale/bitcoin_ko_KR.ts \ - qt/locale/bitcoin_ku_IQ.ts \ - qt/locale/bitcoin_ky.ts \ - qt/locale/bitcoin_la.ts \ - qt/locale/bitcoin_lt.ts \ - qt/locale/bitcoin_lv_LV.ts \ - qt/locale/bitcoin_mk_MK.ts \ - qt/locale/bitcoin_mn.ts \ - qt/locale/bitcoin_ms_MY.ts \ - qt/locale/bitcoin_nb.ts \ - qt/locale/bitcoin_ne.ts \ - qt/locale/bitcoin_nl.ts \ - qt/locale/bitcoin_pam.ts \ - qt/locale/bitcoin_pl.ts \ - qt/locale/bitcoin_pt_BR.ts \ - qt/locale/bitcoin_pt_PT.ts \ - qt/locale/bitcoin_ro_RO.ts \ - qt/locale/bitcoin_ro.ts \ - qt/locale/bitcoin_ru_RU.ts \ - qt/locale/bitcoin_ru.ts \ - qt/locale/bitcoin_sk.ts \ - qt/locale/bitcoin_sl_SI.ts \ - qt/locale/bitcoin_sq.ts \ - qt/locale/bitcoin_sr@latin.ts \ - qt/locale/bitcoin_sr.ts \ - qt/locale/bitcoin_sv.ts \ - qt/locale/bitcoin_ta.ts \ - qt/locale/bitcoin_th_TH.ts \ - qt/locale/bitcoin_tr_TR.ts \ - qt/locale/bitcoin_tr.ts \ - qt/locale/bitcoin_uk.ts \ - qt/locale/bitcoin_ur_PK.ts \ - qt/locale/bitcoin_uz@Cyrl.ts \ - qt/locale/bitcoin_vi.ts \ - qt/locale/bitcoin_vi_VN.ts \ - qt/locale/bitcoin_zh_CN.ts \ - qt/locale/bitcoin_zh_HK.ts \ - qt/locale/bitcoin_zh.ts \ - qt/locale/bitcoin_zh_TW.ts + qt/locale/nyc3_af.ts \ + qt/locale/nyc3_af_ZA.ts \ + qt/locale/nyc3_ar.ts \ + qt/locale/nyc3_be_BY.ts \ + qt/locale/nyc3_bg_BG.ts \ + qt/locale/nyc3_bg.ts \ + qt/locale/nyc3_ca_ES.ts \ + qt/locale/nyc3_ca.ts \ + qt/locale/nyc3_ca@valencia.ts \ + qt/locale/nyc3_cs.ts \ + qt/locale/nyc3_cy.ts \ + qt/locale/nyc3_da.ts \ + qt/locale/nyc3_de.ts \ + qt/locale/nyc3_el_GR.ts \ + qt/locale/nyc3_el.ts \ + qt/locale/nyc3_en_GB.ts \ + qt/locale/nyc3_en.ts \ + qt/locale/nyc3_eo.ts \ + qt/locale/nyc3_es_AR.ts \ + qt/locale/nyc3_es_CL.ts \ + qt/locale/nyc3_es_CO.ts \ + qt/locale/nyc3_es_DO.ts \ + qt/locale/nyc3_es_ES.ts \ + qt/locale/nyc3_es_MX.ts \ + qt/locale/nyc3_es.ts \ + qt/locale/nyc3_es_UY.ts \ + qt/locale/nyc3_es_VE.ts \ + qt/locale/nyc3_et_EE.ts \ + qt/locale/nyc3_et.ts \ + qt/locale/nyc3_eu_ES.ts \ + qt/locale/nyc3_fa_IR.ts \ + qt/locale/nyc3_fa.ts \ + qt/locale/nyc3_fi.ts \ + qt/locale/nyc3_fr_CA.ts \ + qt/locale/nyc3_fr_FR.ts \ + qt/locale/nyc3_fr.ts \ + qt/locale/nyc3_gl.ts \ + qt/locale/nyc3_he.ts \ + qt/locale/nyc3_hi_IN.ts \ + qt/locale/nyc3_hr.ts \ + qt/locale/nyc3_hu.ts \ + qt/locale/nyc3_id_ID.ts \ + qt/locale/nyc3_it_IT.ts \ + qt/locale/nyc3_it.ts \ + qt/locale/nyc3_ja.ts \ + qt/locale/nyc3_ka.ts \ + qt/locale/nyc3_kk_KZ.ts \ + qt/locale/nyc3_ko_KR.ts \ + qt/locale/nyc3_ku_IQ.ts \ + qt/locale/nyc3_ky.ts \ + qt/locale/nyc3_la.ts \ + qt/locale/nyc3_lt.ts \ + qt/locale/nyc3_lv_LV.ts \ + qt/locale/nyc3_mk_MK.ts \ + qt/locale/nyc3_mn.ts \ + qt/locale/nyc3_ms_MY.ts \ + qt/locale/nyc3_nb.ts \ + qt/locale/nyc3_ne.ts \ + qt/locale/nyc3_nl.ts \ + qt/locale/nyc3_pam.ts \ + qt/locale/nyc3_pl.ts \ + qt/locale/nyc3_pt_BR.ts \ + qt/locale/nyc3_pt_PT.ts \ + qt/locale/nyc3_ro_RO.ts \ + qt/locale/nyc3_ro.ts \ + qt/locale/nyc3_ru_RU.ts \ + qt/locale/nyc3_ru.ts \ + qt/locale/nyc3_sk.ts \ + qt/locale/nyc3_sl_SI.ts \ + qt/locale/nyc3_sq.ts \ + qt/locale/nyc3_sr@latin.ts \ + qt/locale/nyc3_sr.ts \ + qt/locale/nyc3_sv.ts \ + qt/locale/nyc3_ta.ts \ + qt/locale/nyc3_th_TH.ts \ + qt/locale/nyc3_tr_TR.ts \ + qt/locale/nyc3_tr.ts \ + qt/locale/nyc3_uk.ts \ + qt/locale/nyc3_ur_PK.ts \ + qt/locale/nyc3_uz@Cyrl.ts \ + qt/locale/nyc3_vi.ts \ + qt/locale/nyc3_vi_VN.ts \ + qt/locale/nyc3_zh_CN.ts \ + qt/locale/nyc3_zh_HK.ts \ + qt/locale/nyc3_zh.ts \ + qt/locale/nyc3_zh_TW.ts QT_FORMS_UI = \ qt/forms/addressbookpage.ui \ @@ -118,11 +118,11 @@ QT_MOC_CPP = \ qt/moc_addresstablemodel.cpp \ qt/moc_askpassphrasedialog.cpp \ qt/moc_bantablemodel.cpp \ - qt/moc_bitcoinaddressvalidator.cpp \ - qt/moc_bitcoinamountfield.cpp \ - qt/moc_bitcoin.cpp \ - qt/moc_bitcoingui.cpp \ - qt/moc_bitcoinunits.cpp \ + qt/moc_nyc3addressvalidator.cpp \ + qt/moc_nyc3amountfield.cpp \ + qt/moc_nyc3.cpp \ + qt/moc_nyc3gui.cpp \ + qt/moc_nyc3units.cpp \ qt/moc_clientmodel.cpp \ qt/moc_coincontroldialog.cpp \ qt/moc_coincontroltreewidget.cpp \ @@ -168,15 +168,15 @@ BITCOIN_MM = \ qt/macos_appnap.mm QT_MOC = \ - qt/bitcoinamountfield.moc \ + qt/nyc3amountfield.moc \ qt/intro.moc \ qt/overviewpage.moc \ qt/rpcconsole.moc -QT_QRC_CPP = qt/qrc_bitcoin.cpp -QT_QRC = qt/bitcoin.qrc -QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp -QT_QRC_LOCALE = qt/bitcoin_locale.qrc +QT_QRC_CPP = qt/qrc_nyc3.cpp +QT_QRC = qt/nyc3.qrc +QT_QRC_LOCALE_CPP = qt/qrc_nyc3_locale.cpp +QT_QRC_LOCALE = qt/nyc3_locale.qrc if ENABLE_BIP70 PROTOBUF_CC = qt/paymentrequest.pb.cc @@ -193,11 +193,11 @@ BITCOIN_QT_H = \ qt/addresstablemodel.h \ qt/askpassphrasedialog.h \ qt/bantablemodel.h \ - qt/bitcoinaddressvalidator.h \ - qt/bitcoinamountfield.h \ - qt/bitcoin.h \ - qt/bitcoingui.h \ - qt/bitcoinunits.h \ + qt/nyc3addressvalidator.h \ + qt/nyc3amountfield.h \ + qt/nyc3.h \ + qt/nyc3gui.h \ + qt/nyc3units.h \ qt/clientmodel.h \ qt/coincontroldialog.h \ qt/coincontroltreewidget.h \ @@ -250,9 +250,9 @@ RES_ICONS = \ qt/res/icons/address-book.png \ qt/res/icons/about.png \ qt/res/icons/about_qt.png \ - qt/res/icons/bitcoin.ico \ - qt/res/icons/bitcoin_testnet.ico \ - qt/res/icons/bitcoin.png \ + qt/res/icons/nyc3.ico \ + qt/res/icons/nyc3_testnet.ico \ + qt/res/icons/nyc3.png \ qt/res/icons/chevron.png \ qt/res/icons/clock1.png \ qt/res/icons/clock2.png \ @@ -305,11 +305,11 @@ RES_ICONS = \ BITCOIN_QT_BASE_CPP = \ qt/bantablemodel.cpp \ - qt/bitcoin.cpp \ - qt/bitcoinaddressvalidator.cpp \ - qt/bitcoinamountfield.cpp \ - qt/bitcoingui.cpp \ - qt/bitcoinunits.cpp \ + qt/nyc3.cpp \ + qt/nyc3addressvalidator.cpp \ + qt/nyc3amountfield.cpp \ + qt/nyc3gui.cpp \ + qt/nyc3units.cpp \ qt/clientmodel.cpp \ qt/csvmodelwriter.cpp \ qt/guiutil.cpp \ @@ -376,22 +376,22 @@ RES_IMAGES = RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png) -BITCOIN_RC = qt/res/bitcoin-qt-res.rc +BITCOIN_RC = qt/res/nyc3-qt-res.rc BITCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS -qt_libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_libnyc3qt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) -qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS) +qt_libnyc3qt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_libnyc3qt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS) -qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \ +qt_libnyc3qt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \ $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) if TARGET_DARWIN - qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM) + qt_libnyc3qt_a_SOURCES += $(BITCOIN_MM) endif -nodist_qt_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \ +nodist_qt_libnyc3qt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \ $(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP) # forms/foo.h -> forms/ui_foo.h @@ -400,76 +400,76 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI: # Most files will depend on the forms and moc files as includes. Generate them # before anything else. $(QT_MOC): $(QT_FORMS_H) -$(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) : | $(QT_MOC) +$(qt_libnyc3qt_a_OBJECTS) $(qt_nyc3_qt_OBJECTS) : | $(QT_MOC) #Generating these with a half-written protobuf header leads to wacky results. #This makes sure it's done. $(QT_MOC): $(PROTOBUF_H) $(QT_MOC_CPP): $(PROTOBUF_H) -# bitcoin-qt binary # -qt_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +# nyc3-qt binary # +qt_nyc3_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) -qt_bitcoin_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_nyc3_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -qt_bitcoin_qt_SOURCES = qt/main.cpp +qt_nyc3_qt_SOURCES = qt/main.cpp if TARGET_WINDOWS - qt_bitcoin_qt_SOURCES += $(BITCOIN_RC) + qt_nyc3_qt_SOURCES += $(BITCOIN_RC) endif -qt_bitcoin_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) +qt_nyc3_qt_LDADD = qt/libnyc3qt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET) +qt_nyc3_qt_LDADD += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET) endif if ENABLE_ZMQ -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +qt_nyc3_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) endif -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \ +qt_nyc3_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) if ENABLE_BIP70 -qt_bitcoin_qt_LDADD += $(SSL_LIBS) +qt_nyc3_qt_LDADD += $(SSL_LIBS) else if TARGET_WINDOWS -qt_bitcoin_qt_LDADD += $(SSL_LIBS) +qt_nyc3_qt_LDADD += $(SSL_LIBS) endif endif -qt_bitcoin_qt_LDADD += $(CRYPTO_LIBS) -qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -qt_bitcoin_qt_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS) --tag CXX +qt_nyc3_qt_LDADD += $(CRYPTO_LIBS) +qt_nyc3_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_nyc3_qt_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS) --tag CXX #locale/foo.ts -> locale/foo.qm QT_QM=$(QT_TS:.ts=.qm) SECONDARY: $(QT_QM) -$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) $(libbitcoin_util_a_SOURCES) +$(srcdir)/qt/nyc3strings.cpp: $(libnyc3_server_a_SOURCES) $(libnyc3_wallet_a_SOURCES) $(libnyc3_common_a_SOURCES) $(libnyc3_zmq_a_SOURCES) $(libnyc3_consensus_a_SOURCES) $(libnyc3_util_a_SOURCES) @test -n $(XGETTEXT) || echo "xgettext is required for updating translations" $(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^ -translate: $(srcdir)/qt/bitcoinstrings.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) +translate: $(srcdir)/qt/nyc3strings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/nyc3.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) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/bitcoin_en.ts + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts $(srcdir)/qt/locale/nyc3_en.ts $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM) @test -f $(RCC) @cp -f $< $(@D)/temp_$( $@ @rm $(@D)/temp_$( $@ -CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc +CLEAN_QT = $(nodist_qt_libnyc3qt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_nyc3_locale.qrc CLEANFILES += $(CLEAN_QT) -bitcoin_qt_clean: FORCE - rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) qt/bitcoin-qt$(EXEEXT) $(LIBBITCOINQT) +nyc3_qt_clean: FORCE + rm -f $(CLEAN_QT) $(qt_libnyc3qt_a_OBJECTS) $(qt_nyc3_qt_OBJECTS) qt/nyc3-qt$(EXEEXT) $(LIBBITCOINQT) -bitcoin_qt : qt/bitcoin-qt$(EXEEXT) +nyc3_qt : qt/nyc3-qt$(EXEEXT) ui_%.h: %.ui @test -f $(UIC) diff --git a/src/bitcoin-cli-res.rc b/src/nyc3-cli-res.rc similarity index 100% rename from src/bitcoin-cli-res.rc rename to src/nyc3-cli-res.rc diff --git a/src/bitcoin-cli.cpp b/src/nyc3-cli.cpp similarity index 100% rename from src/bitcoin-cli.cpp rename to src/nyc3-cli.cpp diff --git a/src/bitcoin-tx-res.rc b/src/nyc3-tx-res.rc similarity index 100% rename from src/bitcoin-tx-res.rc rename to src/nyc3-tx-res.rc diff --git a/src/bitcoin-tx.cpp b/src/nyc3-tx.cpp similarity index 100% rename from src/bitcoin-tx.cpp rename to src/nyc3-tx.cpp diff --git a/src/bitcoin-wallet-res.rc b/src/nyc3-wallet-res.rc similarity index 100% rename from src/bitcoin-wallet-res.rc rename to src/nyc3-wallet-res.rc diff --git a/src/bitcoin-wallet.cpp b/src/nyc3-wallet.cpp similarity index 100% rename from src/bitcoin-wallet.cpp rename to src/nyc3-wallet.cpp diff --git a/src/bitcoind-res.rc b/src/nyc3d-res.rc similarity index 100% rename from src/bitcoind-res.rc rename to src/nyc3d-res.rc diff --git a/src/bitcoind.cpp b/src/nyc3d.cpp similarity index 100% rename from src/bitcoind.cpp rename to src/nyc3d.cpp diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 726dafccb..9b3cc3d19 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc deleted file mode 100644 index f195b23d8..000000000 --- a/src/qt/bitcoin_locale.qrc +++ /dev/null @@ -1,90 +0,0 @@ - - - locale/bitcoin_af.qm - locale/bitcoin_af_ZA.qm - locale/bitcoin_ar.qm - locale/bitcoin_be_BY.qm - locale/bitcoin_bg_BG.qm - locale/bitcoin_bg.qm - locale/bitcoin_ca_ES.qm - locale/bitcoin_ca.qm - locale/bitcoin_ca@valencia.qm - locale/bitcoin_cs.qm - locale/bitcoin_cy.qm - locale/bitcoin_da.qm - locale/bitcoin_de.qm - locale/bitcoin_el_GR.qm - locale/bitcoin_el.qm - locale/bitcoin_en_GB.qm - locale/bitcoin_en.qm - locale/bitcoin_eo.qm - locale/bitcoin_es_AR.qm - locale/bitcoin_es_CL.qm - locale/bitcoin_es_CO.qm - locale/bitcoin_es_DO.qm - locale/bitcoin_es_ES.qm - locale/bitcoin_es_MX.qm - locale/bitcoin_es.qm - locale/bitcoin_es_UY.qm - locale/bitcoin_es_VE.qm - locale/bitcoin_et_EE.qm - locale/bitcoin_et.qm - locale/bitcoin_eu_ES.qm - locale/bitcoin_fa_IR.qm - locale/bitcoin_fa.qm - locale/bitcoin_fi.qm - locale/bitcoin_fr_CA.qm - locale/bitcoin_fr_FR.qm - locale/bitcoin_fr.qm - locale/bitcoin_gl.qm - locale/bitcoin_he.qm - locale/bitcoin_hi_IN.qm - locale/bitcoin_hr.qm - locale/bitcoin_hu.qm - locale/bitcoin_id_ID.qm - locale/bitcoin_it_IT.qm - locale/bitcoin_it.qm - locale/bitcoin_ja.qm - locale/bitcoin_ka.qm - locale/bitcoin_kk_KZ.qm - locale/bitcoin_ko_KR.qm - locale/bitcoin_ku_IQ.qm - locale/bitcoin_ky.qm - locale/bitcoin_la.qm - locale/bitcoin_lt.qm - locale/bitcoin_lv_LV.qm - locale/bitcoin_mk_MK.qm - locale/bitcoin_mn.qm - locale/bitcoin_ms_MY.qm - locale/bitcoin_nb.qm - locale/bitcoin_ne.qm - locale/bitcoin_nl.qm - locale/bitcoin_pam.qm - locale/bitcoin_pl.qm - locale/bitcoin_pt_BR.qm - locale/bitcoin_pt_PT.qm - locale/bitcoin_ro_RO.qm - locale/bitcoin_ro.qm - locale/bitcoin_ru_RU.qm - locale/bitcoin_ru.qm - locale/bitcoin_sk.qm - locale/bitcoin_sl_SI.qm - locale/bitcoin_sq.qm - locale/bitcoin_sr@latin.qm - locale/bitcoin_sr.qm - locale/bitcoin_sv.qm - locale/bitcoin_ta.qm - locale/bitcoin_th_TH.qm - locale/bitcoin_tr_TR.qm - locale/bitcoin_tr.qm - locale/bitcoin_uk.qm - locale/bitcoin_ur_PK.qm - locale/bitcoin_uz@Cyrl.qm - locale/bitcoin_vi.qm - locale/bitcoin_vi_VN.qm - locale/bitcoin_zh_CN.qm - locale/bitcoin_zh_HK.qm - locale/bitcoin_zh.qm - locale/bitcoin_zh_TW.qm - - diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 0d9f1adcd..21dc39010 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui index 2f916d0b4..9aa815ff2 100644 --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -164,7 +164,7 @@ - + 0 @@ -351,9 +351,9 @@ - BitcoinAmountField + nyc3amountfield QLineEdit -
qt/bitcoinamountfield.h
+
qt/nyc3amountfield.h
1
diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 386d55928..44f3870b7 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -858,7 +858,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
- + @@ -1234,9 +1234,9 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
qt/qvalidatedlineedit.h
- BitcoinAmountField + nyc3amountfield QLineEdit -
qt/bitcoinamountfield.h
+
qt/nyc3amountfield.h
1
diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 3c699abc6..7ed8f0ac4 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -165,7 +165,7 @@ - + @@ -709,7 +709,7 @@ - + false @@ -1242,7 +1242,7 @@ - + false @@ -1258,9 +1258,9 @@
qt/qvalidatedlineedit.h
- BitcoinAmountField + nyc3amountfield QLineEdit -
qt/bitcoinamountfield.h
+
qt/nyc3amountfield.h
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index ba0a5abdf..f7bdd026a 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -4,8 +4,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/nyc3_af.ts similarity index 100% rename from src/qt/locale/bitcoin_af.ts rename to src/qt/locale/nyc3_af.ts diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/nyc3_af_ZA.ts similarity index 100% rename from src/qt/locale/bitcoin_af_ZA.ts rename to src/qt/locale/nyc3_af_ZA.ts diff --git a/src/qt/locale/bitcoin_am.ts b/src/qt/locale/nyc3_am.ts similarity index 100% rename from src/qt/locale/bitcoin_am.ts rename to src/qt/locale/nyc3_am.ts diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/nyc3_ar.ts similarity index 100% rename from src/qt/locale/bitcoin_ar.ts rename to src/qt/locale/nyc3_ar.ts diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/nyc3_be_BY.ts similarity index 100% rename from src/qt/locale/bitcoin_be_BY.ts rename to src/qt/locale/nyc3_be_BY.ts diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/nyc3_bg.ts similarity index 100% rename from src/qt/locale/bitcoin_bg.ts rename to src/qt/locale/nyc3_bg.ts diff --git a/src/qt/locale/bitcoin_bg_BG.ts b/src/qt/locale/nyc3_bg_BG.ts similarity index 100% rename from src/qt/locale/bitcoin_bg_BG.ts rename to src/qt/locale/nyc3_bg_BG.ts diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/nyc3_ca.ts similarity index 100% rename from src/qt/locale/bitcoin_ca.ts rename to src/qt/locale/nyc3_ca.ts diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/nyc3_ca@valencia.ts similarity index 100% rename from src/qt/locale/bitcoin_ca@valencia.ts rename to src/qt/locale/nyc3_ca@valencia.ts diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/nyc3_ca_ES.ts similarity index 100% rename from src/qt/locale/bitcoin_ca_ES.ts rename to src/qt/locale/nyc3_ca_ES.ts diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/nyc3_cs.ts similarity index 100% rename from src/qt/locale/bitcoin_cs.ts rename to src/qt/locale/nyc3_cs.ts diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/nyc3_cy.ts similarity index 100% rename from src/qt/locale/bitcoin_cy.ts rename to src/qt/locale/nyc3_cy.ts diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/nyc3_da.ts similarity index 100% rename from src/qt/locale/bitcoin_da.ts rename to src/qt/locale/nyc3_da.ts diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/nyc3_de.ts similarity index 100% rename from src/qt/locale/bitcoin_de.ts rename to src/qt/locale/nyc3_de.ts diff --git a/src/qt/locale/bitcoin_el.ts b/src/qt/locale/nyc3_el.ts similarity index 100% rename from src/qt/locale/bitcoin_el.ts rename to src/qt/locale/nyc3_el.ts diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/nyc3_el_GR.ts similarity index 100% rename from src/qt/locale/bitcoin_el_GR.ts rename to src/qt/locale/nyc3_el_GR.ts diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/nyc3_en.ts similarity index 100% rename from src/qt/locale/bitcoin_en.ts rename to src/qt/locale/nyc3_en.ts diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/nyc3_en_GB.ts similarity index 100% rename from src/qt/locale/bitcoin_en_GB.ts rename to src/qt/locale/nyc3_en_GB.ts diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/nyc3_eo.ts similarity index 100% rename from src/qt/locale/bitcoin_eo.ts rename to src/qt/locale/nyc3_eo.ts diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/nyc3_es.ts similarity index 100% rename from src/qt/locale/bitcoin_es.ts rename to src/qt/locale/nyc3_es.ts diff --git a/src/qt/locale/bitcoin_es_AR.ts b/src/qt/locale/nyc3_es_AR.ts similarity index 100% rename from src/qt/locale/bitcoin_es_AR.ts rename to src/qt/locale/nyc3_es_AR.ts diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/nyc3_es_CL.ts similarity index 100% rename from src/qt/locale/bitcoin_es_CL.ts rename to src/qt/locale/nyc3_es_CL.ts diff --git a/src/qt/locale/bitcoin_es_CO.ts b/src/qt/locale/nyc3_es_CO.ts similarity index 100% rename from src/qt/locale/bitcoin_es_CO.ts rename to src/qt/locale/nyc3_es_CO.ts diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/nyc3_es_DO.ts similarity index 100% rename from src/qt/locale/bitcoin_es_DO.ts rename to src/qt/locale/nyc3_es_DO.ts diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/nyc3_es_ES.ts similarity index 100% rename from src/qt/locale/bitcoin_es_ES.ts rename to src/qt/locale/nyc3_es_ES.ts diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/nyc3_es_MX.ts similarity index 100% rename from src/qt/locale/bitcoin_es_MX.ts rename to src/qt/locale/nyc3_es_MX.ts diff --git a/src/qt/locale/bitcoin_es_UY.ts b/src/qt/locale/nyc3_es_UY.ts similarity index 100% rename from src/qt/locale/bitcoin_es_UY.ts rename to src/qt/locale/nyc3_es_UY.ts diff --git a/src/qt/locale/bitcoin_es_VE.ts b/src/qt/locale/nyc3_es_VE.ts similarity index 100% rename from src/qt/locale/bitcoin_es_VE.ts rename to src/qt/locale/nyc3_es_VE.ts diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/nyc3_et.ts similarity index 100% rename from src/qt/locale/bitcoin_et.ts rename to src/qt/locale/nyc3_et.ts diff --git a/src/qt/locale/bitcoin_et_EE.ts b/src/qt/locale/nyc3_et_EE.ts similarity index 100% rename from src/qt/locale/bitcoin_et_EE.ts rename to src/qt/locale/nyc3_et_EE.ts diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/nyc3_eu_ES.ts similarity index 100% rename from src/qt/locale/bitcoin_eu_ES.ts rename to src/qt/locale/nyc3_eu_ES.ts diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/nyc3_fa.ts similarity index 100% rename from src/qt/locale/bitcoin_fa.ts rename to src/qt/locale/nyc3_fa.ts diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/nyc3_fa_IR.ts similarity index 100% rename from src/qt/locale/bitcoin_fa_IR.ts rename to src/qt/locale/nyc3_fa_IR.ts diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/nyc3_fi.ts similarity index 100% rename from src/qt/locale/bitcoin_fi.ts rename to src/qt/locale/nyc3_fi.ts diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/nyc3_fr.ts similarity index 100% rename from src/qt/locale/bitcoin_fr.ts rename to src/qt/locale/nyc3_fr.ts diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/nyc3_fr_CA.ts similarity index 100% rename from src/qt/locale/bitcoin_fr_CA.ts rename to src/qt/locale/nyc3_fr_CA.ts diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/nyc3_fr_FR.ts similarity index 100% rename from src/qt/locale/bitcoin_fr_FR.ts rename to src/qt/locale/nyc3_fr_FR.ts diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/nyc3_gl.ts similarity index 100% rename from src/qt/locale/bitcoin_gl.ts rename to src/qt/locale/nyc3_gl.ts diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/nyc3_he.ts similarity index 100% rename from src/qt/locale/bitcoin_he.ts rename to src/qt/locale/nyc3_he.ts diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/nyc3_hi_IN.ts similarity index 100% rename from src/qt/locale/bitcoin_hi_IN.ts rename to src/qt/locale/nyc3_hi_IN.ts diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/nyc3_hr.ts similarity index 100% rename from src/qt/locale/bitcoin_hr.ts rename to src/qt/locale/nyc3_hr.ts diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/nyc3_hu.ts similarity index 100% rename from src/qt/locale/bitcoin_hu.ts rename to src/qt/locale/nyc3_hu.ts diff --git a/src/qt/locale/bitcoin_id.ts b/src/qt/locale/nyc3_id.ts similarity index 100% rename from src/qt/locale/bitcoin_id.ts rename to src/qt/locale/nyc3_id.ts diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/nyc3_id_ID.ts similarity index 100% rename from src/qt/locale/bitcoin_id_ID.ts rename to src/qt/locale/nyc3_id_ID.ts diff --git a/src/qt/locale/bitcoin_is.ts b/src/qt/locale/nyc3_is.ts similarity index 100% rename from src/qt/locale/bitcoin_is.ts rename to src/qt/locale/nyc3_is.ts diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/nyc3_it.ts similarity index 100% rename from src/qt/locale/bitcoin_it.ts rename to src/qt/locale/nyc3_it.ts diff --git a/src/qt/locale/bitcoin_it_IT.ts b/src/qt/locale/nyc3_it_IT.ts similarity index 100% rename from src/qt/locale/bitcoin_it_IT.ts rename to src/qt/locale/nyc3_it_IT.ts diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/nyc3_ja.ts similarity index 100% rename from src/qt/locale/bitcoin_ja.ts rename to src/qt/locale/nyc3_ja.ts diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/nyc3_ka.ts similarity index 100% rename from src/qt/locale/bitcoin_ka.ts rename to src/qt/locale/nyc3_ka.ts diff --git a/src/qt/locale/bitcoin_kk_KZ.ts b/src/qt/locale/nyc3_kk_KZ.ts similarity index 100% rename from src/qt/locale/bitcoin_kk_KZ.ts rename to src/qt/locale/nyc3_kk_KZ.ts diff --git a/src/qt/locale/bitcoin_ko.ts b/src/qt/locale/nyc3_ko.ts similarity index 100% rename from src/qt/locale/bitcoin_ko.ts rename to src/qt/locale/nyc3_ko.ts diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/nyc3_ko_KR.ts similarity index 100% rename from src/qt/locale/bitcoin_ko_KR.ts rename to src/qt/locale/nyc3_ko_KR.ts diff --git a/src/qt/locale/bitcoin_ku_IQ.ts b/src/qt/locale/nyc3_ku_IQ.ts similarity index 100% rename from src/qt/locale/bitcoin_ku_IQ.ts rename to src/qt/locale/nyc3_ku_IQ.ts diff --git a/src/qt/locale/bitcoin_ky.ts b/src/qt/locale/nyc3_ky.ts similarity index 100% rename from src/qt/locale/bitcoin_ky.ts rename to src/qt/locale/nyc3_ky.ts diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/nyc3_la.ts similarity index 100% rename from src/qt/locale/bitcoin_la.ts rename to src/qt/locale/nyc3_la.ts diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/nyc3_lt.ts similarity index 100% rename from src/qt/locale/bitcoin_lt.ts rename to src/qt/locale/nyc3_lt.ts diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/nyc3_lv_LV.ts similarity index 100% rename from src/qt/locale/bitcoin_lv_LV.ts rename to src/qt/locale/nyc3_lv_LV.ts diff --git a/src/qt/locale/bitcoin_mk_MK.ts b/src/qt/locale/nyc3_mk_MK.ts similarity index 100% rename from src/qt/locale/bitcoin_mk_MK.ts rename to src/qt/locale/nyc3_mk_MK.ts diff --git a/src/qt/locale/bitcoin_ml.ts b/src/qt/locale/nyc3_ml.ts similarity index 100% rename from src/qt/locale/bitcoin_ml.ts rename to src/qt/locale/nyc3_ml.ts diff --git a/src/qt/locale/bitcoin_mn.ts b/src/qt/locale/nyc3_mn.ts similarity index 100% rename from src/qt/locale/bitcoin_mn.ts rename to src/qt/locale/nyc3_mn.ts diff --git a/src/qt/locale/bitcoin_ms_MY.ts b/src/qt/locale/nyc3_ms_MY.ts similarity index 100% rename from src/qt/locale/bitcoin_ms_MY.ts rename to src/qt/locale/nyc3_ms_MY.ts diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/nyc3_nb.ts similarity index 100% rename from src/qt/locale/bitcoin_nb.ts rename to src/qt/locale/nyc3_nb.ts diff --git a/src/qt/locale/bitcoin_ne.ts b/src/qt/locale/nyc3_ne.ts similarity index 100% rename from src/qt/locale/bitcoin_ne.ts rename to src/qt/locale/nyc3_ne.ts diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/nyc3_nl.ts similarity index 100% rename from src/qt/locale/bitcoin_nl.ts rename to src/qt/locale/nyc3_nl.ts diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/nyc3_pam.ts similarity index 100% rename from src/qt/locale/bitcoin_pam.ts rename to src/qt/locale/nyc3_pam.ts diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/nyc3_pl.ts similarity index 100% rename from src/qt/locale/bitcoin_pl.ts rename to src/qt/locale/nyc3_pl.ts diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/nyc3_pt_BR.ts similarity index 100% rename from src/qt/locale/bitcoin_pt_BR.ts rename to src/qt/locale/nyc3_pt_BR.ts diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/nyc3_pt_PT.ts similarity index 100% rename from src/qt/locale/bitcoin_pt_PT.ts rename to src/qt/locale/nyc3_pt_PT.ts diff --git a/src/qt/locale/bitcoin_ro.ts b/src/qt/locale/nyc3_ro.ts similarity index 100% rename from src/qt/locale/bitcoin_ro.ts rename to src/qt/locale/nyc3_ro.ts diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/nyc3_ro_RO.ts similarity index 100% rename from src/qt/locale/bitcoin_ro_RO.ts rename to src/qt/locale/nyc3_ro_RO.ts diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/nyc3_ru.ts similarity index 100% rename from src/qt/locale/bitcoin_ru.ts rename to src/qt/locale/nyc3_ru.ts diff --git a/src/qt/locale/bitcoin_ru_RU.ts b/src/qt/locale/nyc3_ru_RU.ts similarity index 100% rename from src/qt/locale/bitcoin_ru_RU.ts rename to src/qt/locale/nyc3_ru_RU.ts diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/nyc3_sk.ts similarity index 100% rename from src/qt/locale/bitcoin_sk.ts rename to src/qt/locale/nyc3_sk.ts diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/nyc3_sl_SI.ts similarity index 100% rename from src/qt/locale/bitcoin_sl_SI.ts rename to src/qt/locale/nyc3_sl_SI.ts diff --git a/src/qt/locale/bitcoin_sn.ts b/src/qt/locale/nyc3_sn.ts similarity index 100% rename from src/qt/locale/bitcoin_sn.ts rename to src/qt/locale/nyc3_sn.ts diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/nyc3_sq.ts similarity index 100% rename from src/qt/locale/bitcoin_sq.ts rename to src/qt/locale/nyc3_sq.ts diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/nyc3_sr.ts similarity index 100% rename from src/qt/locale/bitcoin_sr.ts rename to src/qt/locale/nyc3_sr.ts diff --git a/src/qt/locale/bitcoin_sr@latin.ts b/src/qt/locale/nyc3_sr@latin.ts similarity index 100% rename from src/qt/locale/bitcoin_sr@latin.ts rename to src/qt/locale/nyc3_sr@latin.ts diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/nyc3_sv.ts similarity index 100% rename from src/qt/locale/bitcoin_sv.ts rename to src/qt/locale/nyc3_sv.ts diff --git a/src/qt/locale/bitcoin_szl.ts b/src/qt/locale/nyc3_szl.ts similarity index 100% rename from src/qt/locale/bitcoin_szl.ts rename to src/qt/locale/nyc3_szl.ts diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/nyc3_ta.ts similarity index 100% rename from src/qt/locale/bitcoin_ta.ts rename to src/qt/locale/nyc3_ta.ts diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/nyc3_th_TH.ts similarity index 100% rename from src/qt/locale/bitcoin_th_TH.ts rename to src/qt/locale/nyc3_th_TH.ts diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/nyc3_tr.ts similarity index 100% rename from src/qt/locale/bitcoin_tr.ts rename to src/qt/locale/nyc3_tr.ts diff --git a/src/qt/locale/bitcoin_tr_TR.ts b/src/qt/locale/nyc3_tr_TR.ts similarity index 100% rename from src/qt/locale/bitcoin_tr_TR.ts rename to src/qt/locale/nyc3_tr_TR.ts diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/nyc3_uk.ts similarity index 100% rename from src/qt/locale/bitcoin_uk.ts rename to src/qt/locale/nyc3_uk.ts diff --git a/src/qt/locale/bitcoin_ur_PK.ts b/src/qt/locale/nyc3_ur_PK.ts similarity index 100% rename from src/qt/locale/bitcoin_ur_PK.ts rename to src/qt/locale/nyc3_ur_PK.ts diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/nyc3_uz@Cyrl.ts similarity index 100% rename from src/qt/locale/bitcoin_uz@Cyrl.ts rename to src/qt/locale/nyc3_uz@Cyrl.ts diff --git a/src/qt/locale/bitcoin_vi.ts b/src/qt/locale/nyc3_vi.ts similarity index 100% rename from src/qt/locale/bitcoin_vi.ts rename to src/qt/locale/nyc3_vi.ts diff --git a/src/qt/locale/bitcoin_vi_VN.ts b/src/qt/locale/nyc3_vi_VN.ts similarity index 100% rename from src/qt/locale/bitcoin_vi_VN.ts rename to src/qt/locale/nyc3_vi_VN.ts diff --git a/src/qt/locale/bitcoin_zh.ts b/src/qt/locale/nyc3_zh.ts similarity index 100% rename from src/qt/locale/bitcoin_zh.ts rename to src/qt/locale/nyc3_zh.ts diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/nyc3_zh_CN.ts similarity index 100% rename from src/qt/locale/bitcoin_zh_CN.ts rename to src/qt/locale/nyc3_zh_CN.ts diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/nyc3_zh_HK.ts similarity index 100% rename from src/qt/locale/bitcoin_zh_HK.ts rename to src/qt/locale/nyc3_zh_HK.ts diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/nyc3_zh_TW.ts similarity index 100% rename from src/qt/locale/bitcoin_zh_TW.ts rename to src/qt/locale/nyc3_zh_TW.ts diff --git a/src/qt/main.cpp b/src/qt/main.cpp index 6a3c2249d..f0fa1bc46 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/bitcoin.cpp b/src/qt/nyc3.cpp similarity index 99% rename from src/qt/bitcoin.cpp rename to src/qt/nyc3.cpp index 1b063771e..ad76f8bba 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/nyc3.cpp @@ -6,8 +6,8 @@ #include #endif -#include -#include +#include +#include #include #include @@ -434,8 +434,8 @@ int GuiMain(int argc, char* argv[]) // Do not refer to data directory yet, this can be overridden by Intro::pickDataDirectory /// 1. Basic Qt initialization (not dependent on parameters or configuration) - Q_INIT_RESOURCE(bitcoin); - Q_INIT_RESOURCE(bitcoin_locale); + Q_INIT_RESOURCE(nyc3); + Q_INIT_RESOURCE(nyc3_locale); BitcoinApplication app(*node, argc, argv); // Generate high-dpi pixmaps diff --git a/src/qt/bitcoin.h b/src/qt/nyc3.h similarity index 100% rename from src/qt/bitcoin.h rename to src/qt/nyc3.h diff --git a/src/qt/bitcoin.qrc b/src/qt/nyc3.qrc similarity index 99% rename from src/qt/bitcoin.qrc rename to src/qt/nyc3.qrc index fddc2a568..d6bbd03d9 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/nyc3.qrc @@ -1,6 +1,6 @@ - res/icons/bitcoin.png + res/icons/nyc3.png res/icons/address-book.png res/icons/quit.png res/icons/send.png diff --git a/src/qt/nyc3_locale.qrc b/src/qt/nyc3_locale.qrc new file mode 100644 index 000000000..ec94401f0 --- /dev/null +++ b/src/qt/nyc3_locale.qrc @@ -0,0 +1,90 @@ + + + locale/nyc3_af.qm + locale/nyc3_af_ZA.qm + locale/nyc3_ar.qm + locale/nyc3_be_BY.qm + locale/nyc3_bg_BG.qm + locale/nyc3_bg.qm + locale/nyc3_ca_ES.qm + locale/nyc3_ca.qm + locale/nyc3_ca@valencia.qm + locale/nyc3_cs.qm + locale/nyc3_cy.qm + locale/nyc3_da.qm + locale/nyc3_de.qm + locale/nyc3_el_GR.qm + locale/nyc3_el.qm + locale/nyc3_en_GB.qm + locale/nyc3_en.qm + locale/nyc3_eo.qm + locale/nyc3_es_AR.qm + locale/nyc3_es_CL.qm + locale/nyc3_es_CO.qm + locale/nyc3_es_DO.qm + locale/nyc3_es_ES.qm + locale/nyc3_es_MX.qm + locale/nyc3_es.qm + locale/nyc3_es_UY.qm + locale/nyc3_es_VE.qm + locale/nyc3_et_EE.qm + locale/nyc3_et.qm + locale/nyc3_eu_ES.qm + locale/nyc3_fa_IR.qm + locale/nyc3_fa.qm + locale/nyc3_fi.qm + locale/nyc3_fr_CA.qm + locale/nyc3_fr_FR.qm + locale/nyc3_fr.qm + locale/nyc3_gl.qm + locale/nyc3_he.qm + locale/nyc3_hi_IN.qm + locale/nyc3_hr.qm + locale/nyc3_hu.qm + locale/nyc3_id_ID.qm + locale/nyc3_it_IT.qm + locale/nyc3_it.qm + locale/nyc3_ja.qm + locale/nyc3_ka.qm + locale/nyc3_kk_KZ.qm + locale/nyc3_ko_KR.qm + locale/nyc3_ku_IQ.qm + locale/nyc3_ky.qm + locale/nyc3_la.qm + locale/nyc3_lt.qm + locale/nyc3_lv_LV.qm + locale/nyc3_mk_MK.qm + locale/nyc3_mn.qm + locale/nyc3_ms_MY.qm + locale/nyc3_nb.qm + locale/nyc3_ne.qm + locale/nyc3_nl.qm + locale/nyc3_pam.qm + locale/nyc3_pl.qm + locale/nyc3_pt_BR.qm + locale/nyc3_pt_PT.qm + locale/nyc3_ro_RO.qm + locale/nyc3_ro.qm + locale/nyc3_ru_RU.qm + locale/nyc3_ru.qm + locale/nyc3_sk.qm + locale/nyc3_sl_SI.qm + locale/nyc3_sq.qm + locale/nyc3_sr@latin.qm + locale/nyc3_sr.qm + locale/nyc3_sv.qm + locale/nyc3_ta.qm + locale/nyc3_th_TH.qm + locale/nyc3_tr_TR.qm + locale/nyc3_tr.qm + locale/nyc3_uk.qm + locale/nyc3_ur_PK.qm + locale/nyc3_uz@Cyrl.qm + locale/nyc3_vi.qm + locale/nyc3_vi_VN.qm + locale/nyc3_zh_CN.qm + locale/nyc3_zh_HK.qm + locale/nyc3_zh.qm + locale/nyc3_zh_TW.qm + + diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/nyc3addressvalidator.cpp similarity index 98% rename from src/qt/bitcoinaddressvalidator.cpp rename to src/qt/nyc3addressvalidator.cpp index a2adca6ea..d78353b06 100644 --- a/src/qt/bitcoinaddressvalidator.cpp +++ b/src/qt/nyc3addressvalidator.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/bitcoinaddressvalidator.h b/src/qt/nyc3addressvalidator.h similarity index 85% rename from src/qt/bitcoinaddressvalidator.h rename to src/qt/nyc3addressvalidator.h index 30d4a26d0..2a2565803 100644 --- a/src/qt/bitcoinaddressvalidator.h +++ b/src/qt/nyc3addressvalidator.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_QT_BITCOINADDRESSVALIDATOR_H -#define BITCOIN_QT_BITCOINADDRESSVALIDATOR_H +#ifndef BITCOIN_QT_nyc3addressvalidator_H +#define BITCOIN_QT_nyc3addressvalidator_H #include @@ -32,4 +32,4 @@ public: State validate(QString &input, int &pos) const; }; -#endif // BITCOIN_QT_BITCOINADDRESSVALIDATOR_H +#endif // BITCOIN_QT_nyc3addressvalidator_H diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/nyc3amountfield.cpp similarity index 87% rename from src/qt/bitcoinamountfield.cpp rename to src/qt/nyc3amountfield.cpp index 5854ade65..7a8fd42ed 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/nyc3amountfield.cpp @@ -2,9 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include +#include -#include +#include #include #include @@ -212,9 +212,9 @@ Q_SIGNALS: void valueChanged(); }; -#include +#include -BitcoinAmountField::BitcoinAmountField(QWidget *parent) : +nyc3amountfield::nyc3amountfield(QWidget *parent) : QWidget(parent), amount(nullptr) { @@ -237,26 +237,26 @@ BitcoinAmountField::BitcoinAmountField(QWidget *parent) : setFocusProxy(amount); // If one if the widgets changes, the combined content changes as well - connect(amount, &AmountSpinBox::valueChanged, this, &BitcoinAmountField::valueChanged); - connect(unit, static_cast(&QComboBox::currentIndexChanged), this, &BitcoinAmountField::unitChanged); + connect(amount, &AmountSpinBox::valueChanged, this, &nyc3amountfield::valueChanged); + connect(unit, static_cast(&QComboBox::currentIndexChanged), this, &nyc3amountfield::unitChanged); // Set default based on configuration unitChanged(unit->currentIndex()); } -void BitcoinAmountField::clear() +void nyc3amountfield::clear() { amount->clear(); unit->setCurrentIndex(0); } -void BitcoinAmountField::setEnabled(bool fEnabled) +void nyc3amountfield::setEnabled(bool fEnabled) { amount->setEnabled(fEnabled); unit->setEnabled(fEnabled); } -bool BitcoinAmountField::validate() +bool nyc3amountfield::validate() { bool valid = false; value(&valid); @@ -264,7 +264,7 @@ bool BitcoinAmountField::validate() return valid; } -void BitcoinAmountField::setValid(bool valid) +void nyc3amountfield::setValid(bool valid) { if (valid) amount->setStyleSheet(""); @@ -272,7 +272,7 @@ void BitcoinAmountField::setValid(bool valid) amount->setStyleSheet(STYLE_INVALID); } -bool BitcoinAmountField::eventFilter(QObject *object, QEvent *event) +bool nyc3amountfield::eventFilter(QObject *object, QEvent *event) { if (event->type() == QEvent::FocusIn) { @@ -282,44 +282,44 @@ bool BitcoinAmountField::eventFilter(QObject *object, QEvent *event) return QWidget::eventFilter(object, event); } -QWidget *BitcoinAmountField::setupTabChain(QWidget *prev) +QWidget *nyc3amountfield::setupTabChain(QWidget *prev) { QWidget::setTabOrder(prev, amount); QWidget::setTabOrder(amount, unit); return unit; } -CAmount BitcoinAmountField::value(bool *valid_out) const +CAmount nyc3amountfield::value(bool *valid_out) const { return amount->value(valid_out); } -void BitcoinAmountField::setValue(const CAmount& value) +void nyc3amountfield::setValue(const CAmount& value) { amount->setValue(value); } -void BitcoinAmountField::SetAllowEmpty(bool allow) +void nyc3amountfield::SetAllowEmpty(bool allow) { amount->SetAllowEmpty(allow); } -void BitcoinAmountField::SetMinValue(const CAmount& value) +void nyc3amountfield::SetMinValue(const CAmount& value) { amount->SetMinValue(value); } -void BitcoinAmountField::SetMaxValue(const CAmount& value) +void nyc3amountfield::SetMaxValue(const CAmount& value) { amount->SetMaxValue(value); } -void BitcoinAmountField::setReadOnly(bool fReadOnly) +void nyc3amountfield::setReadOnly(bool fReadOnly) { amount->setReadOnly(fReadOnly); } -void BitcoinAmountField::unitChanged(int idx) +void nyc3amountfield::unitChanged(int idx) { // Use description tooltip for current unit for the combobox unit->setToolTip(unit->itemData(idx, Qt::ToolTipRole).toString()); @@ -330,12 +330,12 @@ void BitcoinAmountField::unitChanged(int idx) amount->setDisplayUnit(newUnit); } -void BitcoinAmountField::setDisplayUnit(int newUnit) +void nyc3amountfield::setDisplayUnit(int newUnit) { unit->setValue(newUnit); } -void BitcoinAmountField::setSingleStep(const CAmount& step) +void nyc3amountfield::setSingleStep(const CAmount& step) { amount->setSingleStep(step); } diff --git a/src/qt/bitcoinamountfield.h b/src/qt/nyc3amountfield.h similarity index 90% rename from src/qt/bitcoinamountfield.h rename to src/qt/nyc3amountfield.h index 2db6b65f2..ef7cf879e 100644 --- a/src/qt/bitcoinamountfield.h +++ b/src/qt/nyc3amountfield.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_QT_BITCOINAMOUNTFIELD_H -#define BITCOIN_QT_BITCOINAMOUNTFIELD_H +#ifndef BITCOIN_QT_nyc3amountfield_H +#define BITCOIN_QT_nyc3amountfield_H #include @@ -17,7 +17,7 @@ QT_END_NAMESPACE /** Widget for entering bitcoin amounts. */ -class BitcoinAmountField: public QWidget +class nyc3amountfield: public QWidget { Q_OBJECT @@ -26,7 +26,7 @@ class BitcoinAmountField: public QWidget Q_PROPERTY(qint64 value READ value WRITE setValue NOTIFY valueChanged USER true) public: - explicit BitcoinAmountField(QWidget *parent = nullptr); + explicit nyc3amountfield(QWidget *parent = nullptr); CAmount value(bool *value=nullptr) const; void setValue(const CAmount& value); @@ -81,4 +81,4 @@ private Q_SLOTS: }; -#endif // BITCOIN_QT_BITCOINAMOUNTFIELD_H +#endif // BITCOIN_QT_nyc3amountfield_H diff --git a/src/qt/bitcoingui.cpp b/src/qt/nyc3gui.cpp similarity index 99% rename from src/qt/bitcoingui.cpp rename to src/qt/nyc3gui.cpp index abf9136ee..9675ac4a7 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/nyc3gui.cpp @@ -2,9 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include +#include -#include +#include #include #include #include diff --git a/src/qt/bitcoingui.h b/src/qt/nyc3gui.h similarity index 100% rename from src/qt/bitcoingui.h rename to src/qt/nyc3gui.h diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/nyc3strings.cpp similarity index 100% rename from src/qt/bitcoinstrings.cpp rename to src/qt/nyc3strings.cpp diff --git a/src/qt/bitcoinunits.cpp b/src/qt/nyc3units.cpp similarity index 99% rename from src/qt/bitcoinunits.cpp rename to src/qt/nyc3units.cpp index 8aa1fdba4..8855bba20 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/nyc3units.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/bitcoinunits.h b/src/qt/nyc3units.h similarity index 100% rename from src/qt/bitcoinunits.h rename to src/qt/nyc3units.h diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 40dc7bf40..2d140abf2 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 62496a57f..fb6a0266b 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include #include diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index d8e48f350..85dd1edf1 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 43dccec4e..48163ebe9 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include #include diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp index aa936d6b7..e3ad0bb6e 100644 --- a/src/qt/qvalidatedlineedit.cpp +++ b/src/qt/qvalidatedlineedit.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include QValidatedLineEdit::QValidatedLineEdit(QWidget *parent) : diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp index 22a79a12b..261fa9bb3 100644 --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index f5b30cf6d..d4397afc0 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index aa746017f..5d88f2b6d 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include #include diff --git a/src/qt/res/icons/connect0.png b/src/qt/res/icons/connect0.png index ef708d81fb24ad0272de7cc4afcca7caf18aef13..04d0171a5d4de9f4894f32226dc57b57e5e0f7c7 100644 GIT binary patch literal 3477 zcmeAS@N?(olHy`uVBq!ia0vp^azHG@!3HGDe(d~O4SqO|KE}8``y1}DCjUFO2 z3p`!@T-G@yGywoV CxD_e@ literal 2446 zcmV;9332v`P)L);9_kbFb_CBqs|}S1de!+o!hnpqcRHJF~1Em{|T%EUIyN2tEx1Sd}Gil|(*}&Dn&A=Uw?OsLFYI$p;;7e-x*bG#6Hli;9o{&$tIc7Ty42)^d z1C|HaDKG|jH2}%E?a=^soeUhx>9Yaom1d&50`~*Q0+ZbgObTSnVI#JnJlQy!;fE5<9*CmYT7K~PQ zE=?QZw_C_w3Uo`Ty;mw*=ckG6-oPGp1J4y$E1xUF%PJYq|KQpB2eSEx%HCONBK#g@ z{9nm;gMJ2B6JV8cOCXy!seZqZ7P5N+A1ULfs^3&$#DEaX!VM*uFtj6)G1&6fHUPIed{zJ>$=CNj6nAA>2nXmR!+|f+2Qd1l^RTv7b+AWfdtV2W z?&pz|5#EAJ#WPvV4g7C$PWAQaT#tv1z(o-a?WNYDAIo??!Lg0Qs4it4On3`U17-@T zb-+`=Vj0875>bv@6WI9ki7ycBqqRQRQG^FaFIoq+>;ozS^!uy8JHWlNd`msyS1H4v z2-NR%!b@P=f$PO9I3ulu&r^n98>rt3@$~t$8hPLwA`D4CNekikDZ|Gn#ID&gjQ9*W zsSs`npKZU9EywA5HXOaR#} z?W!aaK1!{7j}hIUU5QE0$n`j0gi)>wwcnJG@VXehl!*gxF7TvG=<6}==o(CDbYz8V zxia(+FeL)nZ>WA27dfY^8qz|yz4)uV=NiJFguGKg+?6bI8xpX~u}l-vYh}oPr5^ z_?-C2SCXG%(hO|HC`Zm10Q@@Q&27dAtv=T(HQ~kF&Alwc;rqbl4)&jgiPzEBT(8{8 zPMCr{CcBX9^tK3oj8adUdmJXs8g52e0_osE} z;6aRxnR>!?Y~kJjgg0VJ=*7XZ5D)Q_G9k^!1nImWK8hun>N`~lAbf$iPRC;8!Rv6V zAaRG9AJ!8+rF=U1Qsucm9h@V?9(H&;-YCH;p}pe6wezel!qRdI`Gv-wbUnE@raDej zgwOJq7)O1Y2p>eg`0x@Y7{3^LV$u~gS37W2euj$sHO^T0KBnMTS_lV|fvlIFhcG(j zd6u2)U`(Q}EeWgMbtoBv(JyVv^a|kXa`6F}#L)?uq|&X}i!2U}K|ohp%UAEH&2O>^9c>^_ap6Zx@-M_uv?xsdIC3Q>lwpI_o0KG;PR6BFIbv9fG$;9oLmK?+i4I zU5;JbbZHxXUa}?R%lsWGARGlKg)UaCVvqpF?Tnpn>>HTx&4S`We_`5-Z3L*r_9BSfp-XVnXe# zB)`_|VHwX;g*tT;BNJ%j=dp)T%p`?)P~F711le{5Cfdv9)2Sh)_`bT4X@UCfDQ;4q zHbdr=TG>Vynot*#;(uPG*US$G>i06jD>8>Me(qGGQZ2J~0iOua@6!Q^J_bBbC;BHA zx?J7dnEjpZ;fE+zA+9!|6L~CXSLcBkn~CEvAWnA{W{ zo9A1hvI{2iN&i2b3{s)8$knEHwRK;g4MkKYxR}8|aK3aS@ zLUL-aBpSD3&&+Dk_%>q%)>kQ9RPiVYO}S1gCXrv2-nH!}dI`S&YgAyOJ{uf~Zo&u| zr)1Q{Lm!Ml{JczpxqgjC;B`zy)}V~4(x4m@;8KxMks(8d3>}950R?web}lE~oB#j- M07*qoM6N<$f@Axji2wiq diff --git a/src/qt/res/icons/connect1.png b/src/qt/res/icons/connect1.png index ed358e6f8ef40b106cba3201859108a98a8d384f..3ca5c38b1c5323e4ad6d065176464e9124ac753f 100644 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^azHG@!3-oF)&9>0Qc(duA+A7L&BUG-$a%*S5(`Y156BM^I4P_GntEkrZafD`njxgN@xNALkChw literal 2163 zcmV-(2#oiMP)7P{5N*5CNkUu|W`ocyJ#A3W6Aw2*GGHLhbr?C$LA?#q6Y`D@?K{N}s6Grw~lga{EL zM2I9K1855j2POco0YiaYAUmYT9NGbkfI^@&PP+nZ1fBsZhLkx&JzynJQU=jh?JuBD zNS{4)2Ts}~T5a>fw_OkYhx$d0sCKw3y`Eb1CqM&h+MLwaMe z%p;?YOXeAyJUJ9&8C8C?lH}s;%q`7IuK<%ItT??3R zP^<8|Jr{Hf@Mu7Yj%I6X&+zy-xDA|#g9u%_Efc$`y zeJ)6E_way|T`FIgKp+b^k^+Rk7Zkz=qyX8aK$oBpzB&cSK7k0+X(Juz1k3<70lTGl z?KrRl_z)4}t7@3+bl|Lm37(Nw=vZJ>g7z#>;4$H2bSIo41=6+Z3W4bciErXya(jXL zHpdz1A=!I$-|oBQkDUy16zFJx@U9NV?&?tOT;q`{*jh(`9wd%bA5Gx2zYIL#lJGtb ze9x6!xOaCN_7G|Xlyl;k&wCL$8O?zTQNOlNG^-8tOM2m}ax($p^mO!IBgh!sjZ2Kj;&=7CA6B1_XidrHbJ9l(RgUQk8VN zv@CO?H6#{;u`En!rLl(Z;1b$dD>TlKQdPH;~}Wl1yL z3bCK{lqQvjKQ;QlBp*O?CtAfJ3u9s$BG8ZsIlw;U{{0&FHcY~@QpW}lO@Lo;mOuEe zU3Ii=94}n~FjHEgwdALki72NS9%o4?l>H^beMum^jpqD21E*b%^^;wtqXQyRlgNxN z>-t&XAQAvBEA6PvEjK_Wzt{*ndJmsF>Y_9w1h(sxM z>?uw)m?rYG`Uv<25njp%z5u2IkKiu<*~^r+b%+3Yyw+A~8j;^0l>3wkztjap?Y{3Y z%twY&u8Vo313xPL&GjSUnTVRn@+NzWfw^>0jL75ov;=&R4+tM&Xf8i1{dUBsSZI*E zBfwWSTP;KLn54)u)~|$DmY=m-vbR#cQJ-FlJX7&8Dj{;toszvAxUQV%pc-=v2>=FT zFLHkZ7~&Jza~0WU5)hnIT*iq=KPkPQvw&9}G*hSej8WuzIf#TG1a6kju6cM$DRhJUEQRRcxc=+Fhbpo0$&f9Y}1bvYnj{T1jGcj?CC5 zA4+)=ZpwMK#DUkdr{V-FMZ`h1Pz{ktQ|#cg{1S6V4ke55M#KgmHUYP2+?$0sy-nrn zD4LOCY+BB>FHSdqF$u)y%?jbLvuTtSn1~a#Oldqt%nk)^TFv zlB(-;hw>XQRMR?$g5b}AWAXu%Ncpw{bL8@oVYlPOitsC43fkYW1^A-HUK4$NUlNTm z*U_7bTzi05k;}~vM553RLu6Z>rlXdlyhDJHqX@sjP`~3{5?vrIK@}|(?WNd|3Ys)b zz?*PTL+ppR)+3ztgRss?%qBKrX9)qrEM)@Sd@5&k;Cn^Zi*h{=6qYEHXz4>4TVtI@ zF_-{io-&EfK9a2kBHPQ#r;|rO@wzgR{)YO^l5SEvZIIkk=14O--iA7Z039uwNM~MT zsNcshACb9;@N)+m)fF|X05fR@D-04{f;b2)W&Tg$J7t2CT=v(@h94r)32}3Lx{gxQ@g)xzVNNJ9KJLjNxn#5#jFg=cN|E4S|AZk<8vWdnH{0#GnJ!~LE99{Q80HcrQxfq`@!3H9!?YS9qCRTy;WGX?d&SonNBsXKJCBG8ZIWj8A>!98 z_6@1jM=l~Z=R~tONr2AF_7k!ZS)Z3Qi7rM2GHQp^xkF7vfOw7E1f%^LMZgb;jI2f> pRo);Sk>C>k0dt5DAwrZN{s&^XC)ySg)lmQd002ovPDHLkV1h7w^_c(w diff --git a/src/qt/res/icons/connect2.png b/src/qt/res/icons/connect2.png index 3bbb0d395c5cbbc226007dcdcf7318575cf842f1..741f74c5506722cdb7557550da0967acf6cb889a 100644 GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0vp^azHG@!3-oF)&9>0Qd zmjw9*GjOduJTIIl@^v1w-j}`n5`i7hkF#-4?~yg+==`m){#`K3rM8)xi5EXrNqw(p zT=UQL52xtq{MaleYne_CYg3>x{hlt4AsXl3o;Mdd6u`rBfpxNBLXpwQ6rXb&zV8?R zm3J}!#f*<)QfK!#X)BzQSDRQ8^s;B_<|$7;v2u&YKGvD48~1UQ>Bp+WRSRwk<-fl6 z@>_%5Oa3j7oQq73sVFSxI`5-j-^aQ$q(by-T(WZ;SG!>T#>p%HY%{O2VAAt{p1&{V o=@;K=yFXv}SG8}CdEH5N14*Ht$xkd+0G-C*>FVdQ&MBb@07x5^761SM literal 1927 zcmV;22YC32P)_NKkWxTIi185wgiK|oYMgS-NihZNdMq1O*HHz|9!w==u5_wHQxpPWy4e%xK5YQx|%o{oa9{{yU zh<1}5z}SdBJq!a5YZC30`9MxYWy81|IPH_{xU2p*Ak-RveM?ga;0Tt$AAMil3i$#3319<+xFyF0LLsPJ1$La zAv+uR(Q>k@ZJOQpTTXTi*lG*eO@ZARK=^!H2p^XLWXFIZwh;bd29SLi&1_IMa04(4 zkxtqMl*_&47GMD|0caV(VtLfV0RNG%@D$)-1vwZn;g6{fxG^GEr|Q*J0JDMf4H4ei z!{BxT7i;!2AwaT!SDoEg$(ih>ll?$}0m5(g(DzUe{bT{l0wB8*xK>4h;qtXimZ{z+ z%}Ra0`ByG@esH_y0Be9|KEk`34Mzyas?I96yxtCA25_arMQsV(3M_VUyHEREoyTYn z^0?1`a2wzULo>TbrNc`|%ve_gk1N`t9xfi?L7<%_gae!h%=1C^E=19g5#p740WOl74Mrx(RnPIlldk7MzquqOixWTYX=c37_szc(S2(^MJQBWh3Tl`UZxT z@Zk<+mm6v~$gro19Fp;o(4iS{vW}uvz(oey{hIV=Tjqv!mM?KA`i{@`1`&?*R*ei3 zgbqC&``%jM9*=Fcmf_sGvGGB2_fww)S$Fc3Pj324Uu7|{TE$*R(2+z=Y^5*#)ul~bd&v^fwA;;IFW~ZzWsq=D8V06ZAc~= z8q0b|yElb3rt_R3;?Bz1x=K?z7#hb6hd!ZAie$-!+4cm)2!~FuggGISgZFCIvuM;~ z2Z%lny%rF1G(uE0>5@G(B>ERRben?(7~^4vACaNc5*e1&6;r1;9x)su4lUt+WsD)+ z%N*^FiU@a?Wd`)_C}ZSxYb101+Sm4o1Z`G`2saUrsR6qC)VtL0Kd~+1R?0HOQIj){ zp!+7^4H-*LC*j9s=yU+0)OiAGr`V=D9Io|vKNnv_VyaS^mo{?osn!_u&zL&|n#zKF z=XuaY9-^MNk$5xFQq_k?w?Ubt;|CG`#9>M?IhD#AMCB4jV9I zlaegHm576`TS$IF`lzZ|9Z4{mm(TEa8_p-1{rqWY?HK7|UUc4SrF#m`C%D@wW76}| z!J{7fSZ#2Jl#i%BQ@x9JFCvMe9QS@PV27ey(Y1aVz2ka8$1C!son9`t#HZ!@b^vio zV=kgPL2F0Tf^&;GZIx8H&%Q4U8=C=SpY-cKrxFV@fbh9kgsqm7U4dqmQ@T-ZIpNRS zM0OL>pDFhv-(t}PjB(hyL)nj|*F^8MknFz^)vi|J3k%IiJ1oXjONg!pUa-+-;}T{J zGtoz++un%`!is=NJAv851uLnf-T7u2)TZ<;R zpGNZ|#|Y_3;IN>rw4tUVcsE9rHjG@v*OmN`y$}665C7N5Mil?(elMpMc;9x%B%NrE zxC(VG$rH@S5qEa?j3_gQJjC(9@rVyGPeYWGT|;8cMuZ3vB18xl{{hmC`MMkt&!zwX N002ovPDHLkV1ki8i`f7G diff --git a/src/qt/res/icons/connect3.png b/src/qt/res/icons/connect3.png index 0db99ad8d30458c3641d931213b9c4b564293ce6..f811d08faaba5867467781a096d90687035e76b2 100644 GIT binary patch literal 736 zcmeAS@N?(olHy`uVBq!ia0vp^azHG@!3-oF)&9?BU|`e<@Ck7Ra@9=iM-ee0u>Izj zO~CLYIMzZEGLTVb`1T?WCy8ri=VsD-X{LXRP?QIr4R0 ze%hD43*Ycb1a>?>&L;eddwNgt9a%$;&ff|`-;LJ43ud{rWu|6g)q+n_arNG7O#g7Y zA3PnKb&APauBPH7J209UJY5_^G|oSra6O30QNUH7EA1#tQ`3tkt|mrf1)&&ajjqN8 zGv59G-@Ny;+3uX5jNcB2T%WUY=W^*E=buVSeED_fqrl0B6E7Ny+xUeFPyYLHN_~}^ z?Top_+%x!DTJ>9Ecn@_Sny%FM`$bVsYUr8Xil!LjHx+lg?s{}pc+K*4&xxu`eR5y7 zsQUQ1^3B!15ApLAmiQd|T`~7b%kxI2$}E5Vc~cvVB3C}TqoQB((fiXYDf8`1&y)T{-Lb{RhcE6p#c_&)G-yRc#92V)*f<%)@CvwmD%)G0P0ZFjTY&t(rU y>~>kc9*vIDmuf?OQtbXfXj>!WCJ%gvKpUXO@geCxgNdIvF literal 1750 zcmV;{1}XW8P)Z|V-b55&@d zPG)}qWf49#4F~osf_B?dpjCu2v+e{=_=KIXjX?VdX=>dd#^bm~s{mR=Xq&4T*ryqG z!k&)sHrH}Pu;XHgx+sj$&IU#U&jag$&A{)#P6>+{1Re)I3=`;!ffYcbVQ79VCZ?KJ zs|a|-K%g^a(`;V>?zRMU!alWmuH0Z5>^M+kBkZ9T4IyqjZQGpu5}@8v*a>TG3+xua zkCwweZqwU+kL9rAz!qCzw+42F0Qgc{fR7CU>^LyYOXu@}9>6ugDBxyb0MO1L@YNxJ zy&r|$pgfV3Uk2~S&<=NcNvw&HC= zHQT@uv1f^ozV5_1G?Y>2i{+=O;PI>_z!Mq*e5>HQ7MOv;@rV_Mr$+w)A4uA3z&zl& z90E`1a-baeM$EtxzK#LgfH#5LRA*&fMf%Y81%?UW$%dQ`ejhS9B+KV)0N0|m5%BD4 zdq{vEvIY2&kN`goj1M~Of{?&&YKz4pF0iT(A@nDM4E(nc0*?iGcv%@j;E9dfK0yRN zKBU0oz~?~(-bpOI!wS7Lh|pg)-05S$t7&YTLEp=KvKa`>5vl79BCoO%SctR9-O<3@cp}I9vey;K9c! zoFmjqnZuVfcl2MJ&ERwzkOknfTYZB>ZrhKq&A@rGz*~wjRYxcPL2e_te-?n3NVMa! z6pO%WV5VqiG0sttzG8Owk$AJ+pV=k;R$9~XSF`vv@?{pqSpZ&?p$+YDYJ!@6W)Du? zP$u;i(@(e0N)$J>FBHK*rRb;zm@58LWMw*N)=C6T_wG^^&`mMOmM8ID?qvqk513Et zV+3^~r+ydS4*)GQ2>e|U2vgZroLN=zw+Q53^n%NGBkBi}&QL261P6 zX@rk{S+@il)A}&tzU7)VF*r`YMB~ z#Oy)Ex@qdiqpr5h2y%XYo(9azuJ$YlGVnZLkq_7}2A~fmt~R}e1yW5j#DKd4 z()OXQwk@;)_!zup23Lyt@N5s(K~viwaJ6f8Sb_VsF`C+5;d<_<2zYW^qoLj1UDMkJ zd={SNi=}TNX3u}90@raM^`uB;_|bB|Ut(vRTPZ6<%Jq~h>0X7iMK>tNzz>Sl=@8%! zoMI`NDz;g!xql_z>*B|`o)uH!QYeCt%IfcDJQjg!0`66-lO()UZ`!# z{GG^Jj{kf6vI)GG_4H7#)c{m%sI+oYJpthHoOW@#Cow=bk z;OtWlqqLDtgd^j}01UNX5V#$nWd! z2JTbIdp~7(K~XEYw0;J)ay`@eiefQNuN70`6C%FV06*cJMZZyXM$;ZRiv4E@v$cHo zeOXvp2w)$@?7b~o^>zq=FUBHmu^jdh6i+$jTD6t~pKlZF0?c3MY|_5Nq6-)kvUP^C z2TQMs-eDo^zi>{wTB*-097eiev1V8T`Z!L(Yilf5?|_4@6U+7+cwl7R_skXpFBJic#U_OX*XZMv6GJPt-xx9S> s&JQuq#5qoO1!{Gfks?Kk6v@B-2c~9oexOp4;Q#;t07*qoM6N<$f^<|!Pyhe` diff --git a/src/qt/res/icons/connect4.png b/src/qt/res/icons/connect4.png index 9dd19fc2bd6596a8e339fee18d09c087d8f8e4de..79cdc868f982d5275deafa32c3e4d47fc688e7ed 100644 GIT binary patch literal 1012 zcmeAS@N?(olHy`uVBq!ia0vp^azHG@!3-oF)&9?BU|^gb;1l8s~GZb4Mt1 z&+XNIiKpAvKAyuKJymbYx0AIpn=bM*UFBMNcwTtLX4M~Yk+1Xed%x^m_=Zo?S|YIH z`EfSkSL-HmPcObBYuKqE^xa70UGSwXb~81r7Hm!aBsI6J-n+?^(>*rpl(HO~`~7BM z(rNH?aSYKozjjh+II|;9tA5GFM^O=b0_KR7ckSN2TfDq{r~T}b+w+_>KRC&y6@N;d zH2VzG{{*{zyW&?oa{tB7!uGeJdF4zyl`Gc#+~q0;N|&mgLP~tr%sqZox^B{h2`jvu zf;OewsG90VO`bPT@y?8wjhj_6PMtf+%2OGna6h?)sa-F5;SblUOK(1x8h96WP78=) zn{xVZSN<-o)vH>sd)$rsSrzFJyZ4Cnnv5QW*>=6x?_9cdP4CoHzLmFEE?7PLP2uCX z>f8J31nm_36bw9$X}#O#JZoK|wt-V$U*a7Xza8uS{d~`J%%6Ms57SLXok`yDCA#Z5 z&NGLdG-Z9Obnfgm^A!HspX8!%Y@29(BXs4vT`lbss(%~EOb~l8A%^wSNo94rYjU4h zT#ZZ%yyh`Jf6^)(pS8=s(Dhb>oFwB8wfs3ZmOYHtD2ggnpUpb$M76r#mf)|95{v!` z`hRj}5dBuf$8F^Onz3+RbUee|?61Zf)*susWMN^_s&k)f@7?>jy_P{qy1~!BPpAi& PJ{UY*{an^LB{Ts5d)!+J literal 1548 zcmV+n2J`ueP)jfF$~uWxdMA3OtUD92*V^RrUnHD zS(YvJkBlVNE7k1P)RtBn;@)R!F1KHQ-17t3_WRv)&pqe2dk*Id5A3h|{LW|hp7WgN zdG5L3<>lq&m17M9rT}w*hk?g|8sIwMB#%d*DuC5MH;~F;{{fqUyMW;ynVL=o)&hN5 zKo4fyfhvzLnq~m45kdF2SNz>Br`yC7ko@5HNj5XIw0Sp9jH?@Oe2}> zNso7+))<1F0*(OZxCpHXxEWXqYy!Rkb^y&1)@KlS3V7Qk(C3Le^sr%QajX{@V>{?F z;5Cg=g=xFT_8s6}OF*Y>gRQV{P5AVY$^Nnt_O%vGA%o>ytkOiF(^A-JE3gH2KCsnt z*#Fpcch9jLc1qkZR_Hijj|0G0*aG}^2VkdwYg7hb0E`1J17?ZbafRVDxE;W05&g_H2>TbAySqSS-QqZE0w%-+K3&1@bj7fOzuXbyPOpyWt1adeRRVmcVax}`Zx7W%L-W|r;>k%m z@O0c?A7iXLfs14uogp4cQ;WybmHUI$N;v@s#?jZ0!;EtpMU*{n3^k(b)Bm%E- z6nF~wD2c#N26`NZK1~y+(ZG1%TpeY_6@~|WK$N{Q*{=qD*T*RF%>dp2ejntzT?DPs zwLodqi;oddObzp{FfmVLDw`wtI0QT^3K`O>H8kKaL(-PzIha<;BpDRP zEVs2pE%PncJkY-h-h0fZiW~r+Dlzu)8Kw@E#?5)Mz=y@Gc=T`4l_{@H%>nQ!A-|y< z_(QYLxl!))2V+JqpAftqCcA!^2A*wE8xAxY@YzGej;jg4y9!fCEzw$YO)r|QA&cfi z27T|2S`7l21Uv=&kR=NE0GN$>15mxeK{o-xIDSz!d~dF5@(1=B7Ek z@#;XmU&g35ISl>ABm$o(5>74xU!By>%(%Nd}%L%4DuVPyAbK z%N>G!1PfH{5b#|dcy8@I4?MS469+_rNK6%Dw*SKw;5|e6ES%l$S1 z%YaLV7VJ#ci%mL!t2T4KYPgnLF7qR9 zA>Qc?uWP7m=L&c+@TVc*buycdg_^e4TUDyrLjXKo=F@%fja0Y50s}dOB1H)EBKq1F z^NFfNUnlW9NF0Yc%g_SSfZ7R_8zTDIsbSry5Sx@ZJ&lWGqPHTb6a3Q=pijlkuyPL>!BjrJ2X1BKZV;B!SEOErh3X9CZVy>+4;c$1(*OIj!5##<0G z4Q|553aEDyoKSQFL9JKm*y`C1!0tk!IzCid;{fnwSfp*1!#;p~?_eU-VL9+cHo-2m z9CjlS4irdA{qV4*u=gV0znCcPvJm!e-~uew#}-Z_rC6-_mVoXQyU{`{*VzdN-3Gis z@V1>ZGTlhojob$?nnlTOy~tx!+7^Y#Y7%B^dpF@VKrb7Dy~U#)TqA%_HN$QvXxjJ6 zpi2sW`2Cg0fiD@8$FoR6t5RLN$#dcxSUQB#P-IIHX{* yN2X6@1Rq|mA@~sUeDU{%SoFyhFE1}INAy2hiRw|o2LY4-0000 #include -#include +#include #include #include #include @@ -171,7 +171,7 @@ void SendCoinsDialog::setModel(WalletModel *_model) connect(ui->confTargetSelector, static_cast(&QComboBox::currentIndexChanged), this, &SendCoinsDialog::coinControlUpdateLabels); connect(ui->groupFee, static_cast(&QButtonGroup::buttonClicked), this, &SendCoinsDialog::updateFeeSectionControls); connect(ui->groupFee, static_cast(&QButtonGroup::buttonClicked), this, &SendCoinsDialog::coinControlUpdateLabels); - connect(ui->customFee, &BitcoinAmountField::valueChanged, this, &SendCoinsDialog::coinControlUpdateLabels); + connect(ui->customFee, &nyc3amountfield::valueChanged, this, &SendCoinsDialog::coinControlUpdateLabels); connect(ui->optInRBF, &QCheckBox::stateChanged, this, &SendCoinsDialog::updateSmartFeeLabel); connect(ui->optInRBF, &QCheckBox::stateChanged, this, &SendCoinsDialog::coinControlUpdateLabels); CAmount requiredFee = model->wallet().getRequiredFee(1000); diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 7324d759f..f18182440 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -44,7 +44,7 @@ SendCoinsEntry::SendCoinsEntry(const PlatformStyle *_platformStyle, QWidget *par ui->payTo_is->setFont(GUIUtil::fixedPitchFont()); // Connect signals - connect(ui->payAmount, &BitcoinAmountField::valueChanged, this, &SendCoinsEntry::payAmountChanged); + connect(ui->payAmount, &nyc3amountfield::valueChanged, this, &SendCoinsEntry::payAmountChanged); connect(ui->checkboxSubtractFeeFromAmount, &QCheckBox::toggled, this, &SendCoinsEntry::subtractFeeFromAmountChanged); connect(ui->deleteButton, &QPushButton::clicked, this, &SendCoinsEntry::deleteClicked); connect(ui->deleteButton_is, &QPushButton::clicked, this, &SendCoinsEntry::deleteClicked); diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp index 7f5e92ea9..f62fd5906 100644 --- a/src/qt/test/addressbooktests.cpp +++ b/src/qt/test/addressbooktests.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp index da25d8317..3fb75f1d1 100644 --- a/src/qt/test/apptests.cpp +++ b/src/qt/test/apptests.cpp @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index f8a9c2530..9485fe87d 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -12,7 +12,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 a2bf53973..e008b0835 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index 2b50a2ba8..2ecf74749 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -60,7 +60,7 @@ uint256 SendCoins(CWallet& wallet, SendCoinsDialog& sendCoinsDialog, const CTxDe QVBoxLayout* entries = sendCoinsDialog.findChild("entries"); SendCoinsEntry* entry = qobject_cast(entries->itemAt(0)->widget()); entry->findChild("payTo")->setText(QString::fromStdString(EncodeDestination(address))); - entry->findChild("payAmount")->setValue(amount); + entry->findChild("payAmount")->setValue(amount); sendCoinsDialog.findChild("frameFee") ->findChild("frameFeeSelection") ->findChild("optInRBF") @@ -201,7 +201,7 @@ void TestGUI() labelInput->setText("TEST_LABEL_1"); // Amount input - BitcoinAmountField* amountInput = receiveCoinsDialog.findChild("reqAmount"); + nyc3amountfield* amountInput = receiveCoinsDialog.findChild("reqAmount"); amountInput->setValue(1); // Message input diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 0d070d9e8..0fc745122 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include #include #include diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h index 7a7d98962..fa48a6968 100644 --- a/src/qt/transactiontablemodel.h +++ b/src/qt/transactiontablemodel.h @@ -5,7 +5,7 @@ #ifndef BITCOIN_QT_TRANSACTIONTABLEMODEL_H #define BITCOIN_QT_TRANSACTIONTABLEMODEL_H -#include +#include #include #include diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index 762ec434a..d092eb48c 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index b051dd159..22d0d2401 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include #include diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index 466f2278e..40c8fe443 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 5f6f93d94..1f0368256 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/script/bitcoinconsensus.cpp b/src/script/nyc3consensus.cpp similarity index 99% rename from src/script/bitcoinconsensus.cpp rename to src/script/nyc3consensus.cpp index 15e204062..ebef4f221 100644 --- a/src/script/bitcoinconsensus.cpp +++ b/src/script/nyc3consensus.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include