Mercurial > hg > bitcoin

changeset 1176:b1a09eca2755 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
solve warnings at startup
author Wladimir J. van der Laan <laanwj@gmail.com>
date Thu, 14 Jul 2011 21:21:17 +0200
parents 432dc400ef33
children 7cfdbfe359dd 977c1feaad07
files src/qt/bitcoingui.cpp src/qt/overviewpage.cpp src/qt/sendcoinsdialog.cpp src/qt/sendcoinsdialog.h src/qt/walletmodel.cpp src/qt/walletmodel.h
diffstat 6 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -84,7 +84,7 @@
     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);
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -49,7 +49,7 @@
 
     // 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)));
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -125,11 +125,6 @@
     }
 }
 
-void SendCoinsDialog::on_buttonBox_rejected()
-{
-    reject();
-}
-
 void SendCoinsDialog::on_payTo_textChanged(const QString &address)
 {
     ui->addAsLabel->setText(model->getAddressTableModel()->labelForAddress(address));
--- a/src/qt/sendcoinsdialog.h
+++ b/src/qt/sendcoinsdialog.h
@@ -29,7 +29,6 @@
 
 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();
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -48,7 +48,7 @@
     // 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();
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -47,7 +47,7 @@
     TransactionTableModel *transactionTableModel;
 
 signals:
-    void balanceChanged(qint64 balance);
+    void balanceChanged(qint64 balance, qint64 unconfirmedBalance);
     void numTransactionsChanged(int count);
 
     // Asynchronous error notification