Skip to content

Commit

Permalink
qt, refactor: Fix code styling of moved InitExecutor class
Browse files Browse the repository at this point in the history
  • Loading branch information
hebasto committed Jul 14, 2021
1 parent c82165a commit 8169fc4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
12 changes: 5 additions & 7 deletions src/qt/initexecutor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include <QString>
#include <QThread>

InitExecutor::InitExecutor(interfaces::Node& node) :
QObject(), m_node(node)
InitExecutor::InitExecutor(interfaces::Node& node)
: QObject(), m_node(node)
{
this->moveToThread(&m_thread);
m_thread.start();
Expand All @@ -30,16 +30,15 @@ InitExecutor::~InitExecutor()
qDebug() << __func__ << ": Stopped thread";
}

void InitExecutor::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 InitExecutor::initialize()
{
try
{
try {
util::ThreadRename("qt-init");
qDebug() << __func__ << ": Running initialization in thread";
interfaces::BlockAndHeaderTipInfo tip_info;
Expand All @@ -54,8 +53,7 @@ void InitExecutor::initialize()

void InitExecutor::shutdown()
{
try
{
try {
qDebug() << __func__ << ": Running Shutdown in thread";
m_node.appShutdown();
qDebug() << __func__ << ": Shutdown finished";
Expand Down
6 changes: 3 additions & 3 deletions src/qt/initexecutor.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ QT_END_NAMESPACE
/** Class encapsulating Bitcoin Core startup and shutdown.
* Allows running startup and shutdown in a different thread from the UI thread.
*/
class InitExecutor: public QObject
class InitExecutor : public QObject
{
Q_OBJECT
public:
Expand All @@ -33,11 +33,11 @@ public Q_SLOTS:
Q_SIGNALS:
void initializeResult(bool success, interfaces::BlockAndHeaderTipInfo tip_info);
void shutdownResult();
void runawayException(const QString &message);
void runawayException(const QString& message);

private:
/// Pass fatal exception message to UI thread
void handleRunawayException(const std::exception *e);
void handleRunawayException(const std::exception* e);

interfaces::Node& m_node;
QThread m_thread;
Expand Down

0 comments on commit 8169fc4

Please sign in to comment.