noui: Move handlers to header file

This commit is contained in:
MarcoFalke 2018-09-06 14:49:40 -04:00
parent adf27b531a
commit dd031e3839
2 changed files with 14 additions and 5 deletions

View file

@ -14,7 +14,7 @@
#include <boost/signals2/connection.hpp> #include <boost/signals2/connection.hpp>
static bool noui_ThreadSafeMessageBox(const std::string& message, const std::string& caption, unsigned int style) bool noui_ThreadSafeMessageBox(const std::string& message, const std::string& caption, unsigned int style)
{ {
bool fSecure = style & CClientUIInterface::SECURE; bool fSecure = style & CClientUIInterface::SECURE;
style &= ~CClientUIInterface::SECURE; style &= ~CClientUIInterface::SECURE;
@ -41,19 +41,18 @@ static bool noui_ThreadSafeMessageBox(const std::string& message, const std::str
return false; return false;
} }
static bool noui_ThreadSafeQuestion(const std::string& /* ignored interactive message */, const std::string& message, const std::string& caption, unsigned int style) bool noui_ThreadSafeQuestion(const std::string& /* ignored interactive message */, const std::string& message, const std::string& caption, unsigned int style)
{ {
return noui_ThreadSafeMessageBox(message, caption, style); return noui_ThreadSafeMessageBox(message, caption, style);
} }
static void noui_InitMessage(const std::string& message) void noui_InitMessage(const std::string& message)
{ {
LogPrintf("init message: %s\n", message); LogPrintf("init message: %s\n", message);
} }
void noui_connect() void noui_connect()
{ {
// Connect bitcoind signal handlers
uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox); uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox);
uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion); uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion);
uiInterface.InitMessage_connect(noui_InitMessage); uiInterface.InitMessage_connect(noui_InitMessage);

View file

@ -5,6 +5,16 @@
#ifndef BITCOIN_NOUI_H #ifndef BITCOIN_NOUI_H
#define BITCOIN_NOUI_H #define BITCOIN_NOUI_H
extern void noui_connect(); #include <string>
/** Non-GUI handler, which logs and prints messages. */
bool noui_ThreadSafeMessageBox(const std::string& message, const std::string& caption, unsigned int style);
/** Non-GUI handler, which logs and prints questions. */
bool noui_ThreadSafeQuestion(const std::string& /* ignored interactive message */, const std::string& message, const std::string& caption, unsigned int style);
/** Non-GUI handler, which only logs a message. */
void noui_InitMessage(const std::string& message);
/** Connect all bitcoind signal handlers */
void noui_connect();
#endif // BITCOIN_NOUI_H #endif // BITCOIN_NOUI_H