From 8046a7879b05229fba44a91f42e4515f4cf6aaac Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 1 Mar 2014 13:12:43 +0000 Subject: [PATCH] Use BuildInfo.h --- walleth/MainWin.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/walleth/MainWin.cpp b/walleth/MainWin.cpp index 58465972c..84f432413 100644 --- a/walleth/MainWin.cpp +++ b/walleth/MainWin.cpp @@ -11,6 +11,7 @@ #include #include #include +#include "BuildInfo.h" #include "MainWin.h" #include "ui_Main.h" using namespace std; @@ -55,9 +56,6 @@ using eth::c_instructionInfo; // Can get rid of this once we've sorted out ITC for signalling & multiplexed querying. Main* g_main = nullptr; -#define ADD_QUOTES_HELPER(s) #s -#define ADD_QUOTES(s) ADD_QUOTES_HELPER(s) - QEthereum::QEthereum(QObject* _p): QObject(_p) { connect(g_main, SIGNAL(changed()), SIGNAL(changed())); @@ -265,7 +263,7 @@ void Main::timerEvent(QTimerEvent *) void Main::on_about_triggered() { - QMessageBox::about(this, "About Walleth PoC-" + QString(ADD_QUOTES(ETH_VERSION)).section('.', 1, 1), "Walleth/v" ADD_QUOTES(ETH_VERSION) "/" ADD_QUOTES(ETH_BUILD_TYPE) "/" ADD_QUOTES(ETH_BUILD_PLATFORM) "\nBy Gav Wood, 2014.\nBased on a design by Vitalik Buterin.\n\nTeam Ethereum++ includes: Tim Hughes, Eric Lombrozo, Marko Simovic, Alex Leverington and several others."); + QMessageBox::about(this, "About Walleth PoC-" + QString(ETH_QUOTED(ETH_VERSION)).section('.', 1, 1), "Walleth/v" ETH_QUOTED(ETH_VERSION) "/" ETH_QUOTED(ETH_BUILD_TYPE) "/" ETH_QUOTED(ETH_BUILD_PLATFORM) "\nBy Gav Wood, 2014.\nBased on a design by Vitalik Buterin.\n\nTeam Ethereum++ includes: Tim Hughes, Eric Lombrozo, Marko Simovic, Alex Leverington and several others."); } void Main::writeSettings() @@ -358,10 +356,10 @@ void Main::refresh() void Main::on_net_triggered(bool _auto) { - string n = "Walleth/v" ADD_QUOTES(ETH_VERSION); + string n = "Walleth/v" ETH_QUOTED(ETH_VERSION); if (m_clientName.size()) n += "/" + m_clientName.toStdString(); - n += "/" ADD_QUOTES(ETH_BUILD_TYPE) "/" ADD_QUOTES(ETH_BUILD_PLATFORM); + n += "/" ETH_QUOTED(ETH_BUILD_TYPE) "/" ETH_QUOTED(ETH_BUILD_PLATFORM); client()->setClientVersion(n); if (ui->net->isChecked()) {