From d9a2730470664086b5eeda2e9311b996c17975b0 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 14 Sep 2010 17:13:29 +0000 Subject: [PATCH] fix Wextra compil git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@770 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/15c474a6d8ed42b20aecfd1d9412feec136a8fa7 Author: Jacek Jendrzej Date: 2010-09-14 (Tue, 14 Sep 2010) Origin message was: ------------------ fix Wextra compil git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@770 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- lib/libcoolstream/pwrmngr.h | 2 +- src/gui/eventlist.cpp | 4 ++-- src/gui/eventlist.h | 2 +- src/system/flashtool.cpp | 2 +- src/system/lastchannel.cpp | 2 +- src/system/setting_helpers.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libcoolstream/pwrmngr.h b/lib/libcoolstream/pwrmngr.h index 0adbb267d..3adf7c73b 100644 --- a/lib/libcoolstream/pwrmngr.h +++ b/lib/libcoolstream/pwrmngr.h @@ -38,7 +38,7 @@ private: bool opened; PWR_STATE powerState; // - static void ApplicationCallback(void *hHandle, void *pUserData, signed long eEvent, void *pEventData, void *pTag) {} +// static void ApplicationCallback(void *hHandle, void *pUserData, signed long eEvent, void *pEventData, void *pTag) {} bool SetState(PWR_STATE PowerState); public: bool Open(void); diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 16c2bceb9..9f03148d9 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -284,7 +284,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam if(channelname_prev.empty(), channelname_next.empty()){ paintHead(channel_id, channelname); }else{ - paintHead(channel_id, channelname, channelname_prev, channelname_next); + paintHead(channelname, channelname_prev, channelname_next); } paint(channel_id); @@ -788,7 +788,7 @@ void EventList::paintItem(unsigned int pos, t_channel_id channel_idI) g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]->RenderString(x+10+iw, ypos+ fheight, width- 25- 20, evtlist[liststart+pos].description, color, 0, true); } } -void EventList::paintHead(t_channel_id _channel_id, std::string _channelname, std::string _channelname_prev, std::string _channelname_next) +void EventList::paintHead(std::string _channelname, std::string _channelname_prev, std::string _channelname_next) { const short font_h = 8; int iw = 0, ih = 0; diff --git a/src/gui/eventlist.h b/src/gui/eventlist.h index ab7a47c3e..dea8e4c5c 100644 --- a/src/gui/eventlist.h +++ b/src/gui/eventlist.h @@ -107,7 +107,7 @@ class EventList void paintItem(unsigned pos, t_channel_id channel_id = 0); void paint(t_channel_id channel_id = 0); void paintHead(t_channel_id channel_id, std::string name); - void paintHead(t_channel_id _channel_id, std::string _channelname, std::string _channelname_prev, std::string _channelname_next); + void paintHead(std::string _channelname, std::string _channelname_prev, std::string _channelname_next); void hide(); void showFunctionBar(bool show); CTimerd::CTimerEventTypes isScheduled(t_channel_id channel_id, CChannelEvent * event, int * tID = NULL); diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp index 3f527fabf..e2c625fe3 100644 --- a/src/system/flashtool.cpp +++ b/src/system/flashtool.cpp @@ -426,7 +426,7 @@ const char *CFlashVersionInfo::getType(void) const } } -const int CFlashVersionInfo::getVersion(void) const +int CFlashVersionInfo::getVersion(void) const { return version; } diff --git a/src/system/lastchannel.cpp b/src/system/lastchannel.cpp index 235f56035..d960d9e64 100644 --- a/src/system/lastchannel.cpp +++ b/src/system/lastchannel.cpp @@ -37,7 +37,7 @@ void CLastChannel::clear (void) // -- Store only if channel != last channel and time store delay is large enough // forceStoreToLastChannels default to false -void CLastChannel::store (int channel, t_channel_id channel_id, bool forceStoreToLastChannels) +void CLastChannel::store (int channel, t_channel_id channel_id, bool /* forceStoreToLastChannels */) { struct timeval tv; unsigned long lastTimestamp(0); diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index e3c157f98..c073f3440 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -961,7 +961,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK } return true; } -bool CLedControlNotifier::changeNotify(const neutrino_locale_t, void * data) +bool CLedControlNotifier::changeNotify(const neutrino_locale_t, void* /*data*/) { CVFD::getInstance()->setled(); return true;