From 7e45c5325c1798459bacb0e02ed9d0b489bc75ec Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 17 Sep 2011 19:32:27 +0000 Subject: [PATCH] neutrino channellist: style - scope of some variables limited git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1692 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ef8500638a9a374fd09580db254a7726abddae56 Author: Thilo Graf Date: 2011-09-17 (Sat, 17 Sep 2011) Origin message was: ------------------ *neutrino channellist: style - scope of some variables limited git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1692 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 147d1ea1e..b6453ac8a 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -321,7 +321,6 @@ int CChannelList::doChannelMenu(void) int select = -1; static int old_selected = 0; char cnt[5]; - t_channel_id channel_id; bool enabled = true; if(!bouquetList || g_settings.minimode) @@ -353,7 +352,7 @@ int CChannelList::doChannelMenu(void) if(select >= 0) { signed int bouquet_id = 0, old_bouquet_id = 0, new_bouquet_id = 0; old_selected = select; - channel_id = chanlist[selected]->channel_id; + t_channel_id channel_id = chanlist[selected]->channel_id; switch(select) { case 0: { hide(); @@ -786,8 +785,7 @@ int CChannelList::show() zapOnExit = true; loop = false; } - else if(g_settings.sms_channel) { - uint32_t i; + else if(g_settings.sms_channel) { unsigned char smsKey = 0; c_SMSKeyInput->setTimeout(CHANNEL_SMSKEY_TIMEOUT); @@ -798,6 +796,7 @@ int CChannelList::show() } while ((msg >= CRCInput::RC_1) && (msg <= CRCInput::RC_9)); if (msg == CRCInput::RC_timeout || msg == CRCInput::RC_nokey) { + uint32_t i; for(i = selected+1; i < chanlist.size(); i++) { char firstCharOfTitle = chanlist[i]->name.c_str()[0]; if(tolower(firstCharOfTitle) == smsKey) {