Merge pull request #11391 from Memphiz/pr11347

3 files changed, 11 insertions, 11 deletions

diff --git a/xbmc/video/videosync/VideoSyncOsx.cpp b/xbmc/video/videosync/VideoSyncOsx.cpp
index f7173dc6b6..f6320c49b3 100644
--- a/xbmc/video/videosync/VideoSyncOsx.cpp
+++ b/xbmc/video/videosync/VideoSyncOsx.cpp
@@ -89,7 +89,7 @@ void CVideoSyncOsx::RefreshChanged()
   m_displayReset = true;
 }
 
-void CVideoSyncOsx::OnLostDevice()
+void CVideoSyncOsx::OnLostDisplay()
 {
   if (!m_displayLost)
   {
@@ -98,7 +98,7 @@ void CVideoSyncOsx::OnLostDevice()
   }
 }
 
-void CVideoSyncOsx::OnResetDevice()
+void CVideoSyncOsx::OnResetDisplay()
 {
   m_displayReset = true;
 }
diff --git a/xbmc/video/videosync/VideoSyncOsx.h b/xbmc/video/videosync/VideoSyncOsx.h
index b8b5b303cc..1a2eedcd7e 100644
--- a/xbmc/video/videosync/VideoSyncOsx.h
+++ b/xbmc/video/videosync/VideoSyncOsx.h
@@ -35,15 +35,15 @@ public:
     m_displayReset(false){};
   
   // CVideoSync interface
-  virtual bool Setup(PUPDATECLOCK func);
-  virtual void Run(std::atomic<bool>& stop);
-  virtual void Cleanup();
-  virtual float GetFps();
-  virtual void RefreshChanged();
+  virtual bool Setup(PUPDATECLOCK func) override;
+  virtual void Run(std::atomic<bool>& stop) override;
+  virtual void Cleanup() override;
+  virtual float GetFps() override;
+  virtual void RefreshChanged() override;
   
   // IDispResource interface
-  virtual void OnLostDevice();
-  virtual void OnResetDevice();
+  virtual void OnLostDisplay() override;
+  virtual void OnResetDisplay() override;
 
   // used in the displaylink callback
   void VblankHandler(int64_t nowtime, uint32_t timebase);
diff --git a/xbmc/windowing/osx/WinSystemOSX.mm b/xbmc/windowing/osx/WinSystemOSX.mm
index 43403ddb4a..d647e7967f 100644
--- a/xbmc/windowing/osx/WinSystemOSX.mm
+++ b/xbmc/windowing/osx/WinSystemOSX.mm
@@ -1737,7 +1737,7 @@ void CWinSystemOSX::AnnounceOnLostDevice()
   CSingleLock lock(m_resourceSection);
   // tell any shared resources
   CLog::Log(LOGDEBUG, "CWinSystemOSX::AnnounceOnLostDevice");
-  for (std::vector<IDispResource *>::iterator i = m_resources.begin(); i != m_resources.end(); i++)
+  for (std::vector<IDispResource *>::iterator i = m_resources.begin(); i != m_resources.end(); ++i)
     (*i)->OnLostDisplay();
 }
 
@@ -1746,7 +1746,7 @@ void CWinSystemOSX::AnnounceOnResetDevice()
   CSingleLock lock(m_resourceSection);
   // tell any shared resources
   CLog::Log(LOGDEBUG, "CWinSystemOSX::AnnounceOnResetDevice");
-  for (std::vector<IDispResource *>::iterator i = m_resources.begin(); i != m_resources.end(); i++)
+  for (std::vector<IDispResource *>::iterator i = m_resources.begin(); i != m_resources.end(); ++i)
     (*i)->OnResetDisplay();
 }