vdr/vdr/debian/patches 03_cmdsubmenu.dpatch

[Tobias Grimm]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches
In directory haydn:/tmp/cvs-serv24900/debian/patches

Modified Files:
	03_cmdsubmenu.dpatch 
Log Message:
fixed cmdsubmenu patch to not cause any more warnings because of overloading an inherited virtual method

Index: 03_cmdsubmenu.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/patches/03_cmdsubmenu.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 03_cmdsubmenu.dpatch	25 May 2004 10:26:48 -0000	1.2
+++ 03_cmdsubmenu.dpatch	26 May 2004 21:52:49 -0000	1.3
@@ -23,9 +23,9 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/chelli/vdr/cvs/vdr/vdr/config.c vdr/config.c
---- /home/chelli/vdr/cvs/vdr/vdr/config.c	2004-05-14 12:32:15.000000000 +0200
-+++ vdr/config.c	2004-05-25 12:04:18.000000000 +0200
+diff -Nur vdr.orig/config.c vdr/config.c
+--- vdr.orig/config.c	2004-05-27 00:09:53.000000000 +0200
++++ vdr/config.c	2004-05-27 01:15:23.000000000 +0200
 @@ -27,18 +27,29 @@
  {
    title = command = NULL;
@@ -133,9 +133,9 @@
  // -- cSVDRPhost -------------------------------------------------------------
  
  cSVDRPhost::cSVDRPhost(void)
-diff -urNad /home/chelli/vdr/cvs/vdr/vdr/config.h vdr/config.h
---- /home/chelli/vdr/cvs/vdr/vdr/config.h	2004-05-14 12:32:15.000000000 +0200
-+++ vdr/config.h	2004-05-25 12:03:22.000000000 +0200
+diff -Nur vdr.orig/config.h vdr/config.h
+--- vdr.orig/config.h	2004-05-27 00:09:53.000000000 +0200
++++ vdr/config.h	2004-05-27 01:15:23.000000000 +0200
 @@ -32,11 +32,15 @@
  
  #define MaxFileName 256
@@ -178,10 +178,10 @@
  
  class cSVDRPhosts : public cConfig<cSVDRPhost> {
  public:
-diff -urNad /home/chelli/vdr/cvs/vdr/vdr/Makefile vdr/Makefile
---- /home/chelli/vdr/cvs/vdr/vdr/Makefile	2004-05-25 12:03:21.000000000 +0200
-+++ vdr/Makefile	2004-05-25 12:03:22.000000000 +0200
-@@ -49,6 +49,7 @@
+diff -Nur vdr.orig/Makefile vdr/Makefile
+--- vdr.orig/Makefile	2004-05-27 00:09:52.000000000 +0200
++++ vdr/Makefile	2004-05-27 01:15:23.000000000 +0200
+@@ -48,6 +48,7 @@
  
  DEFINES += -DREMOTE_$(REMOTE)
  
@@ -189,9 +189,9 @@
  DEFINES += -D_GNU_SOURCE
  
  DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
-diff -urNad /home/chelli/vdr/cvs/vdr/vdr/menu.c vdr/menu.c
---- /home/chelli/vdr/cvs/vdr/vdr/menu.c	2004-05-14 12:32:19.000000000 +0200
-+++ vdr/menu.c	2004-05-25 12:03:22.000000000 +0200
+diff -Nur vdr.orig/menu.c vdr/menu.c
+--- vdr.orig/menu.c	2004-05-27 00:09:56.000000000 +0200
++++ vdr/menu.c	2004-05-27 01:16:41.000000000 +0200
 @@ -28,6 +28,8 @@
  #include "transfer.h"
  #include "videodir.h"
@@ -209,7 +209,7 @@
 +     if (command->hasChilds ())
 +     {
 +        cMenuCommands *menu;
-+        eOSState state = AddSubMenu(menu = new cMenuCommands(command->Title (), command->getChilds (), parameters));
++        AddSubMenu(menu = new cMenuCommands(command->Title (), command->getChilds (), parameters));
 +	return osContinue;
 +     }
 +     else
@@ -230,9 +230,31 @@
    return osContinue;
  }
  
-diff -urNad /home/chelli/vdr/cvs/vdr/vdr/tools.h vdr/tools.h
---- /home/chelli/vdr/cvs/vdr/vdr/tools.h	2004-05-14 12:32:20.000000000 +0200
-+++ vdr/tools.h	2004-05-25 12:03:22.000000000 +0200
+diff -Nur vdr.orig/osd.h vdr/osd.h
+--- vdr.orig/osd.h	2004-05-27 00:09:56.000000000 +0200
++++ vdr/osd.h	2004-05-27 01:15:51.000000000 +0200
+@@ -163,6 +163,7 @@
+   cOsdMenu(const char *Title, int c0 = 0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
+   virtual ~cOsdMenu();
+   int Current(void) { return current; }
++  using cListBase::Add;
+   void Add(cOsdItem *Item, bool Current = false, cOsdItem *After = NULL);
+   void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
+   virtual void Display(void);
+diff -Nur vdr.orig/recording.h vdr/recording.h
+--- vdr.orig/recording.h	2004-05-27 00:09:56.000000000 +0200
++++ vdr/recording.h	2004-05-27 01:16:08.000000000 +0200
+@@ -91,6 +91,7 @@
+ public:
+   bool Load(const char *RecordingFileName);
+   void Sort(void);
++  using cListBase::Add;
+   cMark *Add(int Position);
+   cMark *Get(int Position);
+   cMark *GetPrev(int Position);
+diff -Nur vdr.orig/tools.h vdr/tools.h
+--- vdr.orig/tools.h	2004-05-27 00:09:57.000000000 +0200
++++ vdr/tools.h	2004-05-27 01:15:23.000000000 +0200
 @@ -158,7 +158,7 @@
    cListBase(void);
  public: