diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-05 01:24:15 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-05 01:24:15 -0700 |
| commit | 369e3df0f88316a05bc848368f8a2f4c520695d8 (patch) | |
| tree | ea28074a88f880aeea5a11b3a1e998237aad45af | |
| parent | d37fb2070db6fe1853d99a1c7350bbb1b9dbad7d (diff) | |
| parent | bfad9982f84ef97b0f73eb260cf64e3bbeb2e8f0 (diff) | |
Merge pull request #2442 from Diapolo/Qt_RPCCon
Bitcoin-Qt: small RPCConsole cleanup
| -rw-r--r-- | src/qt/rpcconsole.cpp | 12 |
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 |