diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-14 21:21:17 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-14 21:21:17 +0200 |
commit | 77b615cebabbe7274e6409f95dda61e393a75e7f (patch) | |
tree | 07901d56a620471ce4f6edf191241dd738a186a5 | |
parent | 2a097fc5edc2f22aefe520a7578bb4b2e53cb6f2 (diff) |
solve warnings at startup
-rw-r--r-- | src/qt/bitcoingui.cpp | 2 | ||||
-rw-r--r-- | src/qt/overviewpage.cpp | 2 | ||||
-rw-r--r-- | src/qt/sendcoinsdialog.cpp | 5 | ||||
-rw-r--r-- | src/qt/sendcoinsdialog.h | 1 | ||||
-rw-r--r-- | src/qt/walletmodel.cpp | 2 | ||||
-rw-r--r-- | src/qt/walletmodel.h | 2 |
6 files changed, 4 insertions, 10 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 0c66bd4ca7..016f261941 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -84,7 +84,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): QVBoxLayout *vbox = new QVBoxLayout(); transactionView = new TransactionView(this); - connect(transactionView, SIGNAL(doubleClicked(const QModelIndex&)), transactionView, SLOT(transactionDetails())); + connect(transactionView, SIGNAL(doubleClicked(const QModelIndex&)), transactionView, SLOT(showDetails())); vbox->addWidget(transactionView); transactionsPage = new QWidget(this); diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index c620200b49..d991f0d7ba 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -49,7 +49,7 @@ void OverviewPage::setModel(WalletModel *model) // Keep up to date with wallet setBalance(model->getBalance(), model->getUnconfirmedBalance()); - connect(model, SIGNAL(balanceChanged(qint64)), this, SLOT(setBalance(qint64))); + connect(model, SIGNAL(balanceChanged(qint64, qint64)), this, SLOT(setBalance(qint64, qint64))); setNumTransactions(model->getNumTransactions()); connect(model, SIGNAL(numTransactionsChanged(int)), this, SLOT(setNumTransactions(int))); diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 4adda7e8fd..01d68dc0af 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -125,11 +125,6 @@ void SendCoinsDialog::on_addressBookButton_clicked() } } -void SendCoinsDialog::on_buttonBox_rejected() -{ - reject(); -} - void SendCoinsDialog::on_payTo_textChanged(const QString &address) { ui->addAsLabel->setText(model->getAddressTableModel()->labelForAddress(address)); diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h index 4e019b7296..46814af466 100644 --- a/src/qt/sendcoinsdialog.h +++ b/src/qt/sendcoinsdialog.h @@ -29,7 +29,6 @@ private: private slots: void on_payTo_textChanged(const QString &address); - void on_buttonBox_rejected(); void on_addressBookButton_clicked(); void on_pasteButton_clicked(); void on_sendButton_clicked(); diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 3e7152da14..afe095c977 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -48,7 +48,7 @@ void WalletModel::update() // Plainly emit all signals for now. To be more efficient this should check // whether the values actually changed first, although it'd be even better if these // were events coming in from the bitcoin core. - emit balanceChanged(getBalance()); + emit balanceChanged(getBalance(), wallet->GetUnconfirmedBalance()); emit numTransactionsChanged(getNumTransactions()); addressTableModel->update(); diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 4c34cfbb59..1105fb03fa 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -47,7 +47,7 @@ private: TransactionTableModel *transactionTableModel; signals: - void balanceChanged(qint64 balance); + void balanceChanged(qint64 balance, qint64 unconfirmedBalance); void numTransactionsChanged(int count); // Asynchronous error notification |