scripted-diff: Rename BitcoinCore class to InitExecutor

hebasto · hebasto · commit dbcf56b6c6e9 · 2021-07-14T21:54:31.000+03:00
-BEGIN VERIFY SCRIPT-
sed -i -e 's/BitcoinCore/InitExecutor/g' src/qt/bitcoin.*
-END VERIFY SCRIPT-
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -155,28 +155,28 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons
     }
 }
 
-BitcoinCore::BitcoinCore(interfaces::Node& node) :
+InitExecutor::InitExecutor(interfaces::Node& node) :
     QObject(), m_node(node)
 {
     this->moveToThread(&m_thread);
     m_thread.start();
 }
 
-BitcoinCore::~BitcoinCore()
+InitExecutor::~InitExecutor()
 {
     qDebug() << __func__ << ": Stopping thread";
     m_thread.quit();
     m_thread.wait();
     qDebug() << __func__ << ": Stopped thread";
 }
 
-void BitcoinCore::handleRunawayException(const std::exception *e)
+void InitExecutor::handleRunawayException(const std::exception *e)
 {
     PrintExceptionContinue(e, "Runaway exception");
     Q_EMIT runawayException(QString::fromStdString(m_node.getWarnings().translated));
 }
 
-void BitcoinCore::initialize()
+void InitExecutor::initialize()
 {
     try
     {
@@ -192,7 +192,7 @@ void BitcoinCore::initialize()
     }
 }
 
-void BitcoinCore::shutdown()
+void InitExecutor::shutdown()
 {
     try
     {
@@ -298,11 +298,11 @@ void BitcoinApplication::startThread()
     m_executor.emplace(node());
 
     /*  communication to and from thread */
-    connect(&m_executor.value(), &BitcoinCore::initializeResult, this, &BitcoinApplication::initializeResult);
-    connect(&m_executor.value(), &BitcoinCore::shutdownResult, this, &BitcoinApplication::shutdownResult);
-    connect(&m_executor.value(), &BitcoinCore::runawayException, this, &BitcoinApplication::handleRunawayException);
-    connect(this, &BitcoinApplication::requestedInitialize, &m_executor.value(), &BitcoinCore::initialize);
-    connect(this, &BitcoinApplication::requestedShutdown, &m_executor.value(), &BitcoinCore::shutdown);
+    connect(&m_executor.value(), &InitExecutor::initializeResult, this, &BitcoinApplication::initializeResult);
+    connect(&m_executor.value(), &InitExecutor::shutdownResult, this, &BitcoinApplication::shutdownResult);
+    connect(&m_executor.value(), &InitExecutor::runawayException, this, &BitcoinApplication::handleRunawayException);
+    connect(this, &BitcoinApplication::requestedInitialize, &m_executor.value(), &InitExecutor::initialize);
+    connect(this, &BitcoinApplication::requestedShutdown, &m_executor.value(), &InitExecutor::shutdown);
 }
 
 void BitcoinApplication::parameterSetup()
diff --git a/src/qt/bitcoin.h b/src/qt/bitcoin.h
@@ -32,12 +32,12 @@ class WalletModel;
 /** Class encapsulating Bitcoin Core startup and shutdown.
  * Allows running startup and shutdown in a different thread from the UI thread.
  */
-class BitcoinCore: public QObject
+class InitExecutor: public QObject
 {
     Q_OBJECT
 public:
-    explicit BitcoinCore(interfaces::Node& node);
-    ~BitcoinCore();
+    explicit InitExecutor(interfaces::Node& node);
+    ~InitExecutor();
 
 public Q_SLOTS:
     void initialize();
@@ -117,7 +117,7 @@ public Q_SLOTS:
     void windowShown(BitcoinGUI* window);
 
 private:
-    std::optional<BitcoinCore> m_executor;
+    std::optional<InitExecutor> m_executor;
     OptionsModel *optionsModel;
     ClientModel *clientModel;
     BitcoinGUI *window;

Original file line number	Diff line number	Diff line change
`@@ -155,28 +155,28 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`		`-BitcoinCore::BitcoinCore(interfaces::Node& node) :`
	`158`	`+InitExecutor::InitExecutor(interfaces::Node& node) :`
`159`	`159`	`QObject(), m_node(node)`
`160`	`160`	`{`
`161`	`161`	`this->moveToThread(&m_thread);`
`162`	`162`	`m_thread.start();`
`163`	`163`	`}`
`164`	`164`
`165`		`-BitcoinCore::~BitcoinCore()`
	`165`	`+InitExecutor::~InitExecutor()`
`166`	`166`	`{`
`167`	`167`	`qDebug() << __func__ << ": Stopping thread";`
`168`	`168`	`m_thread.quit();`
`169`	`169`	`m_thread.wait();`
`170`	`170`	`qDebug() << __func__ << ": Stopped thread";`
`171`	`171`	`}`
`172`	`172`
`173`		`-void BitcoinCore::handleRunawayException(const std::exception *e)`
	`173`	`+void InitExecutor::handleRunawayException(const std::exception *e)`
`174`	`174`	`{`
`175`	`175`	`PrintExceptionContinue(e, "Runaway exception");`
`176`	`176`	`Q_EMIT runawayException(QString::fromStdString(m_node.getWarnings().translated));`
`177`	`177`	`}`
`178`	`178`
`179`		`-void BitcoinCore::initialize()`
	`179`	`+void InitExecutor::initialize()`
`180`	`180`	`{`
`181`	`181`	`try`
`182`	`182`	`{`
`@@ -192,7 +192,7 @@ void BitcoinCore::initialize()`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
`195`		`-void BitcoinCore::shutdown()`
	`195`	`+void InitExecutor::shutdown()`
`196`	`196`	`{`
`197`	`197`	`try`
`198`	`198`	`{`
`@@ -298,11 +298,11 @@ void BitcoinApplication::startThread()`
`298`	`298`	`m_executor.emplace(node());`
`299`	`299`
`300`	`300`	`/* communication to and from thread */`
`301`		`- connect(&m_executor.value(), &BitcoinCore::initializeResult, this, &BitcoinApplication::initializeResult);`
`302`		`- connect(&m_executor.value(), &BitcoinCore::shutdownResult, this, &BitcoinApplication::shutdownResult);`
`303`		`- connect(&m_executor.value(), &BitcoinCore::runawayException, this, &BitcoinApplication::handleRunawayException);`
`304`		`- connect(this, &BitcoinApplication::requestedInitialize, &m_executor.value(), &BitcoinCore::initialize);`
`305`		`- connect(this, &BitcoinApplication::requestedShutdown, &m_executor.value(), &BitcoinCore::shutdown);`
	`301`	`+ connect(&m_executor.value(), &InitExecutor::initializeResult, this, &BitcoinApplication::initializeResult);`
	`302`	`+ connect(&m_executor.value(), &InitExecutor::shutdownResult, this, &BitcoinApplication::shutdownResult);`
	`303`	`+ connect(&m_executor.value(), &InitExecutor::runawayException, this, &BitcoinApplication::handleRunawayException);`
	`304`	`+ connect(this, &BitcoinApplication::requestedInitialize, &m_executor.value(), &InitExecutor::initialize);`
	`305`	`+ connect(this, &BitcoinApplication::requestedShutdown, &m_executor.value(), &InitExecutor::shutdown);`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`void BitcoinApplication::parameterSetup()`