Merge pull request #3489

laanwj · laanwj · commit 65515c0d0567 · 2014-01-06T16:06:52.000+01:00
2a72015 qt: Remove unused method OptionsModel::getTransactionFee (Wladimir J. van der Laan)
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
@@ -307,11 +307,6 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
     return successful;
 }
 
-qint64 OptionsModel::getTransactionFee()
-{
-    return (qint64) nTransactionFee;
-}
-
 bool OptionsModel::getProxySettings(QString& proxyIP, quint16 &proxyPort) const
 {
     std::string proxy = GetArg("-proxy", "");
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
@@ -48,7 +48,6 @@ class OptionsModel : public QAbstractListModel
     bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
 
     /* Explicit getters */
-    qint64 getTransactionFee();
     bool getMinimizeToTray() { return fMinimizeToTray; }
     bool getMinimizeOnClose() { return fMinimizeOnClose; }
     int getDisplayUnit() { return nDisplayUnit; }

Original file line number	Diff line number	Diff line change
`@@ -307,11 +307,6 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in`
`307`	`307`	`return successful;`
`308`	`308`	`}`
`309`	`309`
`310`		`-qint64 OptionsModel::getTransactionFee()`
`311`		`-{`
`312`		`- return (qint64) nTransactionFee;`
`313`		`-}`
`314`		`-`
`315`	`310`	`bool OptionsModel::getProxySettings(QString& proxyIP, quint16 &proxyPort) const`
`316`	`311`	`{`
`317`	`312`	`std::string proxy = GetArg("-proxy", "");`