aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-10-11 00:40:20 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2012-10-11 00:40:20 -0700
commitfae3989ffc5102af00a932fcf72b5be1e8566912 (patch)
tree52fef323be753ffb4a460bb04ebd2c2a0710c46a
parent089b10a28a3dfbfcc579594e0ca12fe07932893d (diff)
parent7bc65ff1083c726391923fddac86e5abc4b0f2db (diff)
downloadbitcoin-fae3989ffc5102af00a932fcf72b5be1e8566912.tar.xz
Merge pull request #1900 from Diapolo/optionsmodel_getters
move most explicit getters in optionsmodel to header
-rw-r--r--src/qt/optionsmodel.cpp20
-rw-r--r--src/qt/optionsmodel.h8
2 files changed, 4 insertions, 24 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 756fe61ecd..1b2f18eab3 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -271,23 +271,3 @@ qint64 OptionsModel::getTransactionFee()
{
return nTransactionFee;
}
-
-bool OptionsModel::getMinimizeToTray()
-{
- return fMinimizeToTray;
-}
-
-bool OptionsModel::getMinimizeOnClose()
-{
- return fMinimizeOnClose;
-}
-
-int OptionsModel::getDisplayUnit()
-{
- return nDisplayUnit;
-}
-
-bool OptionsModel::getDisplayAddresses()
-{
- return bDisplayAddresses;
-}
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 34724ad032..2d86a7a9ca 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -44,10 +44,10 @@ public:
/* Explicit getters */
qint64 getTransactionFee();
- bool getMinimizeToTray();
- bool getMinimizeOnClose();
- int getDisplayUnit();
- bool getDisplayAddresses();
+ bool getMinimizeToTray() { return fMinimizeToTray; }
+ bool getMinimizeOnClose() { return fMinimizeOnClose; }
+ int getDisplayUnit() { return nDisplayUnit; }
+ bool getDisplayAddresses() { return bDisplayAddresses; }
QString getLanguage() { return language; }
private: