Cosmetic changes

This commit is contained in:
kamel5 2018-03-08 14:20:23 +01:00 committed by kamel5
parent e476e0e8c0
commit 82fb45a088
8 changed files with 49 additions and 49 deletions

2
grid.h
View File

@ -55,4 +55,4 @@ public:
virtual void debug() {};
};
#endif //__TVGUIDE_GRID_H
#endif //__TVGUIDE_GRID_H

View File

@ -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;

View File

@ -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;
}
}

View File

@ -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<cRecMenuItemFavorite*>(GetActiveMenuItem());
return activeItem->GetFavorite();
}
}

View File

@ -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<cTVGuideTimerConflict*> cTVGuideTimerConflicts::GetConflictsBetween(
conflictsFound.push_back(conflicts[i]);
}
return conflictsFound;
}
}

View File

@ -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;

32
tools.h
View File

@ -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
#endif // __TVGUIDETOOLS_H

10
view.c
View File

@ -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<cActor> *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();
}
}