From f0b5e9e116a1eb8b19b3676e7f8b125e912a78f3 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sat, 24 Mar 2012 19:11:39 +0100 Subject: [PATCH] remove unused CalledSetStatusBar and UIThreadCall notifications --- src/main.cpp | 3 --- src/noui.h | 9 --------- src/qt/bitcoin.cpp | 10 ---------- src/qtui.h | 3 --- 4 files changed, 25 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index ca75b9fdb..ca589e54f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3450,8 +3450,6 @@ void static BitcoinMiner(CWallet *pwallet) dHashesPerSec = 1000.0 * nHashCounter / (GetTimeMillis() - nHPSTimerStart); nHPSTimerStart = GetTimeMillis(); nHashCounter = 0; - string strStatus = strprintf(" %.0f khash/s", dHashesPerSec/1000.0); - UIThreadCall(boost::bind(CalledSetStatusBar, strStatus, 0)); static int64 nLogTime; if (GetTime() - nLogTime > 30 * 60) { @@ -3508,7 +3506,6 @@ void static ThreadBitcoinMiner(void* parg) vnThreadsRunning[THREAD_MINER]--; PrintException(NULL, "ThreadBitcoinMiner()"); } - UIThreadCall(boost::bind(CalledSetStatusBar, "", 0)); nHPSTimerStart = 0; if (vnThreadsRunning[THREAD_MINER] == 0) dHashesPerSec = 0; diff --git a/src/noui.h b/src/noui.h index e4faa2ed0..e91cca3cf 100644 --- a/src/noui.h +++ b/src/noui.h @@ -6,7 +6,6 @@ #define BITCOIN_NOUI_H #include -#include #include "wallet.h" typedef void wxWindow; @@ -55,14 +54,6 @@ inline bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption, return true; } -inline void CalledSetStatusBar(const std::string& strText, int nField) -{ -} - -inline void UIThreadCall(boost::function0 fn) -{ -} - inline void MainFrameRepaint() { } diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index f330feedb..e91855bec 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -88,16 +88,6 @@ void ThreadSafeHandleURL(const std::string& strURL) Q_ARG(QString, QString::fromStdString(strURL))); } -void CalledSetStatusBar(const std::string& strText, int nField) -{ - // Only used for built-in mining, which is disabled, simple ignore -} - -void UIThreadCall(boost::function0 fn) -{ - // Only used for built-in mining, which is disabled, simple ignore -} - void MainFrameRepaint() { if(clientmodel) diff --git a/src/qtui.h b/src/qtui.h index 70952da70..662b231cd 100644 --- a/src/qtui.h +++ b/src/qtui.h @@ -5,7 +5,6 @@ #define BITCOIN_EXTERNUI_H #include -#include #include "wallet.h" typedef void wxWindow; @@ -41,8 +40,6 @@ extern int MyMessageBox(const std::string& message, const std::string& caption=" extern int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style=wxOK, wxWindow* parent=NULL, int x=-1, int y=-1); extern bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption, wxWindow* parent); extern void ThreadSafeHandleURL(const std::string& strURL); -extern void CalledSetStatusBar(const std::string& strText, int nField); -extern void UIThreadCall(boost::function0 fn); extern void MainFrameRepaint(); extern void AddressBookRepaint(); extern void InitMessage(const std::string &message);