From b03dc964f6df8f6c558f92426982ff6ee017c15d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 11 Dec 2018 22:14:03 +0100 Subject: [PATCH] lcd4l-setup: just code reformatting (using astyle) Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/adeb6c8248d017993a06dfe481faec1116db7ddb Author: vanhofen Date: 2018-12-11 (Tue, 11 Dec 2018) Origin message was: ------------------ - lcd4l-setup: just code reformatting (using astyle) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/lcd4l_setup.cpp | 15 ++++++++------- src/gui/lcd4l_setup.h | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index aa24efff0..f92996d2a 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -89,15 +89,16 @@ CLCD4lSetup::~CLCD4lSetup() { } -int CLCD4lSetup::exec(CMenuTarget* parent, const std::string &actionkey) +int CLCD4lSetup::exec(CMenuTarget *parent, const std::string &actionkey) { printf("CLCD4lSetup::exec: actionkey %s\n", actionkey.c_str()); int res = menu_return::RETURN_REPAINT; - if (parent) - parent->hide(); + if (parent) + parent->hide(); - if (actionkey == "lcd4l_logodir") { + if (actionkey == "lcd4l_logodir") + { const char *action_str = "lcd4l_logodir"; chooserDir(g_settings.lcd4l_logodir, false, action_str); return menu_return::RETURN_REPAINT; @@ -136,7 +137,7 @@ int CLCD4lSetup::show() int temp_lcd4l_brightness = g_settings.lcd4l_brightness; // lcd4l setup - CMenuWidget* lcd4lSetup = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_LCD4L_SETUP); + CMenuWidget *lcd4lSetup = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_LCD4L_SETUP); lcd4lSetup->addIntroItems(LOCALE_LCD4L_SUPPORT); mc = new CMenuOptionChooser(LOCALE_LCD4L_SUPPORT, &g_settings.lcd4l_support, LCD4L_SUPPORT_OPTIONS, LCD4L_SUPPORT_OPTION_COUNT, true, this, CRCInput::RC_red); @@ -176,14 +177,14 @@ int CLCD4lSetup::show() const char *flag_lcd4l_weather = FLAGDIR "/.lcd-weather"; int fake_lcd4l_weather = file_exists(flag_lcd4l_weather); - CTouchFileNotifier * lcd_weather = new CTouchFileNotifier(flag_lcd4l_weather); + CTouchFileNotifier *lcd_weather = new CTouchFileNotifier(flag_lcd4l_weather); mc = new CMenuOptionChooser(LOCALE_LCD4L_WEATHER, &fake_lcd4l_weather, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, (file_exists("/share/lcd/scripts/weather")), lcd_weather, CRCInput::convertDigitToKey(shortcut++)); mc->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_WEATHER); lcd4lSetup->addItem(mc); const char *flag_lcd4l_clock_a = FLAGDIR "/.lcd-clock_a"; int fake_lcd4l_clock_a = file_exists(flag_lcd4l_clock_a); - CTouchFileNotifier * lcd_clock_a = new CTouchFileNotifier(flag_lcd4l_clock_a); + CTouchFileNotifier *lcd_clock_a = new CTouchFileNotifier(flag_lcd4l_clock_a); mc = new CMenuOptionChooser(LOCALE_LCD4L_CLOCK_A, &fake_lcd4l_clock_a, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, lcd_clock_a, CRCInput::convertDigitToKey(shortcut++)); mc->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_CLOCK_A); lcd4lSetup->addItem(mc); diff --git a/src/gui/lcd4l_setup.h b/src/gui/lcd4l_setup.h index fb6c94ef5..217f4e1e2 100644 --- a/src/gui/lcd4l_setup.h +++ b/src/gui/lcd4l_setup.h @@ -38,7 +38,7 @@ class CLCD4lSetup : public CMenuTarget, CChangeObserver private: CMenuOptionNumberChooser *nc; CMenuOptionChooser *mc; - CMenuForwarder * mf; + CMenuForwarder *mf; int width; int show(); @@ -46,7 +46,7 @@ class CLCD4lSetup : public CMenuTarget, CChangeObserver public: CLCD4lSetup(); ~CLCD4lSetup(); - int exec(CMenuTarget* parent, const std::string &actionkey); + int exec(CMenuTarget *parent, const std::string &actionkey); virtual bool changeNotify(const neutrino_locale_t OptionName, void * /*data*/); };