From bbdc79c42cab79ac8c5bfb34ac7dd73668b46205 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Wed, 9 Apr 2014 06:49:03 +0200 Subject: [PATCH] CPersonalizeGui: Replaces CMenuOptionChooser::getOptionName() by getName() Signed-off-by: Thilo Graf partial revert of b6b44d9088785df4e406d685328183dc518e8379 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ee99902be36c47cec0a0e2f03a8c084ab3cf087a Author: Michael Liebmann Date: 2014-04-09 (Wed, 09 Apr 2014) --- src/gui/personalize.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp index b7c34509c..e9b1e6050 100644 --- a/src/gui/personalize.cpp +++ b/src/gui/personalize.cpp @@ -545,7 +545,7 @@ int CPersonalizeGui::ShowMenuOptions(const int& widget) //required for first view: check active mode of option chooser and disable if it's an observed item and item mode is set to 'not visible' for (uint j = 0; j < v_observ.size(); j++) - if (opt->getOptionName()== g_Locale->getText(v_observ[j].to_observ_locale) && *p_mode == PERSONALIZE_MODE_NOTVISIBLE) + if (opt->getName()== g_Locale->getText(v_observ[j].to_observ_locale) && *p_mode == PERSONALIZE_MODE_NOTVISIBLE) opt->setActive(false); pm->addItem(opt); //add option chooser @@ -612,7 +612,7 @@ bool CPersonalizeGui::changeNotify(const neutrino_locale_t locale, void *data) { //if found an optionchooser, then extract option name CMenuOptionChooser* chooser = static_cast (item); - string opt_name = chooser->getOptionName(); + string opt_name = chooser->getName(); for (uint j = 0; j < v_observ.size(); j++) {