diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | channels.h | 4 | ||||
| -rw-r--r-- | config.h | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 37de3a0f..3205bdef 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -522,6 +522,7 @@ Lauri Tischler <lauri.tischler@efore.fi> for reporting a faulty parameter initialization in menu.c for reporting a problem in case the original current channel becomes unavailable due to a recording on a different transponder + for reporting a compiler warning about virtual cConfig::Load() functions Andy Carter <fruit@ukgateway.net> for helping to test new DVB-T handling @@ -2542,3 +2542,5 @@ Video Disk Recorder Revision History - Fixed a lockup in the EPG scanner when no non-primary device was available (thanks to Martin Holst for reporting this one). +- Fixed a compiler warning about virtual cConfig::Load() functions (thanks to + Lauri Tischler for reporting this one). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: channels.h 1.10 2004/01/04 12:26:37 kls Exp $ + * $Id: channels.h 1.11 2004/01/05 10:06:15 kls Exp $ */ #ifndef __CHANNELS_H @@ -156,7 +156,7 @@ private: int beingEdited; public: cChannels(void); - virtual bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false); + bool Load(const char *FileName, bool AllowComments = false, bool MustExist = false); int GetNextGroup(int Idx); // Get next channel group int GetPrevGroup(int Idx); // Get previous channel group int GetNextNormal(int Idx); // Get next normal channel (not group) @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.179 2004/01/05 09:56:54 kls Exp $ + * $Id: config.h 1.180 2004/01/05 10:05:57 kls Exp $ */ #ifndef __CONFIG_H @@ -87,7 +87,7 @@ public: cConfig(void) { fileName = NULL; } virtual ~cConfig() { free(fileName); } const char *FileName(void) { return fileName; } - virtual bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false) + bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false) { Clear(); if (FileName) { |