From e60e2325b9106750303cb937229b646e88740779 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 26 Jun 2014 01:03:15 +0200 Subject: [PATCH] CXRandR: pass strings by reference, not value --- xbmc/windowing/X11/XRandR.cpp | 12 ++++++------ xbmc/windowing/X11/XRandR.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xbmc/windowing/X11/XRandR.cpp b/xbmc/windowing/X11/XRandR.cpp index 844ddc2eff5b7..458b852335c59 100644 --- a/xbmc/windowing/X11/XRandR.cpp +++ b/xbmc/windowing/X11/XRandR.cpp @@ -154,7 +154,7 @@ bool CXRandR::Query(bool force, int screennum, bool ignoreoff) return m_outputs.size() > 0; } -bool CXRandR::TurnOffOutput(std::string name) +bool CXRandR::TurnOffOutput(const std::string& name) { XOutput *output = GetOutput(name); if (!output) @@ -181,7 +181,7 @@ bool CXRandR::TurnOffOutput(std::string name) return true; } -bool CXRandR::TurnOnOutput(std::string name) +bool CXRandR::TurnOnOutput(const std::string& name) { XOutput *output = GetOutput(name); if (!output) @@ -346,7 +346,7 @@ bool CXRandR::SetMode(XOutput output, XMode mode) return true; } -XMode CXRandR::GetCurrentMode(std::string outputName) +XMode CXRandR::GetCurrentMode(const std::string& outputName) { Query(); XMode result; @@ -369,7 +369,7 @@ XMode CXRandR::GetCurrentMode(std::string outputName) return result; } -XMode CXRandR::GetPreferredMode(std::string outputName) +XMode CXRandR::GetPreferredMode(const std::string& outputName) { Query(); XMode result; @@ -449,7 +449,7 @@ void CXRandR::SetNumScreens(unsigned int num) m_bInit = false; } -bool CXRandR::IsOutputConnected(std::string name) +bool CXRandR::IsOutputConnected(const std::string& name) { bool result = false; Query(); @@ -465,7 +465,7 @@ bool CXRandR::IsOutputConnected(std::string name) return result; } -XOutput* CXRandR::GetOutput(std::string outputName) +XOutput* CXRandR::GetOutput(const std::string& outputName) { XOutput *result = 0; Query(); diff --git a/xbmc/windowing/X11/XRandR.h b/xbmc/windowing/X11/XRandR.h index 46224e4c6c727..94deb29510536 100644 --- a/xbmc/windowing/X11/XRandR.h +++ b/xbmc/windowing/X11/XRandR.h @@ -98,16 +98,16 @@ class CXRandR bool Query(bool force=false, bool ignoreoff=true); bool Query(bool force, int screennum, bool ignoreoff=true); std::vector GetModes(void); - XMode GetCurrentMode(std::string outputName); - XMode GetPreferredMode(std::string outputName); - XOutput *GetOutput(std::string outputName); + XMode GetCurrentMode(const std::string& outputName); + XMode GetPreferredMode(const std::string& outputName); + XOutput *GetOutput(const std::string& outputName); bool SetMode(XOutput output, XMode mode); void LoadCustomModeLinesToAllOutputs(void); void SaveState(); void SetNumScreens(unsigned int num); - bool IsOutputConnected(std::string name); - bool TurnOffOutput(std::string name); - bool TurnOnOutput(std::string name); + bool IsOutputConnected(const std::string& name); + bool TurnOffOutput(const std::string& name); + bool TurnOnOutput(const std::string& name); int GetCrtc(int x, int y); //bool Has1080i(); //bool Has1080p();