diff options
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/edit/textdat2.hxx | 4 | ||||
-rw-r--r-- | vcl/source/edit/textdata.cxx | 4 | ||||
-rw-r--r-- | vcl/source/uitest/uiobject.cxx | 24 | ||||
-rw-r--r-- | vcl/source/uitest/uno/uiobject_uno.cxx | 3 |
4 files changed, 18 insertions, 17 deletions
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index d74541e7e75b..d715845d45e6 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -87,8 +87,8 @@ public: std::vector<TETextPortion*>::const_iterator end() const; bool empty() const; std::size_t size() const; - std::vector<TETextPortion*>::iterator erase( std::vector<TETextPortion*>::iterator aIter ); - std::vector<TETextPortion*>::iterator insert( std::vector<TETextPortion*>::iterator aIter, + std::vector<TETextPortion*>::iterator erase( const std::vector<TETextPortion*>::iterator& aIter ); + std::vector<TETextPortion*>::iterator insert( const std::vector<TETextPortion*>::iterator& aIter, TETextPortion* pTP ); void push_back( TETextPortion* pTP ); diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx index ea6bd1d1ef0e..f3a65d5275e0 100644 --- a/vcl/source/edit/textdata.cxx +++ b/vcl/source/edit/textdata.cxx @@ -93,12 +93,12 @@ std::size_t TETextPortionList::size() const return maPortions.size(); } -std::vector<TETextPortion*>::iterator TETextPortionList::erase( std::vector<TETextPortion*>::iterator aIter ) +std::vector<TETextPortion*>::iterator TETextPortionList::erase( const std::vector<TETextPortion*>::iterator& aIter ) { return maPortions.erase( aIter ); } -std::vector<TETextPortion*>::iterator TETextPortionList::insert( std::vector<TETextPortion*>::iterator aIter, +std::vector<TETextPortion*>::iterator TETextPortionList::insert( const std::vector<TETextPortion*>::iterator& aIter, TETextPortion* pTP ) { return maPortions.insert( aIter, pTP ); diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index 6f0ff412e98e..70637a0e8a66 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -262,7 +262,7 @@ OUString to_string(const Size& rSize) } -WindowUIObject::WindowUIObject(VclPtr<vcl::Window> xWindow): +WindowUIObject::WindowUIObject(const VclPtr<vcl::Window>& xWindow): mxWindow(xWindow) { } @@ -525,7 +525,7 @@ std::unique_ptr<UIObject> WindowUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new WindowUIObject(pWindow)); } -ButtonUIObject::ButtonUIObject(VclPtr<Button> xButton): +ButtonUIObject::ButtonUIObject(const VclPtr<Button>& xButton): WindowUIObject(xButton), mxButton(xButton) { @@ -565,7 +565,7 @@ std::unique_ptr<UIObject> ButtonUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new ButtonUIObject(pButton)); } -DialogUIObject::DialogUIObject(VclPtr<Dialog> xDialog): +DialogUIObject::DialogUIObject(const VclPtr<Dialog>& xDialog): WindowUIObject(xDialog), mxDialog(xDialog) { @@ -595,7 +595,7 @@ std::unique_ptr<UIObject> DialogUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new DialogUIObject(pDialog)); } -EditUIObject::EditUIObject(VclPtr<Edit> xEdit): +EditUIObject::EditUIObject(const VclPtr<Edit>& xEdit): WindowUIObject(xEdit), mxEdit(xEdit) { @@ -668,7 +668,7 @@ std::unique_ptr<UIObject> EditUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new EditUIObject(pEdit)); } -CheckBoxUIObject::CheckBoxUIObject(VclPtr<CheckBox> xCheckbox): +CheckBoxUIObject::CheckBoxUIObject(const VclPtr<CheckBox>& xCheckbox): WindowUIObject(xCheckbox), mxCheckBox(xCheckbox) { @@ -708,7 +708,7 @@ std::unique_ptr<UIObject> CheckBoxUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new CheckBoxUIObject(pCheckBox)); } -RadioButtonUIObject::RadioButtonUIObject(VclPtr<RadioButton> xRadioButton): +RadioButtonUIObject::RadioButtonUIObject(const VclPtr<RadioButton>& xRadioButton): WindowUIObject(xRadioButton), mxRadioButton(xRadioButton) { @@ -746,7 +746,7 @@ std::unique_ptr<UIObject> RadioButtonUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new RadioButtonUIObject(pRadioButton)); } -TabPageUIObject::TabPageUIObject(VclPtr<TabPage> xTabPage): +TabPageUIObject::TabPageUIObject(const VclPtr<TabPage>& xTabPage): WindowUIObject(xTabPage), mxTabPage(xTabPage) { @@ -777,7 +777,7 @@ OUString TabPageUIObject::get_name() const return OUString("TabPageUIObject"); } -ListBoxUIObject::ListBoxUIObject(VclPtr<ListBox> xListBox): +ListBoxUIObject::ListBoxUIObject(const VclPtr<ListBox>& xListBox): WindowUIObject(xListBox), mxListBox(xListBox) { @@ -851,7 +851,7 @@ std::unique_ptr<UIObject> ListBoxUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new ListBoxUIObject(pListBox)); } -ComboBoxUIObject::ComboBoxUIObject(VclPtr<ComboBox> xComboBox): +ComboBoxUIObject::ComboBoxUIObject(const VclPtr<ComboBox>& xComboBox): WindowUIObject(xComboBox), mxComboBox(xComboBox) { @@ -909,7 +909,7 @@ std::unique_ptr<UIObject> ComboBoxUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new ComboBoxUIObject(pComboBox)); } -SpinUIObject::SpinUIObject(VclPtr<SpinButton> xSpinButton): +SpinUIObject::SpinUIObject(const VclPtr<SpinButton>& xSpinButton): WindowUIObject(xSpinButton), mxSpinButton(xSpinButton) { @@ -947,7 +947,7 @@ OUString SpinUIObject::get_name() const return OUString("SpinUIObject"); } -SpinFieldUIObject::SpinFieldUIObject(VclPtr<SpinField> xSpinField): +SpinFieldUIObject::SpinFieldUIObject(const VclPtr<SpinField>& xSpinField): EditUIObject(xSpinField), mxSpinField(xSpinField) { @@ -1000,7 +1000,7 @@ std::unique_ptr<UIObject> SpinFieldUIObject::create(vcl::Window* pWindow) return std::unique_ptr<UIObject>(new SpinFieldUIObject(pSpinField)); } -TabControlUIObject::TabControlUIObject(VclPtr<TabControl> xTabControl): +TabControlUIObject::TabControlUIObject(const VclPtr<TabControl>& xTabControl): WindowUIObject(xTabControl), mxTabControl(xTabControl) { diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx index 65956ac93a62..997fade9cc2a 100644 --- a/vcl/source/uitest/uno/uiobject_uno.cxx +++ b/vcl/source/uitest/uno/uiobject_uno.cxx @@ -9,6 +9,7 @@ #include <memory> #include "uiobject_uno.hxx" +#include <utility> #include <vcl/svapp.hxx> #include <vcl/idle.hxx> @@ -61,7 +62,7 @@ class ExecuteWrapper public: ExecuteWrapper(std::function<void()> func, Link<Timer*, void> handler): - mFunc(func), + mFunc(std::move(func)), mHandler(handler), mbSignal(false) { |