From 5e6b5cee3fa611082496dcd87018d2b2f94d3111 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 28 Oct 2011 22:15:59 +0000 Subject: [PATCH] neutrino eventlist: fix some compiler warnings because of copmarsion of unsigned and signed int variables git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1790 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/dcf553b10902b9853eb7fe6f8c603c53c03da206 Author: Thilo Graf Date: 2011-10-29 (Sat, 29 Oct 2011) Origin message was: ------------------ *neutrino eventlist: fix some compiler warnings because of copmarsion of unsigned and signed int variables git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1790 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/eventlist.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index d2783ae41..9f65230ae 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -344,9 +344,9 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam int step = 0; int prev_selected = selected; - if ((g_settings.key_channelList_addremind != CRCInput::RC_nokey) || + if ((g_settings.key_channelList_addremind != (int)CRCInput::RC_nokey) || ((g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) && - (g_settings.key_channelList_addrecord != CRCInput::RC_nokey))) + (g_settings.key_channelList_addrecord != (int)CRCInput::RC_nokey))) { paint_buttonbar = true; } @@ -368,7 +368,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam if (((evtlist.size() / listmaxshow) + 1) * listmaxshow == evtlist.size() + listmaxshow) // last page has full entries selected = 0; else - selected = ((step == listmaxshow) && (selected < (((evtlist.size() / listmaxshow) + 1) * listmaxshow))) ? (evtlist.size() - 1) : 0; + selected = ((step == (int)listmaxshow) && (selected < (((evtlist.size() / listmaxshow) + 1) * listmaxshow))) ? (evtlist.size() - 1) : 0; } } paintItem(prev_selected - liststart, channel_id); @@ -889,11 +889,12 @@ struct button_label EventListFourthButton[NUM_EVENTLIST_FOURTH_BUTTON] = void EventList::showFunctionBar (bool show, t_channel_id channel_id) { - int bx = x + 8; + int border_space = 4; + int bx = x + 2*border_space; int bw = width - 16; int bh = iheight; int by = y + height-iheight; - int w_button = bw / 4;// 4 cells + int w_button = bw / 4 - border_space;// 4 cells CColorKeyHelper keyhelper; //user_menue.h neutrino_msg_t dummy = CRCInput::RC_nokey;