From f15ba92898bcdf7fd90d88d8cf0243ff8f747fb2 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 31 Jan 2014 11:16:06 +0100 Subject: [PATCH] CKeyValue:: -fix get current name , fix -Wconversion in timerd Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2441171656cc2e5e0ed7b4dc6b46bcb2d4d92309 Author: Jacek Jendrzej Date: 2014-01-31 (Fri, 31 Jan 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/keychooser.cpp | 2 +- src/timerd/timermanager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/widget/keychooser.cpp b/src/gui/widget/keychooser.cpp index 41f325273..ed146b8fa 100644 --- a/src/gui/widget/keychooser.cpp +++ b/src/gui/widget/keychooser.cpp @@ -53,7 +53,7 @@ public: keyvalue = k; }; - virtual const char * getString(void) + virtual const char * getName(void) { the_text = g_Locale->getText(LOCALE_KEYCHOOSERMENU_CURRENTKEY); the_text += ": "; diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index 0c2f7135d..5493f126d 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -1147,13 +1147,13 @@ CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId): eventInfo.epgID = config->getInt64("EVENT_INFO_EPG_ID_"+id); dprintf("read EVENT_INFO_EPG_ID_%s %ld\n",id.c_str(),(long)eventInfo.epgID); - eventInfo.epg_starttime = config->getInt64("EVENT_INFO_EPG_STARTTIME_"+id); + eventInfo.epg_starttime = (long int)config->getInt64("EVENT_INFO_EPG_STARTTIME_"+id); dprintf("read EVENT_INFO_EPG_STARTTIME_%s %ld\n",id.c_str(),(long)eventInfo.epg_starttime); eventInfo.channel_id = config->getInt64("EVENT_INFO_CHANNEL_ID_"+id); dprintf("read EVENT_INFO_CHANNEL_ID_%s %ld\n",id.c_str(),(long)eventInfo.channel_id); - eventInfo.apids = config->getInt32("EVENT_INFO_APIDS_"+id); + eventInfo.apids = (unsigned char)config->getInt32("EVENT_INFO_APIDS_"+id); dprintf("read EVENT_INFO_APIDS_%s 0x%X (%p)\n",id.c_str(),eventInfo.apids,&eventInfo.apids); recordingDir = config->getString("REC_DIR_"+id);