Changeset View
Changeset View
Standalone View
Standalone View
src/qt/bitcoin.cpp
Show All 29 Lines | |||||
#include "init.h" | #include "init.h" | ||||
#include "rpc/server.h" | #include "rpc/server.h" | ||||
#include "ui_interface.h" | #include "ui_interface.h" | ||||
#include "uint256.h" | #include "uint256.h" | ||||
#include "util.h" | #include "util.h" | ||||
#include "warnings.h" | #include "warnings.h" | ||||
#ifdef ENABLE_WALLET | #ifdef ENABLE_WALLET | ||||
#include "wallet/init.h" | |||||
#include "wallet/wallet.h" | #include "wallet/wallet.h" | ||||
jasonbcox: This line doesn't appear in the original PR. Is there a missing backport that should be done… | |||||
FabienAuthorUnsubmitted Done Inline ActionsYes, there is a missing backport : PR10244. Fabien: Yes, there is a missing backport : PR10244.
I think there won't be too much conflicts due to… | |||||
jasonbcoxUnsubmitted Not Done Inline ActionsNoted. T417 jasonbcox: Noted. T417 | |||||
#endif | #endif | ||||
#include "walletinitinterface.h" | #include "walletinitinterface.h" | ||||
#include <cstdint> | #include <cstdint> | ||||
#include <boost/filesystem/operations.hpp> | #include <boost/filesystem/operations.hpp> | ||||
#include <boost/thread.hpp> | #include <boost/thread.hpp> | ||||
▲ Show 20 Lines • Show All 703 Lines • ▼ Show 20 Lines | #ifdef ENABLE_WALLET | ||||
if (PaymentServer::ipcSendCommandLine()) { | if (PaymentServer::ipcSendCommandLine()) { | ||||
exit(EXIT_SUCCESS); | exit(EXIT_SUCCESS); | ||||
} | } | ||||
// Start up the payment server early, too, so impatient users that click on | // Start up the payment server early, too, so impatient users that click on | ||||
// bitcoincash: links repeatedly have their payment requests routed to this | // bitcoincash: links repeatedly have their payment requests routed to this | ||||
// process: | // process: | ||||
app.createPaymentServer(); | app.createPaymentServer(); | ||||
// Hook up the wallet init interface | |||||
g_wallet_init_interface.reset(new WalletInit); | |||||
#else | |||||
g_wallet_init_interface.reset(new DummyWalletInit); | |||||
#endif | #endif | ||||
/// 9. Main GUI initialization | /// 9. Main GUI initialization | ||||
// Install global event filter that makes sure that long tooltips can be | // Install global event filter that makes sure that long tooltips can be | ||||
// word-wrapped. | // word-wrapped. | ||||
app.installEventFilter( | app.installEventFilter( | ||||
new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app)); | new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app)); | ||||
#if defined(Q_OS_WIN) | #if defined(Q_OS_WIN) | ||||
▲ Show 20 Lines • Show All 56 Lines • Show Last 20 Lines |
This line doesn't appear in the original PR. Is there a missing backport that should be done before this one?
There are a couple removals of #include "wallet/init.h" that aren't here as well, hinting to a similar thing.