basctl/source/basicide/ColorSchemeDialog.cxx | 2 +- basctl/source/basicide/baside2.cxx | 8 ++++---- basctl/source/basicide/baside2.hxx | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 52f920ebf7f27396720b140ad8ee1beab13303c7 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Wed Jan 10 08:48:25 2024 +0000 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Wed Jan 10 11:18:46 2024 +0100 cid#1583747 COPY_INSTEAD_OF_MOVE and cid#1583746 COPY_INSTEAD_OF_MOVE cid#1583745 COPY_INSTEAD_OF_MOVE cid#1583744 COPY_INSTEAD_OF_MOVE Change-Id: Ib63c469844925723645f01720f8cebc60388ae29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161875 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/basctl/source/basicide/ColorSchemeDialog.cxx b/basctl/source/basicide/ColorSchemeDialog.cxx index 7ae4cf3ccf5f..4351624e4298 100644 --- a/basctl/source/basicide/ColorSchemeDialog.cxx +++ b/basctl/source/basicide/ColorSchemeDialog.cxx @@ -34,7 +34,7 @@ namespace basctl ColorSchemeDialog::ColorSchemeDialog(weld::Window* pParent, VclPtr<ModulWindowLayout> pModulWinLayout) : GenericDialogController(pParent, "modules/BasicIDE/ui/colorscheme.ui", "ColorSchemeDialog") - , m_pModulWinLayout(pModulWinLayout) + , m_pModulWinLayout(std::move(pModulWinLayout)) , m_xSchemeList(m_xBuilder->weld_tree_view("schemelist")) , m_xUseAppCollors(m_xBuilder->weld_radio_button("opt_appcolors")) , m_xUseScheme(m_xBuilder->weld_radio_button("opt_usescheme")) diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 0f892d5683bf..8eebbdb44e8d 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -1433,9 +1433,9 @@ void ModulWindow::UpdateModule () MarkDocumentModified(m_aDocument); } -void ModulWindow::SetEditorColorScheme(OUString aColorScheme) +void ModulWindow::SetEditorColorScheme(const OUString& rColorScheme) { - m_sWinColorScheme = aColorScheme; + m_sWinColorScheme = rColorScheme; EditorWindow& rEditWindow = GetEditorWindow(); Wallpaper aBackgroundColor(GetLayout().GetSyntaxBackgroundColor()); rEditWindow.SetBackground(aBackgroundColor); @@ -1553,10 +1553,10 @@ void ModulWindowLayout::OnFirstSize (tools::Long const nWidth, tools::Long const // Applies the color scheme to the current window and updates color definitions; // note that other ModulWindow instances are not affected by calling this method -void ModulWindowLayout::ApplyColorSchemeToCurrentWindow(OUString aSchemeId) +void ModulWindowLayout::ApplyColorSchemeToCurrentWindow(const OUString& rSchemeId) { // Apply new color scheme to the UI - m_sColorSchemeId = aSchemeId; + m_sColorSchemeId = rSchemeId; aSyntaxColors.ApplyColorScheme(m_sColorSchemeId, false); } diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index bb8380bbdcc5..c07141b7079f 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -396,7 +396,7 @@ public: void UpdateModule (); OUString GetEditorColorScheme() { return m_sWinColorScheme; } - void SetEditorColorScheme(OUString aColorScheme); + void SetEditorColorScheme(const OUString& rColorScheme); }; class ModulWindowLayout: public Layout @@ -422,7 +422,7 @@ public: Color const & GetFontColor () const { return aSyntaxColors.GetFontColor(); } Color const & GetSyntaxColor (TokenType eType) const { return aSyntaxColors.GetColor(eType); } OUString GetActiveColorSchemeId() { return m_sColorSchemeId; } - void ApplyColorSchemeToCurrentWindow (OUString aSchemeId); + void ApplyColorSchemeToCurrentWindow(const OUString& rSchemeId); protected: // Window: @@ -448,7 +448,7 @@ private: virtual ~SyntaxColors () override; public: void SetActiveEditor (EditorWindow* pEditor_) { pEditor = pEditor_; } - void SetActiveColorSchemeId(OUString aColorSchemeId) { m_sActiveSchemeId = aColorSchemeId; } + void SetActiveColorSchemeId(const OUString& rColorSchemeId) { m_sActiveSchemeId = rColorSchemeId; } public: Color const & GetBackgroundColor () const { return m_aBackgroundColor; }; Color const & GetFontColor () const { return m_aFontColor; }