Make functions const-correct and static

2 files changed, 28 insertions, 23 deletions

diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp
index bd3d9ae5a5..2d9b2a2069 100644
--- a/xbmc/guilib/StereoscopicsManager.cpp
+++ b/xbmc/guilib/StereoscopicsManager.cpp
@@ -127,7 +127,7 @@ void CStereoscopicsManager::Initialize(void)
   SetStereoMode(RENDER_STEREO_MODE_OFF);
 }
 
-RENDER_STEREO_MODE CStereoscopicsManager::GetStereoMode(void)
+RENDER_STEREO_MODE CStereoscopicsManager::GetStereoMode(void) const
 {
   return (RENDER_STEREO_MODE) m_settings.GetInt(CSettings::SETTING_VIDEOSCREEN_STEREOSCOPICMODE);
 }
@@ -159,7 +159,7 @@ void CStereoscopicsManager::SetStereoMode(const RENDER_STEREO_MODE &mode)
   }
 }
 
-RENDER_STEREO_MODE CStereoscopicsManager::GetNextSupportedStereoMode(const RENDER_STEREO_MODE &currentMode, int step)
+RENDER_STEREO_MODE CStereoscopicsManager::GetNextSupportedStereoMode(const RENDER_STEREO_MODE &currentMode, int step) const
 {
   RENDER_STEREO_MODE mode = currentMode;
   do {
@@ -170,7 +170,7 @@ RENDER_STEREO_MODE CStereoscopicsManager::GetNextSupportedStereoMode(const RENDE
   return mode;
 }
 
-std::string CStereoscopicsManager::DetectStereoModeByString(const std::string &needle)
+std::string CStereoscopicsManager::DetectStereoModeByString(const std::string &needle) const
 {
   std::string stereoMode;
   std::string searchString(needle);
@@ -209,7 +209,7 @@ std::string CStereoscopicsManager::DetectStereoModeByString(const std::string &n
   return stereoMode;
 }
 
-RENDER_STEREO_MODE CStereoscopicsManager::GetStereoModeByUserChoice(const std::string &heading)
+RENDER_STEREO_MODE CStereoscopicsManager::GetStereoModeByUserChoice(const std::string &heading /* = "" */) const
 {
   RENDER_STEREO_MODE mode = GetStereoMode();
   // if no stereo mode is set already, suggest mode of current video by preselecting it
@@ -255,7 +255,7 @@ RENDER_STEREO_MODE CStereoscopicsManager::GetStereoModeByUserChoice(const std::s
   return mode;
 }
 
-RENDER_STEREO_MODE CStereoscopicsManager::GetStereoModeOfPlayingVideo(void)
+RENDER_STEREO_MODE CStereoscopicsManager::GetStereoModeOfPlayingVideo(void) const
 {
   RENDER_STEREO_MODE mode = RENDER_STEREO_MODE_OFF;
   std::string playerMode = GetVideoStereoMode();
@@ -271,7 +271,7 @@ RENDER_STEREO_MODE CStereoscopicsManager::GetStereoModeOfPlayingVideo(void)
   return mode;
 }
 
-const std::string &CStereoscopicsManager::GetLabelForStereoMode(const RENDER_STEREO_MODE &mode) const
+std::string CStereoscopicsManager::GetLabelForStereoMode(const RENDER_STEREO_MODE &mode) const
 {
   int msgId;
   switch(mode) {
@@ -300,7 +300,7 @@ const std::string &CStereoscopicsManager::GetLabelForStereoMode(const RENDER_STE
   return g_localizeStrings.Get(msgId);
 }
 
-RENDER_STEREO_MODE CStereoscopicsManager::GetPreferredPlaybackMode(void)
+RENDER_STEREO_MODE CStereoscopicsManager::GetPreferredPlaybackMode(void) const
 {
   return (RENDER_STEREO_MODE) m_settings.GetInt(CSettings::SETTING_VIDEOSCREEN_PREFEREDSTEREOSCOPICMODE);
 }
@@ -505,7 +505,7 @@ void CStereoscopicsManager::ApplyStereoMode(const RENDER_STEREO_MODE &mode, bool
   }
 }
 
-std::string CStereoscopicsManager::GetVideoStereoMode()
+std::string CStereoscopicsManager::GetVideoStereoMode() const
 {
   std::string playerMode;
   if (g_application.GetAppPlayer().IsPlaying())
@@ -513,7 +513,7 @@ std::string CStereoscopicsManager::GetVideoStereoMode()
   return playerMode;
 }
 
-bool CStereoscopicsManager::IsVideoStereoscopic()
+bool CStereoscopicsManager::IsVideoStereoscopic() const
 {
   std::string mode = GetVideoStereoMode();
   return !mode.empty() && mode != "mono";
diff --git a/xbmc/guilib/StereoscopicsManager.h b/xbmc/guilib/StereoscopicsManager.h
index 24288954ff..feb7a25274 100644
--- a/xbmc/guilib/StereoscopicsManager.h
+++ b/xbmc/guilib/StereoscopicsManager.h
@@ -52,31 +52,36 @@ public:
   ~CStereoscopicsManager(void) override;
 
   void Initialize(void);
-  RENDER_STEREO_MODE GetStereoMode(void);
+
+  RENDER_STEREO_MODE GetStereoMode(void) const;
+
   void SetStereoModeByUser(const RENDER_STEREO_MODE &mode);
   void SetStereoMode(const RENDER_STEREO_MODE &mode);
-  RENDER_STEREO_MODE GetNextSupportedStereoMode(const RENDER_STEREO_MODE &currentMode, int step = 1);
-  std::string DetectStereoModeByString(const std::string &needle);
-  RENDER_STEREO_MODE GetStereoModeByUserChoice(const std::string &heading = "");
-  RENDER_STEREO_MODE GetStereoModeOfPlayingVideo(void);
-  const std::string &GetLabelForStereoMode(const RENDER_STEREO_MODE &mode) const;
-  RENDER_STEREO_MODE GetPreferredPlaybackMode(void);
-  int ConvertVideoToGuiStereoMode(const std::string &mode);
+
+  RENDER_STEREO_MODE GetNextSupportedStereoMode(const RENDER_STEREO_MODE &currentMode, int step = 1) const;
+  std::string DetectStereoModeByString(const std::string &needle) const;
+  RENDER_STEREO_MODE GetStereoModeByUserChoice(const std::string &heading = "") const;
+  RENDER_STEREO_MODE GetStereoModeOfPlayingVideo(void) const;
+  std::string GetLabelForStereoMode(const RENDER_STEREO_MODE &mode) const;
+  RENDER_STEREO_MODE GetPreferredPlaybackMode(void) const;
+  static int ConvertVideoToGuiStereoMode(const std::string &mode);
   /**
    * @brief will convert a string representation into a GUI stereo mode
    * @param mode The string to convert
    * @return -1 if not found, otherwise the according int of the RENDER_STEREO_MODE enum
    */
-  int ConvertStringToGuiStereoMode(const std::string &mode);
-  const char* ConvertGuiStereoModeToString(const RENDER_STEREO_MODE &mode);
+  static int ConvertStringToGuiStereoMode(const std::string &mode);
+  static const char* ConvertGuiStereoModeToString(const RENDER_STEREO_MODE &mode);
+
   /**
    * @brief Converts a stereoscopics related action/command from Builtins and JsonRPC into the according cAction ID.
    * @param command The command/action
    * @param parameter The parameter of the command
    * @return The integer of the according cAction or -1 if not valid
    */
-  CAction ConvertActionCommandToAction(const std::string &command, const std::string &parameter);
-  std::string NormalizeStereoMode(const std::string &mode);
+  static CAction ConvertActionCommandToAction(const std::string &command, const std::string &parameter);
+  static std::string NormalizeStereoMode(const std::string &mode);
+
   void OnSettingChanged(std::shared_ptr<const CSetting> setting) override;
   void OnStreamChange();
   bool OnMessage(CGUIMessage &message) override;
@@ -90,8 +95,8 @@ public:
 private:
   void ApplyStereoMode(const RENDER_STEREO_MODE &mode, bool notify = true);
   void OnPlaybackStopped(void);
-  std::string GetVideoStereoMode();
-  bool IsVideoStereoscopic();
+  std::string GetVideoStereoMode() const;
+  bool IsVideoStereoscopic() const;
 
   // Construction parameters
   CSettings &m_settings;