[SCM] kodi-pvr-vdr-vnsi/master: VNSI*: add "override" keywords

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a5b06a02307fca4764fee14cd3ebaff23ae42c80
Author: Max Kellermann <max at duempel.org>
Date:   Thu Nov 5 12:05:21 2015 +0100

    VNSI*: add "override" keywords

diff --git a/src/VNSIAdmin.cpp b/src/VNSIAdmin.cpp
index a496175..cfec975 100644
--- a/src/VNSIAdmin.cpp
+++ b/src/VNSIAdmin.cpp
@@ -360,10 +360,10 @@ class cOSDRenderGL : public cOSDRender
 public:
   cOSDRenderGL();
   virtual ~cOSDRenderGL();
-  virtual void DisposeTexture(int wndId);
-  virtual void FreeResources();
-  virtual void Render();
-  virtual bool Init();
+  void DisposeTexture(int wndId) override;
+  void FreeResources() override;
+  void Render() override;
+  bool Init() override;
 protected:
   GLuint m_hwTextures[MAX_TEXTURES];
   std::queue<GLuint> m_disposedHwTextures;
@@ -610,10 +610,10 @@ class cOSDRenderDX : public cOSDRender
 public:
   cOSDRenderDX();
   virtual ~cOSDRenderDX();
-  virtual void DisposeTexture(int wndId);
-  virtual void FreeResources();
-  virtual void Render();
-  virtual void SetDevice(void *device) { m_device = (LPDIRECT3DDEVICE9)device; };
+  void DisposeTexture(int wndId) override;
+  void FreeResources() override;
+  void Render() override;
+  void SetDevice(void *device) override { m_device = (LPDIRECT3DDEVICE9)device; };
 protected:
   LPDIRECT3DDEVICE9 m_device;
   LPDIRECT3DTEXTURE9 m_hwTextures[MAX_TEXTURES];
diff --git a/src/VNSIAdmin.h b/src/VNSIAdmin.h
index f57efbb..3c523a4 100644
--- a/src/VNSIAdmin.h
+++ b/src/VNSIAdmin.h
@@ -33,7 +33,7 @@ public:
   cVNSIAdmin();
   ~cVNSIAdmin();
 
-  bool Open(const std::string& hostname, int port, const char* name = "XBMC osd client");
+  bool Open(const std::string& hostname, int port, const char* name = "XBMC osd client") override;
 
   bool OnClick(int controlId);
   bool OnFocus(int controlId);
@@ -56,9 +56,9 @@ public:
   static bool DirtyCB(GUIHANDLE cbhdl);
 
 protected:
-  virtual bool OnResponsePacket(cResponsePacket* resp);
-  virtual void OnDisconnect() {};
-  virtual void OnReconnect() {};
+  bool OnResponsePacket(cResponsePacket* resp) override;
+  void OnDisconnect() override {};
+  void OnReconnect() override {};
   bool ConnectOSD();
   bool IsVdrAction(int action);
   bool ReadChannelList(bool radio);
diff --git a/src/VNSIChannelScan.h b/src/VNSIChannelScan.h
index 754c416..ac43da0 100644
--- a/src/VNSIChannelScan.h
+++ b/src/VNSIChannelScan.h
@@ -43,7 +43,7 @@ public:
   cVNSIChannelScan();
   ~cVNSIChannelScan();
 
-  bool Open(const std::string& hostname, int port, const char* name = "XBMC channel scanner");
+  bool Open(const std::string& hostname, int port, const char* name = "XBMC channel scanner") override;
 
   bool OnClick(int controlId);
   bool OnFocus(int controlId);
@@ -57,7 +57,7 @@ public:
 
 protected:
 
-  bool OnResponsePacket(cResponsePacket* resp);
+  bool OnResponsePacket(cResponsePacket* resp) override;
 
 private:
 
diff --git a/src/VNSIData.h b/src/VNSIData.h
index 4f1d9f7..a5e5996 100644
--- a/src/VNSIData.h
+++ b/src/VNSIData.h
@@ -37,7 +37,7 @@ public:
   virtual ~cVNSIData();
 
   bool        Open(const std::string& hostname, int port, const char* name = NULL, const std::string& mac = "");
-  bool        Login();
+  bool        Login() override;
 
   bool        SupportChannelScan();
   bool        SupportRecordingsUndelete();
@@ -78,8 +78,8 @@ protected:
   virtual void *Process(void);
   virtual bool OnResponsePacket(cResponsePacket *pkt);
 
-  virtual void OnDisconnect();
-  virtual void OnReconnect();
+  void OnDisconnect() override;
+  void OnReconnect() override;
 
 private:
 
diff --git a/src/VNSIRecording.h b/src/VNSIRecording.h
index 6cbf379..afce7f4 100644
--- a/src/VNSIRecording.h
+++ b/src/VNSIRecording.h
@@ -31,7 +31,7 @@ public:
   ~cVNSIRecording();
 
   bool OpenRecording(const PVR_RECORDING& recinfo);
-  void Close();
+  void Close() override;
 
   int Read(unsigned char* buf, uint32_t buf_size);
   long long Seek(long long pos, uint32_t whence);
@@ -40,7 +40,7 @@ public:
 
 protected:
 
-  void OnReconnect();
+  void OnReconnect() override;
   void GetLength();
 
 private:

-- 
kodi-pvr-vdr-vnsi packaging