aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-04-02 11:24:10 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-04-02 16:42:23 +0200
commitbfad9982f84ef97b0f73eb260cf64e3bbeb2e8f0 (patch)
treec9b2c67e538f2333a5314a51ad332b89d21b7e06 /src
parenta977b8c475a84e858ec86bbffe88e03e9a30dddc (diff)
downloadbitcoin-bfad9982f84ef97b0f73eb260cf64e3bbeb2e8f0.tar.xz
Bitcoin-Qt: small RPCConsole cleanup
- add missing initalisation for clientModel - remove unneded RPCExecutor::start() code
Diffstat (limited to 'src')
-rw-r--r--src/qt/rpcconsole.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index c9ce374346..50f22b877a 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -38,7 +38,6 @@ class RPCExecutor : public QObject
Q_OBJECT
public slots:
- void start();
void request(const QString &command);
signals:
@@ -47,11 +46,6 @@ signals:
#include "rpcconsole.moc"
-void RPCExecutor::start()
-{
- // Nothing to do
-}
-
/**
* Split shell command line into a list of arguments. Aims to emulate \c bash and friends.
*
@@ -187,6 +181,7 @@ void RPCExecutor::request(const QString &command)
RPCConsole::RPCConsole(QWidget *parent) :
QDialog(parent),
ui(new Ui::RPCConsole),
+ clientModel(0),
historyPtr(0)
{
ui->setupUi(this);
@@ -384,16 +379,15 @@ void RPCConsole::browseHistory(int offset)
void RPCConsole::startExecutor()
{
- QThread* thread = new QThread;
+ QThread *thread = new QThread;
RPCExecutor *executor = new RPCExecutor();
executor->moveToThread(thread);
- // Notify executor when thread started (in executor thread)
- connect(thread, SIGNAL(started()), executor, SLOT(start()));
// Replies from executor object must go to this object
connect(executor, SIGNAL(reply(int,QString)), this, SLOT(message(int,QString)));
// Requests from this object must go to executor
connect(this, SIGNAL(cmdRequest(QString)), executor, SLOT(request(QString)));
+
// On stopExecutor signal
// - queue executor for deletion (in execution thread)
// - quit the Qt event loop in the execution thread