qt, refactor: Drop intermediate BitcoinApplication::shutdownResult slot

hebasto · hebasto · commit b441b47b046e · 2021-06-11T10:00:37.000+03:00
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -301,7 +301,7 @@ void BitcoinApplication::startThread()
 
     /*  communication to and from thread */
     connect(executor, &BitcoinCore::initializeResult, this, &BitcoinApplication::initializeResult);
-    connect(executor, &BitcoinCore::shutdownResult, this, &BitcoinApplication::shutdownResult);
+    connect(executor, &BitcoinCore::shutdownResult, this, &QCoreApplication::quit);
     connect(executor, &BitcoinCore::runawayException, this, &BitcoinApplication::handleRunawayException);
     connect(this, &BitcoinApplication::requestedInitialize, executor, &BitcoinCore::initialize);
     connect(this, &BitcoinApplication::requestedShutdown, executor, &BitcoinCore::shutdown);
@@ -416,11 +416,6 @@ void BitcoinApplication::initializeResult(bool success, interfaces::BlockAndHead
     }
 }
 
-void BitcoinApplication::shutdownResult()
-{
-    quit();
-}
-
 void BitcoinApplication::handleRunawayException(const QString &message)
 {
     QMessageBox::critical(
diff --git a/src/qt/bitcoin.h b/src/qt/bitcoin.h
@@ -95,7 +95,6 @@ public Q_SLOTS:
     void initializeResult(bool success, interfaces::BlockAndHeaderTipInfo tip_info);
     /// Request core shutdown
     void requestShutdown();
-    void shutdownResult();
     /// Handle runaway exceptions. Shows a message box with the problem and quits the program.
     void handleRunawayException(const QString &message);
 

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ void BitcoinApplication::startThread()`
`301`	`301`
`302`	`302`	`/* communication to and from thread */`
`303`	`303`	`connect(executor, &BitcoinCore::initializeResult, this, &BitcoinApplication::initializeResult);`
`304`		`- connect(executor, &BitcoinCore::shutdownResult, this, &BitcoinApplication::shutdownResult);`
	`304`	`+ connect(executor, &BitcoinCore::shutdownResult, this, &QCoreApplication::quit);`
`305`	`305`	`connect(executor, &BitcoinCore::runawayException, this, &BitcoinApplication::handleRunawayException);`
`306`	`306`	`connect(this, &BitcoinApplication::requestedInitialize, executor, &BitcoinCore::initialize);`
`307`	`307`	`connect(this, &BitcoinApplication::requestedShutdown, executor, &BitcoinCore::shutdown);`
`@@ -416,11 +416,6 @@ void BitcoinApplication::initializeResult(bool success, interfaces::BlockAndHead`
`416`	`416`	`}`
`417`	`417`	`}`
`418`	`418`
`419`		`-void BitcoinApplication::shutdownResult()`
`420`		`-{`
`421`		`- quit();`
`422`		`-}`
`423`		`-`
`424`	`419`	`void BitcoinApplication::handleRunawayException(const QString &message)`
`425`	`420`	`{`
`426`	`421`	`QMessageBox::critical(`