From 44bed79d5c17b058e9d34e690df81f16bd709f5d Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Wed, 28 Jul 2010 01:52:05 +0200 Subject: [PATCH] Give adjustInput() an empty default implementation and remove empty overrides. Again a slight reduction in binary size. --- src/menusetting.cpp | 4 ++++ src/menusetting.h | 2 +- src/menusettingbool.cpp | 2 -- src/menusettingbool.h | 1 - src/menusettingmultistring.cpp | 2 -- src/menusettingmultistring.h | 1 - src/menusettingstringbase.cpp | 4 ---- src/menusettingstringbase.h | 1 - 8 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/menusetting.cpp b/src/menusetting.cpp index e316368..97ff1f4 100644 --- a/src/menusetting.cpp +++ b/src/menusetting.cpp @@ -42,6 +42,10 @@ void MenuSetting::handleTS() buttonBox.handleTS(); } +void MenuSetting::adjustInput() +{ +} + void MenuSetting::drawSelected(int /*y*/) { buttonBox.paint(5); diff --git a/src/menusetting.h b/src/menusetting.h index cb0effc..32b7864 100644 --- a/src/menusetting.h +++ b/src/menusetting.h @@ -50,7 +50,7 @@ public: virtual void handleTS(); virtual void manageInput() = 0; - virtual void adjustInput() = 0; + virtual void adjustInput(); virtual void drawSelected(int y); virtual bool edited() = 0; diff --git a/src/menusettingbool.cpp b/src/menusettingbool.cpp index 76b9f00..ff3faaa 100644 --- a/src/menusettingbool.cpp +++ b/src/menusettingbool.cpp @@ -91,8 +91,6 @@ bool MenuSettingBool::value() return *_value; } -void MenuSettingBool::adjustInput() {} - bool MenuSettingBool::edited() { return originalValue != value(); diff --git a/src/menusettingbool.h b/src/menusettingbool.h index 2b90ae1..9b5a3d8 100644 --- a/src/menusettingbool.h +++ b/src/menusettingbool.h @@ -43,7 +43,6 @@ public: virtual void draw(int y); virtual void manageInput(); - virtual void adjustInput(); virtual bool edited(); void setValue(int value); diff --git a/src/menusettingmultistring.cpp b/src/menusettingmultistring.cpp index cc55790..c13dbd8 100644 --- a/src/menusettingmultistring.cpp +++ b/src/menusettingmultistring.cpp @@ -76,8 +76,6 @@ void MenuSettingMultiString::setSel(int sel) *value = (*choices)[sel]; } -void MenuSettingMultiString::adjustInput() {} - bool MenuSettingMultiString::edited() { return originalValue != *value; diff --git a/src/menusettingmultistring.h b/src/menusettingmultistring.h index 24a27bd..76787f8 100644 --- a/src/menusettingmultistring.h +++ b/src/menusettingmultistring.h @@ -43,7 +43,6 @@ public: virtual void draw(int y); virtual void manageInput(); - virtual void adjustInput(); virtual bool edited(); }; diff --git a/src/menusettingstringbase.cpp b/src/menusettingstringbase.cpp index dd762f5..9aeb34c 100644 --- a/src/menusettingstringbase.cpp +++ b/src/menusettingstringbase.cpp @@ -50,10 +50,6 @@ void MenuSettingStringBase::manageInput() if (gmenu2x->input[ACTION_B]) edit(); } -void MenuSettingStringBase::adjustInput() -{ -} - void MenuSettingStringBase::clear() { setValue(""); diff --git a/src/menusettingstringbase.h b/src/menusettingstringbase.h index b3ac6c1..979441b 100644 --- a/src/menusettingstringbase.h +++ b/src/menusettingstringbase.h @@ -40,7 +40,6 @@ public: virtual void draw(int y); virtual void manageInput(); - virtual void adjustInput(); virtual bool edited(); void setValue(const string &value) { *_value = value; }