From 5816bbe278eb51de0e0ace65f1885f5d894aef13 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 2 Sep 2024 21:06:01 +0200 Subject: [PATCH] menue.h/cpp: Remove virtual specifier from getOption methods - Removed the 'const' specifier from CMenuOptionChooser's getOption method. - Ensured that getOption methods in derived classes do not hide the base class methods. This should avoid compiler warnings related to method hiding and ensure that the correct getOption method is used without ambiguity. Tested and verified that no new warnings or errors are introduced. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/809c0f58e43117eeb0d85acbb5ad63f4f8547339 Author: Thilo Graf Date: 2024-09-02 (Mon, 02 Sep 2024) ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 2 +- src/gui/widget/menue.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index ea7b81417..f3ae1a8e9 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -2141,7 +2141,7 @@ void CMenuOptionChooser::setOption(const int newvalue) *optionValue = newvalue; } -int CMenuOptionChooser::getOption(void) const +int CMenuOptionChooser::getOption(void) { return *optionValue; } diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index b4bfc9996..d74704d8f 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -259,7 +259,7 @@ class CMenuForwarder : public CMenuItem const std::string * option_string_ptr; CMenuTarget * jumpTarget; - virtual std::string getOption(void); + std::string getOption(void); public: @@ -479,7 +479,7 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser ~CMenuOptionChooser(); void setOption(const int newvalue); - int getOption(void) const; + int getOption(void); int getWidth(void); void setOptions(const struct keyval * const Options, const unsigned Number_Of_Options); void setOptions(const struct keyval_ext * const Options, const unsigned Number_Of_Options);