basctl/source/basicide/baside2.cxx | 5 +--
basctl/source/basicide/baside2.hxx | 2 -
basctl/source/basicide/baside2b.cxx | 5 +--
basctl/source/basicide/bastype2.cxx | 45 ++++++++++++++---------------
basctl/source/basicide/bastypes.cxx | 17 +++++-----
basctl/source/basicide/localizationmgr.cxx | 9 +++--
basctl/source/basicide/sbxitem.cxx | 29 +++++++++---------
basctl/source/dlged/dlgedfac.cxx | 3 +
basctl/source/dlged/managelang.cxx | 9 +++--
basctl/source/inc/bastype2.hxx | 22 +++++++-------
basctl/source/inc/bastypes.hxx | 6 +--
basctl/source/inc/dlgedfac.hxx | 2 -
basctl/source/inc/localizationmgr.hxx | 2 -
basctl/source/inc/managelang.hxx | 9 +++--
basctl/source/inc/sbxitem.hxx | 4 +-
15 files changed, 89 insertions(+), 80 deletions(-)
New commits:
commit 81b3cd44e160f4e600e4cb01410d540b32710c96
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jun 6 11:22:39 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jun 6 13:16:12 2022 +0200
clang-tidy modernize-pass-by-value in basctl
Change-Id: I12adfacb8f04ee6f08bcc711cef09c5882ff0b15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135446
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 215ed0be3393..f73c70ef751a 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -56,6 +56,7 @@
#include <svl/whiter.hxx>
#include <svx/svxids.hrc>
#include <tools/debug.hxx>
+#include <utility>
#include <vcl/locktoplevels.hxx>
#include <vcl/errinf.hxx>
#include <vcl/event.hxx>
@@ -193,12 +194,12 @@ void lcl_ConvertTabsToSpaces( OUString& rLine )
} // namespace
ModulWindow::ModulWindow (ModulWindowLayout* pParent, ScriptDocument const&
rDocument,
- const OUString& aLibName, const OUString& aName,
OUString const & aModule)
+ const OUString& aLibName, const OUString& aName,
OUString aModule)
: BaseWindow(pParent, rDocument, aLibName, aName)
, m_rLayout(*pParent)
, m_nValid(ValidWindow)
, m_aXEditorWindow(VclPtr<ComplexEditorWindow>::Create(this))
- , m_aModule(aModule)
+ , m_aModule(std::move(aModule))
{
m_aXEditorWindow->Show();
SetBackground();
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 2c9822610d64..bf84323a3200 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -297,7 +297,7 @@ protected:
virtual void DoScroll( ScrollBar* pCurScrollBar ) override;
public:
- ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument,
const OUString& aLibName, const OUString& aName, OUString const & aModule );
+ ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument,
const OUString& aLibName, const OUString& aName, OUString aModule );
virtual ~ModulWindow() override;
virtual void dispose() override;
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 0315894b7d88..df8196570653 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -46,6 +46,7 @@
#include <sfx2/progress.hxx>
#include <sfx2/viewfrm.hxx>
#include <tools/debug.hxx>
+#include <utility>
#include <vcl/image.hxx>
#include <vcl/weld.hxx>
#include <vcl/weldutils.hxx>
@@ -1586,8 +1587,8 @@ struct WatchItem
WatchItem* mpArrayParentItem;
- explicit WatchItem (OUString const& rName):
- maName(rName),
+ explicit WatchItem (OUString aName):
+ maName(std::move(aName)),
nDimLevel(0),
nDimCount(0),
mpArrayParentItem(nullptr)
diff --git a/basctl/source/basicide/bastype2.cxx
b/basctl/source/basicide/bastype2.cxx
index d027c7dc6d2b..6f6eaa26d9ee 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -41,6 +41,7 @@
#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNamed.hpp>
+#include <utility>
namespace basctl
{
@@ -87,12 +88,12 @@ Entry::~Entry()
{ }
DocumentEntry::DocumentEntry (
- ScriptDocument const& rDocument,
+ ScriptDocument aDocument,
LibraryLocation eLocation,
EntryType eType
) :
Entry(eType),
- m_aDocument(rDocument),
+ m_aDocument(std::move(aDocument)),
m_eLocation(eLocation)
{
OSL_ENSURE( m_aDocument.isValid(), "DocumentEntry::DocumentEntry: illegal
document!" );
@@ -104,10 +105,10 @@ DocumentEntry::~DocumentEntry()
LibEntry::LibEntry (
ScriptDocument const& rDocument,
LibraryLocation eLocation,
- OUString const& rLibName
+ OUString aLibName
) :
DocumentEntry(rDocument, eLocation, OBJ_TYPE_LIBRARY),
- m_aLibName(rLibName)
+ m_aLibName(std::move(aLibName))
{ }
LibEntry::~LibEntry()
@@ -120,38 +121,38 @@ EntryDescriptor::EntryDescriptor () :
{ }
EntryDescriptor::EntryDescriptor (
- ScriptDocument const& rDocument,
+ ScriptDocument aDocument,
LibraryLocation eLocation,
- OUString const& rLibName,
- OUString const& rLibSubName,
- OUString const& rName,
+ OUString aLibName,
+ OUString aLibSubName,
+ OUString aName,
EntryType eType
) :
- m_aDocument(rDocument),
+ m_aDocument(std::move(aDocument)),
m_eLocation(eLocation),
- m_aLibName(rLibName),
- m_aLibSubName(rLibSubName),
- m_aName(rName),
+ m_aLibName(std::move(aLibName)),
+ m_aLibSubName(std::move(aLibSubName)),
+ m_aName(std::move(aName)),
m_eType(eType)
{
OSL_ENSURE( m_aDocument.isValid(), "EntryDescriptor::EntryDescriptor:
invalid document!" );
}
EntryDescriptor::EntryDescriptor (
- ScriptDocument const& rDocument,
+ ScriptDocument aDocument,
LibraryLocation eLocation,
- OUString const& rLibName,
- OUString const& rLibSubName,
- OUString const& rName,
- OUString const& rMethodName,
+ OUString aLibName,
+ OUString aLibSubName,
+ OUString aName,
+ OUString aMethodName,
EntryType eType
) :
- m_aDocument(rDocument),
+ m_aDocument(std::move(aDocument)),
m_eLocation(eLocation),
- m_aLibName(rLibName),
- m_aLibSubName(rLibSubName),
- m_aName(rName),
- m_aMethodName(rMethodName),
+ m_aLibName(std::move(aLibName)),
+ m_aLibSubName(std::move(aLibSubName)),
+ m_aName(std::move(aName)),
+ m_aMethodName(std::move(aMethodName)),
m_eType(eType)
{
OSL_ENSURE( m_aDocument.isValid(), "EntryDescriptor::EntryDescriptor:
invalid document!" );
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index e0ad3daceca5..4ebe985804d9 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -40,6 +40,7 @@
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <svl/srchdefs.hxx>
+#include <utility>
#include <vcl/commandevent.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
@@ -53,14 +54,14 @@ namespace basctl
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-BaseWindow::BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument,
const OUString& aLibName, const OUString& aName )
+BaseWindow::BaseWindow( vcl::Window* pParent, ScriptDocument aDocument,
OUString aLibName, OUString aName )
:Window( pParent, WinBits( WB_3DLOOK ) )
,pShellHScrollBar( nullptr)
,pShellVScrollBar( nullptr)
,nStatus( 0)
- ,m_aDocument( rDocument )
- ,m_aLibName( aLibName )
- ,m_aName( aName )
+ ,m_aDocument(std::move( aDocument ))
+ ,m_aLibName(std::move( aLibName ))
+ ,m_aName(std::move( aName ))
{
}
@@ -667,8 +668,8 @@ LibInfo::Item const* LibInfo::GetInfo (
return it != m_aMap.end() ? &it->second : nullptr;
}
-LibInfo::Key::Key (ScriptDocument const& rDocument, OUString const& rLibName) :
- m_aDocument(rDocument), m_aLibName(rLibName)
+LibInfo::Key::Key (ScriptDocument aDocument, OUString aLibName) :
+ m_aDocument(std::move(aDocument)), m_aLibName(std::move(aLibName))
{ }
bool LibInfo::Key::operator == (Key const& rKey) const
@@ -685,10 +686,10 @@ size_t LibInfo::Key::Hash::operator () (Key const& rKey)
const
}
LibInfo::Item::Item (
- OUString const& rCurrentName,
+ OUString aCurrentName,
ItemType eCurrentType
) :
- m_aCurrentName(rCurrentName),
+ m_aCurrentName(std::move(aCurrentName)),
m_eCurrentType(eCurrentType)
{ }
diff --git a/basctl/source/basicide/localizationmgr.cxx
b/basctl/source/basicide/localizationmgr.cxx
index 279fd7555801..18a19d6e7b17 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -37,6 +37,7 @@
#include <sfx2/sfxsids.hrc>
#include <sfx2/viewfrm.hxx>
#include <tools/debug.hxx>
+#include <utility>
#include <osl/diagnose.h>
namespace basctl
@@ -59,14 +60,14 @@ constexpr OUStringLiteral aSemi(u";");
LocalizationMgr::LocalizationMgr(
Shell* pShell,
- ScriptDocument const& rDocument,
- OUString const& aLibName,
+ ScriptDocument aDocument,
+ OUString aLibName,
Reference<XStringResourceManager> const& xStringResourceManager
) :
m_xStringResourceManager(xStringResourceManager),
m_pShell(pShell),
- m_aDocument(rDocument),
- m_aLibName(aLibName)
+ m_aDocument(std::move(aDocument)),
+ m_aLibName(std::move(aLibName))
{ }
bool LocalizationMgr::isLibraryLocalized ()
diff --git a/basctl/source/basicide/sbxitem.cxx
b/basctl/source/basicide/sbxitem.cxx
index db012ec6c4fa..39c86b1d0893 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -19,37 +19,38 @@
#include <sbxitem.hxx>
#include <sal/log.hxx>
+#include <utility>
namespace basctl
{
SfxPoolItem* SbxItem::CreateDefault() { SAL_WARN( "basctl.basicide", "No
SbxItem factory available"); return nullptr; }
SbxItem::SbxItem (
sal_uInt16 nWhichItem,
- ScriptDocument const& rDocument,
- OUString const& aLibName,
- OUString const& aName,
+ ScriptDocument aDocument,
+ OUString aLibName,
+ OUString aName,
ItemType eType
) :
SfxPoolItem(nWhichItem),
- m_aDocument(rDocument),
- m_aLibName(aLibName),
- m_aName(aName),
+ m_aDocument(std::move(aDocument)),
+ m_aLibName(std::move(aLibName)),
+ m_aName(std::move(aName)),
m_eType(eType)
{ }
SbxItem::SbxItem (
sal_uInt16 nWhichItem,
- ScriptDocument const& rDocument,
- OUString const& aLibName,
- OUString const& aName,
- OUString const& aMethodName,
+ ScriptDocument aDocument,
+ OUString aLibName,
+ OUString aName,
+ OUString aMethodName,
ItemType eType
) :
SfxPoolItem(nWhichItem),
- m_aDocument(rDocument),
- m_aLibName(aLibName),
- m_aName(aName),
- m_aMethodName(aMethodName),
+ m_aDocument(std::move(aDocument)),
+ m_aLibName(std::move(aLibName)),
+ m_aName(std::move(aName)),
+ m_aMethodName(std::move(aMethodName)),
m_eType(eType)
{ }
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 5c7d012344bb..03713c2b94ee 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/awt/ScrollBarOrientation.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <comphelper/processfactory.hxx>
+#include <utility>
namespace basctl
{
@@ -32,7 +33,7 @@ namespace basctl
using namespace ::com::sun::star;
-DlgEdFactory::DlgEdFactory( const css::uno::Reference< css::frame::XModel >&
xModel ) : mxModel( xModel )
+DlgEdFactory::DlgEdFactory( css::uno::Reference< css::frame::XModel > xModel )
: mxModel(std::move( xModel ))
{
SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
}
diff --git a/basctl/source/dlged/managelang.cxx
b/basctl/source/dlged/managelang.cxx
index 0853f4ac86d3..69f366ed6656 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -31,6 +31,7 @@
#include <sfx2/sfxsids.hrc>
#include <svtools/langtab.hxx>
#include <svx/langbox.hxx>
+#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/settings.hxx>
@@ -52,9 +53,9 @@ bool localesAreEqual( const Locale& rLocaleLeft, const
Locale& rLocaleRight )
return bRet;
}
-ManageLanguageDialog::ManageLanguageDialog(weld::Window* pParent,
std::shared_ptr<LocalizationMgr> const & xLMgr)
+ManageLanguageDialog::ManageLanguageDialog(weld::Window* pParent,
std::shared_ptr<LocalizationMgr> xLMgr)
: GenericDialogController(pParent,
"modules/BasicIDE/ui/managelanguages.ui", "ManageLanguagesDialog")
- , m_xLocalizationMgr(xLMgr)
+ , m_xLocalizationMgr(std::move(xLMgr))
, m_sDefLangStr(IDEResId(RID_STR_DEF_LANG))
, m_sCreateLangStr(IDEResId(RID_STR_CREATE_LANG))
, m_xLanguageLB(m_xBuilder->weld_tree_view("treeview"))
@@ -213,9 +214,9 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl,
weld::TreeView&, void)
// class SetDefaultLanguageDialog
-----------------------------------------------
-SetDefaultLanguageDialog::SetDefaultLanguageDialog(weld::Window* pParent,
std::shared_ptr<LocalizationMgr> const & xLMgr)
+SetDefaultLanguageDialog::SetDefaultLanguageDialog(weld::Window* pParent,
std::shared_ptr<LocalizationMgr> xLMgr)
: GenericDialogController(pParent,
"modules/BasicIDE/ui/defaultlanguage.ui", "DefaultLanguageDialog")
- , m_xLocalizationMgr(xLMgr)
+ , m_xLocalizationMgr(std::move(xLMgr))
, m_xLanguageFT(m_xBuilder->weld_label("defaultlabel"))
, m_xLanguageLB(m_xBuilder->weld_tree_view("entries"))
, m_xCheckLangFT(m_xBuilder->weld_label("checkedlabel"))
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index e2e81a26916c..0161797f16a2 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -90,7 +90,7 @@ private:
public:
DocumentEntry (
- ScriptDocument const& rDocument,
+ ScriptDocument aDocument,
LibraryLocation eLocation,
EntryType eType = OBJ_TYPE_DOCUMENT
);
@@ -109,7 +109,7 @@ public:
LibEntry (
ScriptDocument const& rDocument,
LibraryLocation eLocation,
- OUString const& rLibName
+ OUString aLibName
);
virtual ~LibEntry () override;
@@ -129,20 +129,20 @@ class EntryDescriptor
public:
EntryDescriptor ();
EntryDescriptor (
- ScriptDocument const& rDocument,
+ ScriptDocument aDocument,
LibraryLocation eLocation,
- OUString const& rLibName,
- OUString const& rLibSubName,
- OUString const& rName,
+ OUString aLibName,
+ OUString aLibSubName,
+ OUString aName,
EntryType eType
);
EntryDescriptor (
- ScriptDocument const& rDocument,
+ ScriptDocument aDocument,
LibraryLocation eLocation,
- OUString const& rLibName,
- OUString const& rLibSubName,
- OUString const& rName,
- OUString const& rMethodName,
+ OUString aLibName,
+ OUString aLibSubName,
+ OUString aName,
+ OUString aMethodName,
EntryType eType
);
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 520d1a711992..04d308fc7b22 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -172,7 +172,7 @@ protected:
virtual void DoScroll( ScrollBar* pCurScrollBar );
public:
- BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, const
OUString& aLibName, const OUString& aName );
+ BaseWindow( vcl::Window* pParent, ScriptDocument aDocument, OUString
aLibName, OUString aName );
virtual ~BaseWindow() override;
virtual void dispose() override;
@@ -260,7 +260,7 @@ private:
OUString m_aLibName;
public:
- Key (ScriptDocument const&, OUString const& rLibName);
+ Key (ScriptDocument , OUString aLibName);
public:
bool operator == (Key const&) const;
struct Hash
@@ -278,7 +278,7 @@ public:
ItemType m_eCurrentType;
public:
- Item (OUString const& rCurrentName, ItemType eCurrentType);
+ Item (OUString aCurrentName, ItemType eCurrentType);
const OUString& GetCurrentName() const { return m_aCurrentName;
}
ItemType GetCurrentType() const { return m_eCurrentType;
}
};
diff --git a/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx
index f780bc22bb95..f200b01f84c9 100644
--- a/basctl/source/inc/dlgedfac.hxx
+++ b/basctl/source/inc/dlgedfac.hxx
@@ -32,7 +32,7 @@ class DlgEdFactory
const css::uno::Reference<css::frame::XModel> mxModel;
public:
- DlgEdFactory(const css::uno::Reference<css::frame::XModel>& xModel);
+ DlgEdFactory(css::uno::Reference<css::frame::XModel> xModel);
~DlgEdFactory() COVERITY_NOEXCEPT_FALSE;
DECL_LINK(MakeObject, SdrObjCreatorParams, SdrObject*);
diff --git a/basctl/source/inc/localizationmgr.hxx
b/basctl/source/inc/localizationmgr.hxx
index 847ef0f75729..3e2ff0fc58a8 100644
--- a/basctl/source/inc/localizationmgr.hxx
+++ b/basctl/source/inc/localizationmgr.hxx
@@ -72,7 +72,7 @@ class LocalizationMgr
void implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode
eMode );
public:
- LocalizationMgr(Shell*, ScriptDocument const&, OUString const& aLibName,
+ LocalizationMgr(Shell*, ScriptDocument , OUString aLibName,
const css::uno::Reference < css::resource::XStringResourceManager >&
xStringResourceManager );
const css::uno::Reference< css::resource::XStringResourceManager >&
getStringResourceManager() const
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 722ec60c46ac..58dd4189057a 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -19,6 +19,7 @@
#pragma once
+#include <utility>
#include <vcl/weld.hxx>
class SvxLanguageBox;
@@ -33,9 +34,9 @@ struct LanguageEntry
css::lang::Locale m_aLocale;
bool m_bIsDefault;
- LanguageEntry( const css::lang::Locale& _rLocale,
+ LanguageEntry( css::lang::Locale _aLocale,
bool _bIsDefault ) :
- m_aLocale( _rLocale ),
+ m_aLocale(std::move( _aLocale )),
m_bIsDefault( _bIsDefault ) {}
};
@@ -65,7 +66,7 @@ private:
DECL_LINK(SelectHdl, weld::TreeView&, void);
public:
- ManageLanguageDialog(weld::Window* pParent,
std::shared_ptr<LocalizationMgr> const & _pLMgr);
+ ManageLanguageDialog(weld::Window* pParent,
std::shared_ptr<LocalizationMgr> _pLMgr);
virtual ~ManageLanguageDialog() override;
};
@@ -86,7 +87,7 @@ private:
std::unique_ptr<SvxLanguageBox> m_xLanguageCB;
public:
- SetDefaultLanguageDialog(weld::Window* pParent,
std::shared_ptr<LocalizationMgr> const & xLMgr);
+ SetDefaultLanguageDialog(weld::Window* pParent,
std::shared_ptr<LocalizationMgr> xLMgr);
virtual ~SetDefaultLanguageDialog() override;
css::uno::Sequence< css::lang::Locale > GetLocales() const;
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index e5f8d65d900f..941ffd3e0ee9 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -44,8 +44,8 @@ class SbxItem : public SfxPoolItem
public:
static SfxPoolItem* CreateDefault();
- SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const
OUString& aLibName, const OUString& aName, ItemType);
- SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const
OUString& aLibName, const OUString& aName, const OUString& aMethodName,
ItemType eType);
+ SbxItem(sal_uInt16 nWhich, ScriptDocument aDocument, OUString aLibName,
OUString aName, ItemType);
+ SbxItem(sal_uInt16 nWhich, ScriptDocument aDocument, OUString aLibName,
OUString aName, OUString aMethodName, ItemType eType);
virtual SbxItem* Clone(SfxItemPool *pPool = nullptr) const override;
virtual bool operator==(const SfxPoolItem&) const override;
