From ef4ba9847e81fd99f92693252a0dd93ca5bd0c37 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 11 Apr 2018 16:12:03 +0200 Subject: [PATCH] ::getValue(void): remove multiple declared members Already inherited from CMenuTarget --- src/gui/widget/keyboard_input.cpp | 5 ----- src/gui/widget/keyboard_input.h | 1 - src/gui/widget/menue_target.h | 2 +- src/gui/widget/stringinput.cpp | 5 ----- src/gui/widget/stringinput.h | 1 - 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp index bcc80d5f0..3f8e51b49 100644 --- a/src/gui/widget/keyboard_input.cpp +++ b/src/gui/widget/keyboard_input.cpp @@ -529,11 +529,6 @@ void CKeyboardInput::insertChar() changed = true; } -std::string &CKeyboardInput::getValue(void) -{ - return *valueString; -} - void CKeyboardInput::forceSaveScreen(bool enable) { force_saveScreen = enable; diff --git a/src/gui/widget/keyboard_input.h b/src/gui/widget/keyboard_input.h index 31e0b94a2..67930f356 100644 --- a/src/gui/widget/keyboard_input.h +++ b/src/gui/widget/keyboard_input.h @@ -135,7 +135,6 @@ class CKeyboardInput : public CMenuTarget void hide(); int exec( CMenuTarget* parent, const std::string & actionKey ); - virtual std::string &getValue(void); void forceSaveScreen(bool enable); }; diff --git a/src/gui/widget/menue_target.h b/src/gui/widget/menue_target.h index cdc6c66f6..46524b6fa 100644 --- a/src/gui/widget/menue_target.h +++ b/src/gui/widget/menue_target.h @@ -35,7 +35,7 @@ class CMenuTarget virtual ~CMenuTarget(){} virtual void hide(){} virtual int exec(CMenuTarget* parent, const std::string & actionKey) = 0; - virtual std::string &getValue(void) { return *valueString; } + virtual std::string& getValue(void) { return *valueString; } virtual fb_pixel_t getColor(void) { return 0; } }; diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp index 9ae14319e..f69c3912c 100644 --- a/src/gui/widget/stringinput.cpp +++ b/src/gui/widget/stringinput.cpp @@ -368,11 +368,6 @@ void CStringInput::keyPlusPressed() } } -std::string &CStringInput::getValue(void) -{ - return *valueString; -} - void CStringInput::forceSaveScreen(bool enable) { force_saveScreen = enable; diff --git a/src/gui/widget/stringinput.h b/src/gui/widget/stringinput.h index f57b13628..95cf56c7e 100644 --- a/src/gui/widget/stringinput.h +++ b/src/gui/widget/stringinput.h @@ -92,7 +92,6 @@ class CStringInput : public CMenuTarget void hide(); int exec( CMenuTarget* parent, const std::string & actionKey ); void setMinMax(const int min_value, const int max_value); - virtual std::string &getValue(void); void forceSaveScreen(bool enable); };