move getTransactionFee to OptionsModel

diff --git a/gui/include/clientmodel.h b/gui/include/clientmodel.h
index 44f1c0a..49b3460 100644 (file)
--- a/gui/include/clientmodel.h
+++ b/gui/include/clientmodel.h
@@ -29,8 +29,6 @@ public:
     int getNumBlocks();
     int getNumTransactions();
 
-    qint64 getTransactionFee();
-
     StatusCode sendCoins(const QString &payTo, qint64 payAmount);
 private:
     OptionsModel *options_model;

diff --git a/gui/include/optionsmodel.h b/gui/include/optionsmodel.h
index 4dd21c7..3e0bcc1 100644 (file)
--- a/gui/include/optionsmodel.h
+++ b/gui/include/optionsmodel.h
@@ -3,6 +3,7 @@
 
 #include <QAbstractListModel>
 
+/* Configuration data structure for bitcoin client */
 class OptionsModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -25,6 +26,8 @@ public:
     QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
     bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
 
+    /* Explicit getters */
+    qint64 getTransactionFee();
 signals:
 
 public slots:

diff --git a/gui/src/clientmodel.cpp b/gui/src/clientmodel.cpp
index 3582472..641c515 100644 (file)
--- a/gui/src/clientmodel.cpp
+++ b/gui/src/clientmodel.cpp
@@ -54,11 +54,6 @@ int ClientModel::getNumTransactions()
     return numTransactions;
 }
 
-qint64 ClientModel::getTransactionFee()
-{
-    return nTransactionFee;
-}
-
 void ClientModel::update()
 {
     emit balanceChanged(getBalance());

diff --git a/gui/src/optionsmodel.cpp b/gui/src/optionsmodel.cpp
index 25c7366..e3287f3 100644 (file)
--- a/gui/src/optionsmodel.cpp
+++ b/gui/src/optionsmodel.cpp
@@ -50,3 +50,8 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
     emit dataChanged(index, index);
     return true;
 }
+
+qint64 OptionsModel::getTransactionFee()
+{
+    return nTransactionFee;
+}

diff --git a/gui/src/sendcoinsdialog.cpp b/gui/src/sendcoinsdialog.cpp
index 9040d21..a6ab601 100644 (file)
--- a/gui/src/sendcoinsdialog.cpp
+++ b/gui/src/sendcoinsdialog.cpp
@@ -4,6 +4,7 @@
 
 #include "addressbookdialog.h"
 #include "bitcoinaddressvalidator.h"
+#include "optionsmodel.h"
 
 #include <QApplication>
 #include <QClipboard>
@@ -86,7 +87,7 @@ void SendCoinsDialog::on_sendButton_clicked()
     case ClientModel::AmountWithFeeExceedsBalance:
         QMessageBox::warning(this, tr("Send Coins"),
             tr("Total exceeds your balance when the %1 transaction fee is included").
-                arg(QString::fromStdString(FormatMoney(model->getTransactionFee()))),
+                arg(QString::fromStdString(FormatMoney(model->getOptionsModel()->getTransactionFee()))),
             QMessageBox::Ok, QMessageBox::Ok);
         ui->payAmount->setFocus();
         break;