changeset 3618:216137e8238b draft

Merge pull request #1900 from Diapolo/optionsmodel_getters move most explicit getters in optionsmodel to header
author Wladimir J. van der Laan <laanwj@gmail.com>
date Thu, 11 Oct 2012 00:40:20 -0700
parents 4aff40e930d3 (current diff) 9fa5d7775896 (diff)
children 3871a1f86f1f
files src/qt/optionsmodel.cpp
diffstat 2 files changed, 4 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -271,23 +271,3 @@
 {
     return nTransactionFee;
 }
-
-bool OptionsModel::getMinimizeToTray()
-{
-    return fMinimizeToTray;
-}
-
-bool OptionsModel::getMinimizeOnClose()
-{
-    return fMinimizeOnClose;
-}
-
-int OptionsModel::getDisplayUnit()
-{
-    return nDisplayUnit;
-}
-
-bool OptionsModel::getDisplayAddresses()
-{
-    return bDisplayAddresses;
-}
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -44,10 +44,10 @@
 
     /* 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: