Cosmetic changes / SwitchTimer& operator / std:min,std:max

This commit is contained in:
kamel5
2018-03-08 13:30:41 +01:00
committed by kamel5
parent 6ae27238af
commit bf2937d86c
22 changed files with 157 additions and 142 deletions

View File

@@ -115,7 +115,7 @@ public:
// --- cRecMenuEditTimer ---------------------------------------------------------
class cRecMenuEditTimer: public cRecMenu {
private:
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
#if VDRVERSNUM >= 20301
const cTimer *originalTimer;
#else
cTimer *originalTimer;
@@ -128,7 +128,7 @@ private:
int lifetime;
char folder[TEXTINPUTLENGTH];
public:
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
#if VDRVERSNUM >= 20301
cRecMenuEditTimer(const cTimer *timer, eRecMenuState nextState);
const cTimer *GetOriginalTimer(void);
#else
@@ -157,7 +157,7 @@ class cRecMenuSeriesTimer: public cRecMenu {
int lifetime;
void CalculateTimes(const cEvent *event);
public:
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
#if VDRVERSNUM >= 20301
cRecMenuSeriesTimer(const cChannel *initialChannel, const cEvent *event, std::string folder);
#else
cRecMenuSeriesTimer(cChannel *initialChannel, const cEvent *event, std::string folder);
@@ -425,14 +425,14 @@ public:
class cRecMenuRecordingSearchResults: public cRecMenu {
private:
std::string searchString;
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
#if VDRVERSNUM >= 20301
const cRecording **searchResults;
#else
cRecording **searchResults;
#endif
int numResults;
public:
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
#if VDRVERSNUM >= 20301
cRecMenuRecordingSearchResults(std::string searchString, const cRecording **searchResults, int numResults);
#else
cRecMenuRecordingSearchResults(std::string searchString, cRecording **searchResults, int numResults);
@@ -459,7 +459,7 @@ public:
// --- cRecMenuTimeline ---------------------------------------------------------
class cRecMenuTimeline: public cRecMenu {
private:
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
#if VDRVERSNUM >= 20301
std::vector<const cTimer*> timersToday;
#else
std::vector<cTimer*> timersToday;
@@ -484,7 +484,7 @@ public:
virtual ~cRecMenuTimeline(void) {
};
eRecMenuState ProcessKey(eKeys Key);
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
#if VDRVERSNUM >= 20301
const cTimer *GetTimer(void);
#else
cTimer *GetTimer(void);