frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed a compiler warning regarding cMenuChannels::Del() and MenuTimers::Del()

Browse Source
This commit is contained in:
Klaus Schmidinger 2002-11-10 16:07:58 +01:00
parent 9fee2b67ab
commit c05b788deb
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -1765,3 +1765,5 @@ Video Disk Recorder Revision History
to handle cases where the duration of an event is set wrongly and would last beyond to handle cases where the duration of an event is set wrongly and would last beyond
the start time of the next event. Besides, the change in 1.1.10 broke handling EPG the start time of the next event. Besides, the change in 1.1.10 broke handling EPG
data for NVOD channels. data for NVOD channels.
- Fixed a compiler warning regarding cMenuChannels::Del() and MenuTimers::Del() hiding
the base class virtual functions.

14
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 1.223 2002/11/10 12:32:42 kls Exp $ * $Id: menu.c 1.224 2002/11/10 16:05:15 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -669,7 +669,7 @@ protected:
eOSState Switch(void); eOSState Switch(void);
eOSState Edit(void); eOSState Edit(void);
eOSState New(void); eOSState New(void);
eOSState Del(void); eOSState Delete(void);
virtual void Move(int From, int To); virtual void Move(int From, int To);
public: public:
cMenuChannels(void); cMenuChannels(void);
@ -726,7 +726,7 @@ eOSState cMenuChannels::New(void)
return AddSubMenu(new cMenuEditChannel(Channels.Get(Current()), true)); return AddSubMenu(new cMenuEditChannel(Channels.Get(Current()), true));
} }
eOSState cMenuChannels::Del(void) eOSState cMenuChannels::Delete(void)
{ {
if (Count() > 0) { if (Count() > 0) {
int Index = Current(); int Index = Current();
@ -778,7 +778,7 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
case kOk: return Switch(); case kOk: return Switch();
case kRed: return Edit(); case kRed: return Edit();
case kGreen: return New(); case kGreen: return New();
case kYellow: return Del(); case kYellow: return Delete();
case kBlue: Mark(); break; case kBlue: Mark(); break;
default: break; default: break;
} }
@ -945,7 +945,7 @@ class cMenuTimers : public cOsdMenu {
private: private:
eOSState Edit(void); eOSState Edit(void);
eOSState New(void); eOSState New(void);
eOSState Del(void); eOSState Delete(void);
eOSState OnOff(void); eOSState OnOff(void);
virtual void Move(int From, int To); virtual void Move(int From, int To);
eOSState Summary(void); eOSState Summary(void);
@ -1012,7 +1012,7 @@ eOSState cMenuTimers::New(void)
return AddSubMenu(new cMenuEditTimer(timer->Index(), true)); return AddSubMenu(new cMenuEditTimer(timer->Index(), true));
} }
eOSState cMenuTimers::Del(void) eOSState cMenuTimers::Delete(void)
{ {
// Check if this timer is active: // Check if this timer is active:
cTimer *ti = CurrentTimer(); cTimer *ti = CurrentTimer();
@ -1061,7 +1061,7 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
case kOk: return Summary(); case kOk: return Summary();
case kRed: return Edit(); case kRed: return Edit();
case kGreen: return New(); case kGreen: return New();
case kYellow: return Del(); case kYellow: return Delete();
case kBlue: if (Setup.SortTimers) case kBlue: if (Setup.SortTimers)
OnOff(); OnOff();
else else