diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | osdbase.h | 10 |
3 files changed, 7 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d794d0be..46aedbd1 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -889,6 +889,7 @@ Ludwig Nussel <ludwig.nussel@web.de> for a patch that was used for implementing setting the user id for pointing out that the canonical spelling of codesets is with '-' for a hint on using _nl_msg_cat_cntr + for adding some missing 'const' keywords Thomas Koch <tom@harhar.net> for his support in keeping the Premiere World channels up to date in 'channels.conf' @@ -5506,3 +5506,4 @@ Video Disk Recorder Revision History - Fixed a possible blocking in replay when subtitles are active. - Fixed displaying subtitles in live mode. - Fixed handling CONFDIR (thanks to Rolf Ahrenberg). +- Added some missing 'const' keywords (thanks to Sascha Volkenandt). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osdbase.h 1.16 2007/06/09 11:49:00 kls Exp $ + * $Id: osdbase.h 1.17 2007/11/03 14:50:52 kls Exp $ */ #ifndef __OSDBASE_H @@ -57,11 +57,11 @@ public: cOsdItem(eOSState State = osUnknown); cOsdItem(const char *Text, eOSState State = osUnknown, bool Selectable = true); virtual ~cOsdItem(); - bool Selectable(void) { return selectable; } + bool Selectable(void) const { return selectable; } void SetText(const char *Text, bool Copy = true); void SetSelectable(bool Selectable); void SetFresh(bool Fresh); - const char *Text(void) { return text; } + const char *Text(void) const { return text; } virtual void Set(void) {} virtual eOSState ProcessKey(eKeys Key); }; @@ -77,7 +77,7 @@ public: cOsdObject(bool FastResponse = false) { isMenu = false; needsFastResponse = FastResponse; } virtual ~cOsdObject() {} virtual bool NeedsFastResponse(void) { return needsFastResponse; } - bool IsMenu(void) { return isMenu; } + bool IsMenu(void) const { return isMenu; } virtual void Show(void); virtual eOSState ProcessKey(eKeys Key) { return osUnknown; } }; @@ -124,7 +124,7 @@ public: cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0); virtual ~cOsdMenu(); virtual bool NeedsFastResponse(void) { return subMenu ? subMenu->NeedsFastResponse() : cOsdObject::NeedsFastResponse(); } - int Current(void) { return current; } + int Current(void) const { return current; } void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL); void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL); virtual void Display(void); |