From 51ed9ec971614aebdbfbd9527aba365dd0afd437 Mon Sep 17 00:00:00 2001 From: Brandon Dahler Date: Sat, 13 Apr 2013 00:13:08 -0500 Subject: Cleanup code using forward declarations. Use misc methods of avoiding unnecesary header includes. Replace int typedefs with int##_t from stdint.h. Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h. Normalize QT_VERSION ifs where possible. Resolve some indirect dependencies as direct ones. Remove extern declarations from .cpp files. --- src/qt/optionsmodel.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/qt/optionsmodel.cpp') diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 48bf357abb..65c017f088 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -9,12 +9,12 @@ #include "optionsmodel.h" #include "bitcoinunits.h" +#include "guiutil.h" + #include "init.h" -#include "core.h" -#include "wallet.h" -#include "netbase.h" +#include "main.h" +#include "net.h" #include "walletdb.h" -#include "guiutil.h" #include @@ -200,7 +200,7 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const return QVariant(5); } case Fee: - return QVariant(nTransactionFee); + return QVariant((qint64) nTransactionFee); case DisplayUnit: return QVariant(nDisplayUnit); case DisplayAddresses: @@ -274,7 +274,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in break; case Fee: nTransactionFee = value.toLongLong(); - settings.setValue("nTransactionFee", nTransactionFee); + settings.setValue("nTransactionFee", (qint64) nTransactionFee); break; case DisplayUnit: nDisplayUnit = value.toInt(); @@ -299,7 +299,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in qint64 OptionsModel::getTransactionFee() { - return nTransactionFee; + return (qint64) nTransactionFee; } bool OptionsModel::getProxySettings(QString& proxyIP, quint16 &proxyPort) const -- cgit v1.2.3