Browse Source

remove unused CalledSetStatusBar and UIThreadCall notifications

0.8
Wladimir J. van der Laan 13 years ago
parent
commit
f0b5e9e116
  1. 3
      src/main.cpp
  2. 9
      src/noui.h
  3. 10
      src/qt/bitcoin.cpp
  4. 3
      src/qtui.h

3
src/main.cpp

@ -3450,8 +3450,6 @@ void static BitcoinMiner(CWallet *pwallet)
dHashesPerSec = 1000.0 * nHashCounter / (GetTimeMillis() - nHPSTimerStart); dHashesPerSec = 1000.0 * nHashCounter / (GetTimeMillis() - nHPSTimerStart);
nHPSTimerStart = GetTimeMillis(); nHPSTimerStart = GetTimeMillis();
nHashCounter = 0; nHashCounter = 0;
string strStatus = strprintf(" %.0f khash/s", dHashesPerSec/1000.0);
UIThreadCall(boost::bind(CalledSetStatusBar, strStatus, 0));
static int64 nLogTime; static int64 nLogTime;
if (GetTime() - nLogTime > 30 * 60) if (GetTime() - nLogTime > 30 * 60)
{ {
@ -3508,7 +3506,6 @@ void static ThreadBitcoinMiner(void* parg)
vnThreadsRunning[THREAD_MINER]--; vnThreadsRunning[THREAD_MINER]--;
PrintException(NULL, "ThreadBitcoinMiner()"); PrintException(NULL, "ThreadBitcoinMiner()");
} }
UIThreadCall(boost::bind(CalledSetStatusBar, "", 0));
nHPSTimerStart = 0; nHPSTimerStart = 0;
if (vnThreadsRunning[THREAD_MINER] == 0) if (vnThreadsRunning[THREAD_MINER] == 0)
dHashesPerSec = 0; dHashesPerSec = 0;

9
src/noui.h

@ -6,7 +6,6 @@
#define BITCOIN_NOUI_H #define BITCOIN_NOUI_H
#include <string> #include <string>
#include <boost/function.hpp>
#include "wallet.h" #include "wallet.h"
typedef void wxWindow; typedef void wxWindow;
@ -55,14 +54,6 @@ inline bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption,
return true; return true;
} }
inline void CalledSetStatusBar(const std::string& strText, int nField)
{
}
inline void UIThreadCall(boost::function0<void> fn)
{
}
inline void MainFrameRepaint() inline void MainFrameRepaint()
{ {
} }

10
src/qt/bitcoin.cpp

@ -88,16 +88,6 @@ void ThreadSafeHandleURL(const std::string& strURL)
Q_ARG(QString, QString::fromStdString(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<void> fn)
{
// Only used for built-in mining, which is disabled, simple ignore
}
void MainFrameRepaint() void MainFrameRepaint()
{ {
if(clientmodel) if(clientmodel)

3
src/qtui.h

@ -5,7 +5,6 @@
#define BITCOIN_EXTERNUI_H #define BITCOIN_EXTERNUI_H
#include <string> #include <string>
#include <boost/function/function0.hpp>
#include "wallet.h" #include "wallet.h"
typedef void wxWindow; 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 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 bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption, wxWindow* parent);
extern void ThreadSafeHandleURL(const std::string& strURL); extern void ThreadSafeHandleURL(const std::string& strURL);
extern void CalledSetStatusBar(const std::string& strText, int nField);
extern void UIThreadCall(boost::function0<void> fn);
extern void MainFrameRepaint(); extern void MainFrameRepaint();
extern void AddressBookRepaint(); extern void AddressBookRepaint();
extern void InitMessage(const std::string &message); extern void InitMessage(const std::string &message);

Loading…
Cancel
Save