From 82fb45a0884dedc205e9cb80766cbf213276e06f Mon Sep 17 00:00:00 2001 From: kamel5 Date: Thu, 8 Mar 2018 14:20:23 +0100 Subject: [PATCH] Cosmetic changes --- grid.h | 2 +- recmanager.c | 6 +++--- recmenuitem.c | 32 ++++++++++++++++---------------- recmenus.c | 6 +++--- timerconflict.c | 8 ++++---- tools.c | 2 +- tools.h | 32 ++++++++++++++++---------------- view.c | 10 +++++----- 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/grid.h b/grid.h index bd35af1..d717047 100644 --- a/grid.h +++ b/grid.h @@ -55,4 +55,4 @@ public: virtual void debug() {}; }; -#endif //__TVGUIDE_GRID_H \ No newline at end of file +#endif //__TVGUIDE_GRID_H diff --git a/recmanager.c b/recmanager.c index 1b03353..f2abc71 100644 --- a/recmanager.c +++ b/recmanager.c @@ -710,7 +710,7 @@ const cEvent **cRecManager::LoadReruns(const cEvent *event, int &numResults) { strQuery += "~"; if (!isempty(event->ShortText())) strQuery += event->ShortText(); - data.useSubTitle = true; + data.useSubTitle = true; } else { data.useSubTitle = false; } @@ -769,7 +769,7 @@ const cEvent **cRecManager::WhatsOnNow(bool nowOrNext, int &numResults) { #if VDRVERSNUM >= 20301 LOCK_SCHEDULES_READ; LOCK_CHANNELS_READ; - const cChannels* channels = Channels; +// const cChannels* channels = Channels; const cSchedules* schedules = Schedules; #else cSchedulesLock schedulesLock; @@ -846,7 +846,7 @@ const cEvent **cRecManager::UserDefinedTime(int userTime, int &numResults) { #if VDRVERSNUM >= 20301 LOCK_CHANNELS_READ; LOCK_SCHEDULES_READ; - const cChannels* channels = Channels; +// const cChannels* channels = Channels; const cSchedules* schedules = Schedules; #else cSchedulesLock schedulesLock; diff --git a/recmenuitem.c b/recmenuitem.c index 318c667..6390381 100644 --- a/recmenuitem.c +++ b/recmenuitem.c @@ -562,7 +562,7 @@ void cRecMenuItemSelect::DrawValue(void) { } eRecMenuState cRecMenuItemSelect::ProcessKey(eKeys Key) { - int oldValue = currentVal; +// int oldValue = currentVal; switch (Key & ~k_Repeat) { case kLeft: currentVal--; @@ -664,7 +664,7 @@ void cRecMenuItemSelectDirectory::DrawValue(void) { } eRecMenuState cRecMenuItemSelectDirectory::ProcessKey(eKeys Key) { - int oldValue = currentVal; +// int oldValue = currentVal; switch (Key & ~k_Repeat) { case kLeft: currentVal--; @@ -1180,18 +1180,18 @@ eRecMenuState cRecMenuItemText::ProcessKey(eKeys Key) { case kDown|k_Repeat: case kDown: if (InEditMode()) { - if (insert && newchar) { - // create a new character in insert mode - if (lengthUtf8 < length - 1) - Insert(); - } - if (uppercase) - valueUtf8[pos] = Utf8to(upper, Inc(Utf8to(lower, valueUtf8[pos]), NORMALKEY(Key) == kUp)); - else - valueUtf8[pos] = Inc( valueUtf8[pos], NORMALKEY(Key) == kUp); - newchar = false; - consumed = true; - } + if (insert && newchar) { + // create a new character in insert mode + if (lengthUtf8 < length - 1) + Insert(); + } + if (uppercase) + valueUtf8[pos] = Utf8to(upper, Inc(Utf8to(lower, valueUtf8[pos]), NORMALKEY(Key) == kUp)); + else + valueUtf8[pos] = Inc( valueUtf8[pos], NORMALKEY(Key) == kUp); + newchar = false; + consumed = true; + } break; case k0|k_Repeat ... k9|k_Repeat: case k0 ... k9: { @@ -1901,7 +1901,7 @@ void cRecMenuItemEvent::Show(void) { } eRecMenuState cRecMenuItemEvent::ProcessKey(eKeys Key) { - bool consumed = false; +// bool consumed = false; switch (Key & ~k_Repeat) { case kOk: return action; @@ -2960,4 +2960,4 @@ eRecMenuState cRecMenuItemFavoriteStatic::ProcessKey(eKeys Key) { break; } return rmsNotConsumed; -} \ No newline at end of file +} diff --git a/recmenus.c b/recmenus.c index bb2e3df..3d783a1 100644 --- a/recmenus.c +++ b/recmenus.c @@ -411,7 +411,7 @@ cRecMenuConfirmRerunUsed::cRecMenuConfirmRerunUsed(const cEvent *original, const // --- cRecMenuEditTimer --------------------------------------------------------- #if VDRVERSNUM >= 20301 cRecMenuEditTimer::cRecMenuEditTimer(const cTimer *timer, eRecMenuState nextState) { - const cTimer *originalTimer; +// const cTimer *originalTimer; #else cRecMenuEditTimer::cRecMenuEditTimer(cTimer *timer, eRecMenuState nextState) { #endif @@ -1429,7 +1429,7 @@ void cRecMenuTimeline::GetTimersForDay(void) { timersToday.clear(); #if VDRVERSNUM >= 20301 LOCK_TIMERS_READ; - const cTimers* timers = Timers; +// const cTimers* timers = Timers; for (const cTimer *t = Timers->First(); t; t = Timers->Next(t)) { #else for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) { @@ -1632,4 +1632,4 @@ int cRecMenuFavorites::GetTotalNumMenuItems(void) { cTVGuideSearchTimer cRecMenuFavorites::GetFavorite(void) { cRecMenuItemFavorite *activeItem = dynamic_cast(GetActiveMenuItem()); return activeItem->GetFavorite(); -} \ No newline at end of file +} diff --git a/timerconflict.c b/timerconflict.c index 1312f7f..cd0eb14 100644 --- a/timerconflict.c +++ b/timerconflict.c @@ -79,9 +79,9 @@ void cTVGuideTimerConflicts::AddConflict(std::string epgSearchConflictLine) { } void cTVGuideTimerConflicts::CalculateConflicts(void) { - numConflicts = conflicts.size(); - time_t startTime = 0; - time_t endTime = 0; + numConflicts = conflicts.size(); +// time_t startTime = 0; +// time_t endTime = 0; for (int i=0; i < numConflicts; i++) { cTimeInterval *unionSet = NULL; int numTimers = conflicts[i]->timerIDs.size(); @@ -184,4 +184,4 @@ std::vector cTVGuideTimerConflicts::GetConflictsBetween( conflictsFound.push_back(conflicts[i]); } return conflictsFound; -} \ No newline at end of file +} diff --git a/tools.c b/tools.c index b4eef16..6caaf1c 100644 --- a/tools.c +++ b/tools.c @@ -463,7 +463,7 @@ int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy) return 0; } -static int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy) +int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy) { register Uint FilterR = 0; register Uint FilterR1; diff --git a/tools.h b/tools.h index 9dfab27..3d2e84f 100644 --- a/tools.h +++ b/tools.h @@ -45,27 +45,27 @@ typedef unsigned int Uint; typedef struct { - Uint *R, - *R1, - *RP, - *S, - *RI; - Uint *FilterS; + Uint *R, + *R1, + *RP, + *S, + *RI; + Uint *FilterS; - int Map[256]; - int FilterMap[256]; - int k; - Uint mask_ok; - Uint filter_ok; - Uint filter_shift; - int r_size; - int FilterSet; + int Map[256]; + int FilterMap[256]; + int k; + Uint mask_ok; + Uint filter_ok; + Uint filter_shift; + int r_size; + int FilterSet; } AFUZZY; void afuzzy_init(const char *p, int kerr, int UseFilter, AFUZZY *fuzzy); void afuzzy_free(AFUZZY *fuzzy); int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy); -static int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy); +int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy); #endif -#endif // __TVGUIDETOOLS_H \ No newline at end of file +#endif // __TVGUIDETOOLS_H diff --git a/view.c b/view.c index 9d1b7e3..49b64f0 100644 --- a/view.c +++ b/view.c @@ -137,9 +137,9 @@ void cView::DrawHeader(void) { } else { #if VDRVERSNUM >= 20301 LOCK_TIMERS_READ; - ti=Timers->GetMatch(event, &timerMatch); + ti = Timers->GetMatch(event, &timerMatch); #else - ti=Timers.GetMatch(event, &timerMatch); + ti = Timers.GetMatch(event, &timerMatch); #endif } if (timerMatch == tmFull) { @@ -357,7 +357,7 @@ void cView::DrawActors(std::vector *actors) { int y = 2 * border + fontHeaderLarge->Height(); if (!Running()) return; - cImageLoader imgLoader; + cImageLoader imgLoader; int actor = 0; for (int row = 0; row < picLines; row++) { for (int col = 0; col < picsPerLine; col++) { @@ -475,7 +475,7 @@ bool cView::KeyUp(void) { if (!scrollable) return false; int aktHeight = pixmapContent->DrawPort().Point().Y(); - int lineHeight = font->Height(); +// int lineHeight = font->Height(); if (aktHeight >= 0) { return false; } @@ -1053,4 +1053,4 @@ void cMovieView::Action(void) { } DrawScrollbar(); osdManager.flush(); -} \ No newline at end of file +}