From d8784ed362a1d72b34abcbfa6db869eec592f694 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Mon, 23 Feb 2015 15:52:48 +0100 Subject: [PATCH] Avoid too many wornings about slots/signals. --- alethzero/MainWin.cpp | 13 ++++--------- alethzero/MainWin.h | 10 ++++++---- alethzero/Transact.cpp | 4 ++-- alethzero/Transact.h | 12 ++++++------ 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index c40e8f6a0..39bc0ad43 100644 --- a/alethzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -1458,7 +1458,7 @@ void Main::on_debugCurrent_triggered() } } -void Main::on_debugDumpState_triggered(int _add) +void Main::debugDumpState(int _add) { if (auto item = ui->blocks->currentItem()) { @@ -1479,11 +1479,6 @@ void Main::on_debugDumpState_triggered(int _add) } } -void Main::on_debugDumpStatePre_triggered() -{ - on_debugDumpState_triggered(0); -} - void Main::on_contracts_currentItemChanged() { ui->contractInfo->clear(); @@ -1511,7 +1506,7 @@ void Main::on_contracts_currentItemChanged() } } -void Main::on_idealPeers_valueChanged() +void Main::on_idealPeers_valueChanged(int) { m_webThree->setIdealPeerCount(ui->idealPeers->value()); } @@ -1523,11 +1518,11 @@ void Main::on_ourAccounts_doubleClicked() qApp->clipboard()->setText(QString::fromStdString(toHex(h.asArray()))); } -void Main::on_log_doubleClicked() +/*void Main::on_log_doubleClicked() { ui->log->setPlainText(""); m_logHistory.clear(); -} +}*/ void Main::on_accounts_doubleClicked() { diff --git a/alethzero/MainWin.h b/alethzero/MainWin.h index 52b98d293..638469fbe 100644 --- a/alethzero/MainWin.h +++ b/alethzero/MainWin.h @@ -109,7 +109,7 @@ private slots: void on_go_triggered(); void on_net_triggered(); void on_connect_triggered(); - void on_idealPeers_valueChanged(); + void on_idealPeers_valueChanged(int); // Mining void on_mine_triggered(); @@ -142,7 +142,7 @@ private slots: void on_blocks_currentItemChanged(); // Logging - void on_log_doubleClicked(); +// void on_log_doubleClicked(); void on_verbosity_valueChanged(); // Misc @@ -162,8 +162,8 @@ private slots: // Debugger void on_debugCurrent_triggered(); - void on_debugDumpState_triggered(int _add = 1); - void on_debugDumpStatePre_triggered(); + void on_debugDumpState_triggered() { debugDumpState(1); } + void on_debugDumpStatePre_triggered() { debugDumpState(0); } // Whisper void on_newIdentity_triggered(); @@ -177,6 +177,8 @@ signals: void poll(); private: + void debugDumpState(int _add); + dev::p2p::NetworkPreferences netPrefs() const; QString lookup(QString const& _n) const; diff --git a/alethzero/Transact.cpp b/alethzero/Transact.cpp index 1b9a62a2d..c59c80c39 100644 --- a/alethzero/Transact.cpp +++ b/alethzero/Transact.cpp @@ -55,7 +55,7 @@ Transact::Transact(Context* _c, QWidget* _parent): ui->valueUnits->setCurrentIndex(6); ui->gasPriceUnits->setCurrentIndex(4); ui->gasPrice->setValue(10); - on_destination_currentTextChanged(); + on_destination_currentTextChanged(QString()); } Transact::~Transact() @@ -147,7 +147,7 @@ string Transact::getFunctionHashes(dev::solidity::CompilerStack const& _compiler return ret; } -void Transact::on_destination_currentTextChanged() +void Transact::on_destination_currentTextChanged(QString) { if (ui->destination->currentText().size() && ui->destination->currentText() != "(Create Contract)") if (Address a = m_context->fromString(ui->destination->currentText())) diff --git a/alethzero/Transact.h b/alethzero/Transact.h index afb45f62d..f14005eff 100644 --- a/alethzero/Transact.h +++ b/alethzero/Transact.h @@ -44,12 +44,12 @@ public: void setEnvironment(QList _myKeys, dev::eth::Client* _eth, NatSpecFace* _natSpecDB); private slots: - void on_destination_currentTextChanged(); - void on_value_valueChanged() { updateFee(); } - void on_gas_valueChanged() { updateFee(); } - void on_valueUnits_currentIndexChanged() { updateFee(); } - void on_gasPriceUnits_currentIndexChanged() { updateFee(); } - void on_gasPrice_valueChanged() { updateFee(); } + void on_destination_currentTextChanged(QString); + void on_value_valueChanged(int) { updateFee(); } + void on_gas_valueChanged(int) { updateFee(); } + void on_valueUnits_currentIndexChanged(int) { updateFee(); } + void on_gasPriceUnits_currentIndexChanged(int) { updateFee(); } + void on_gasPrice_valueChanged(int) { updateFee(); } void on_data_textChanged() { rejigData(); } void on_optimize_clicked() { rejigData(); } void on_send_clicked();