From 07cf426404b491e67d4657320d2272914189d447 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 9 Mar 2017 17:04:59 -0800 Subject: [PATCH] Remove stale Qt comments and dead code --- src/bitcoind.cpp | 1 - src/init.cpp | 23 +++-------------------- src/init.h | 3 +-- src/main.cpp | 2 +- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index af3acb06a..2063f4c85 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -63,7 +63,6 @@ bool AppInit(int argc, char* argv[]) // // Parameters // - // If Qt is used, parameters/zcash.conf are parsed in qt/bitcoin.cpp's main() ParseParameters(argc, argv); // Process help and version before taking care about datadir diff --git a/src/init.cpp b/src/init.cpp index 705dc1572..aeb877d4c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -100,7 +100,7 @@ CClientUIInterface uiInterface; // Declared but not defined in ui_interface.h // Thread management and startup/shutdown: // // The network-processing threads are all part of a thread group -// created by AppInit() or the Qt main() function. +// created by AppInit(). // // A clean exit happens when StartShutdown() or the SIGTERM // signal handler sets fRequestShutdown, which triggers @@ -116,10 +116,6 @@ CClientUIInterface uiInterface; // Declared but not defined in ui_interface.h // before adding any threads to the threadGroup, so .join_all() returns // immediately and the parent exits from main(). // -// Shutdown for Qt is very similar, only it uses a QTimer to detect -// fRequestShutdown getting set, and then does the normal Qt -// shutdown thing. -// std::atomic fRequestShutdown(false); @@ -410,9 +406,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-stopafterblockimport", strprintf("Stop running after importing blocks from disk (default: %u)", 0)); } string debugCategories = "addrman, alert, bench, coindb, db, estimatefee, lock, mempool, net, partitioncheck, pow, proxy, prune, " - "rand, reindex, rpc, selectcoins, zmq, zrpc, zrpcunsafe (implies zrpc)"; // Don't translate these and qt below - if (mode == HMM_BITCOIN_QT) - debugCategories += ", qt"; + "rand, reindex, rpc, selectcoins, zmq, zrpc, zrpcunsafe (implies zrpc)"; // Don't translate these strUsage += HelpMessageOpt("-debug=", strprintf(_("Output debugging information (default: %u, supplying is optional)"), 0) + ". " + _("If is not supplied or if = 1, output all debugging information.") + " " + _(" can be:") + " " + debugCategories + "."); strUsage += HelpMessageOpt("-experimentalfeatures", _("Enable use of experimental features")); @@ -487,18 +481,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-rpcsslprivatekeyfile=", strprintf(_("Server private key (default: %s)"), "server.pem")); strUsage += HelpMessageOpt("-rpcsslciphers=", strprintf(_("Acceptable ciphers (default: %s)"), "TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH")); - if (mode == HMM_BITCOIN_QT) - { - strUsage += HelpMessageGroup(_("UI Options:")); - if (showDebug) { - strUsage += HelpMessageOpt("-allowselfsignedrootcertificates", "Allow self signed root certificates (default: 0)"); - } - strUsage += HelpMessageOpt("-choosedatadir", _("Choose data directory on startup (default: 0)")); - strUsage += HelpMessageOpt("-lang=", _("Set language, for example \"de_DE\" (default: system locale)")); - strUsage += HelpMessageOpt("-min", _("Start minimized")); - strUsage += HelpMessageOpt("-rootcertificates=", _("Set SSL root certificates for payment request (default: -system-)")); - strUsage += HelpMessageOpt("-splash", _("Show splash screen on startup (default: 1)")); - } else if (mode == HMM_BITCOIND) { + if (mode == HMM_BITCOIND) { strUsage += HelpMessageGroup(_("Metrics Options (only if -daemon and -printtoconsole are not set):")); strUsage += HelpMessageOpt("-showmetrics", _("Show metrics on stdout (default: 1 if running in a console, 0 otherwise)")); strUsage += HelpMessageOpt("-metricsui", _("Set to 1 for a persistent metrics screen, 0 for sequential metrics output (default: 1 if running in a console, 0 otherwise)")); diff --git a/src/init.h b/src/init.h index 34290b276..b8d5ec723 100644 --- a/src/init.h +++ b/src/init.h @@ -28,8 +28,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler); /** The help message mode determines what help message to show */ enum HelpMessageMode { - HMM_BITCOIND, - HMM_BITCOIN_QT + HMM_BITCOIND }; /** Help for options shared between UI and daemon (for -help) */ diff --git a/src/main.cpp b/src/main.cpp index 52e8ca4c6..f8fcfd60d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2387,7 +2387,7 @@ void static UpdateTip(CBlockIndex *pindexNew) { LogPrintf("%s: %d of last 100 blocks above version %d\n", __func__, nUpgraded, (int)CBlock::CURRENT_VERSION); if (nUpgraded > 100/2) { - // strMiscWarning is read by GetWarnings(), called by Qt and the JSON-RPC code to warn the user: + // strMiscWarning is read by GetWarnings(), called by the JSON-RPC code to warn the user: strMiscWarning = _("Warning: This version is obsolete; upgrade required!"); CAlert::Notify(strMiscWarning, true); fWarned = true;