diff options
author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2019-11-10 12:10:36 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-11-25 10:13:25 +0100 |
commit | a284bbbee805cd03664fd27656795a9f7d3eeca7 (patch) | |
tree | bd2cd7ea95947957bf722e904a65d2d47316bb7e | |
parent | 2aba76ce02dd86df1b7714ff839588b7b2657c0a (diff) | |
download | bitcoin-a284bbbee805cd03664fd27656795a9f7d3eeca7.tar.xz |
refactor: Styling w/ clang-format, comment update
Github-Pull: #17427
Rebased-From: 1828c6f05fcbed9ed432b042cc36eee0d80b113d
Tree-SHA512: 140b723bd9c8d8823ecb84d7f774d213a9e9dac45fb0de82c43521cf8276d946feaa1b7c0b7d40f51dbab38c88c53b4680da1965b1e0ce7f858eb35b2c4537da
-rw-r--r-- | src/qt/bitcoin.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 7fda607d90..812199cda0 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -439,17 +439,19 @@ int GuiMain(int argc, char* argv[]) BitcoinApplication app(*node); - // Register meta types used for QMetaObject::invokeMethod - qRegisterMetaType< bool* >(); + // Register meta types used for QMetaObject::invokeMethod and Qt::QueuedConnection + qRegisterMetaType<bool*>(); #ifdef ENABLE_WALLET qRegisterMetaType<WalletModel*>(); #endif - // Need to pass name here as CAmount is a typedef (see http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType) - // IMPORTANT if it is no longer a typedef use the normal variant above - qRegisterMetaType< CAmount >("CAmount"); + // Register typedefs (see http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType) + // IMPORTANT: if CAmount is no longer a typedef use the normal variant above (see https://doc.qt.io/qt-5/qmetatype.html#qRegisterMetaType-1) + qRegisterMetaType<CAmount>("CAmount"); qRegisterMetaType<size_t>("size_t"); - qRegisterMetaType< std::function<void()> >("std::function<void()>"); + + qRegisterMetaType<std::function<void()>>("std::function<void()>"); qRegisterMetaType<QMessageBox::Icon>("QMessageBox::Icon"); + /// 2. Parse command-line options. We do this after qt in order to show an error if there are problems parsing these // Command-line options take precedence: node->setupServerArgs(); |