- code alignments to master branch

This commit is contained in:
svenhoefer
2017-09-21 10:46:50 +02:00
committed by M. Liebmann
parent abfb02aa47
commit dbb726e191
3 changed files with 13 additions and 26 deletions

View File

@@ -45,19 +45,6 @@ class CPlugins
}
p_type_t;
typedef enum i_type
{
I_TYPE_DISABLED = 0x1,
/*
I_TYPE_MAIN = 0x2,
*/
I_TYPE_MULTIMEDIA = 0x4,
I_TYPE_SETTING = 0x8,
I_TYPE_SERVICE = 0x10,
I_TYPE_INFORMATION = 0x20
}
i_type_t;
private:
CFrameBuffer *frameBuffer;

View File

@@ -402,10 +402,10 @@ void CNeutrinoApp::InitMenuService()
// TODO: this needs a neutrino restart after changing parentallock_prompt to activate :-(
CLockedMenuForwarder *lf;
lf = new CLockedMenuForwarder(LOCALE_BOUQUETEDITOR_NAME, g_settings.parentallock_pincode, g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED, true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_blue);
/* does not work with CLockedMenuForwarder yet?
lf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT);
*/
personalize.addItem(MENU_SERVICE, lf, &g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT]);
//channel reset