Merge #41: Revert a commit from #5 to avoid merge conflict with bitcoin/bitcoin#22219

498a318 Revert 8efd330 (Hennadii Stepanov)

Pull request description:

  This PR reverts the _"refactor: Move qwidget and qml common code into the main() function"_ commit (8efd330) from #5, and it allows to sync with the main repo without a merge conflict with bitcoin/bitcoin#22219.

ACKs for top commit:
  promag:
    Tested ACK 498a318, a clean merge is possible after this.

Tree-SHA512: b1d3708a20f36b81225a3c25963dbc32c3a33e54a795184cfea5b4af9c98ecd68cee8d297e94cced3f118aed738bafd4312536d62a445d09626d7fad613a2323

Author: hebasto

src/qml/bitcoin.cpp

@@ -16,10 +16,12 @@
 #include <qt/guiutil.h>
 #include <qt/initexecutor.h>
 #include <util/system.h>
+#include <util/threadnames.h>
 #include <util/translation.h>
 
 #include <boost/signals2/connection.hpp>
 #include <memory>
+#include <tuple>
 
 #include <QDebug>
 #include <QGuiApplication>
@@ -84,6 +86,14 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons
 
 int QmlGuiMain(int argc, char* argv[])
 {
+#ifdef WIN32
+    util::WinCmdLineArgs winArgs;
+    std::tie(argc, argv) = winArgs.get();
+#endif // WIN32
+
+    SetupEnvironment();
+    util::ThreadSetInternalName("main");
+
     Q_INIT_RESOURCE(bitcoin_qml);
 
     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);

src/qt/bitcoin.cpp

@@ -451,6 +451,13 @@ static void SetupUIArgs(ArgsManager& argsman)
 
 int GuiMain(int argc, char* argv[])
 {
+#ifdef WIN32
+    util::WinCmdLineArgs winArgs;
+    std::tie(argc, argv) = winArgs.get();
+#endif
+    SetupEnvironment();
+    util::ThreadSetInternalName("main");
+
     NodeContext node_context;
     std::unique_ptr<interfaces::Node> node = interfaces::MakeNode(&node_context);
 

src/qt/main.cpp

@@ -14,16 +14,13 @@
 
 #include <interfaces/node.h>
 #include <noui.h>
-#include <util/system.h>
-#include <util/threadnames.h>
 #include <util/translation.h>
 #include <util/url.h>
 
 #include <QCoreApplication>
 
 #include <functional>
 #include <string>
-#include <tuple>
 
 #if defined(QT_STATICPLUGIN)
 #include <QtPlugin>
@@ -46,14 +43,6 @@ int main(int argc, char* argv[])
 {
     qRegisterMetaType<interfaces::BlockAndHeaderTipInfo>("interfaces::BlockAndHeaderTipInfo");
 
-#ifdef WIN32
-    util::WinCmdLineArgs win_args;
-    std::tie(argc, argv) = win_args.get();
-#endif // WIN32
-
-    SetupEnvironment();
-    util::ThreadSetInternalName("main");
-
     // Subscribe to global signals from core.
     noui_connect();