diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-18 09:57:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-18 11:13:05 +0200 |
commit | c932e26138d9dda1d3dad5e2472a79d42c0a816c (patch) | |
tree | 28652c256477174a536094bf398e65dc1d0ad045 | |
parent | e530689ef6ba79a26162670580ba28f9b09eb689 (diff) |
loplugin:constparams in toolkit,ucb,xmlhelp
Change-Id: I2287bf468aae5008e25aa8b1bc0b63cff7bb1bf1
Reviewed-on: https://gerrit.libreoffice.org/40117
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
22 files changed, 39 insertions, 38 deletions
diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/constparams.cxx index 024ee4ffd53e..9fbea42bdd44 100644 --- a/compilerplugins/clang/constparams.cxx +++ b/compilerplugins/clang/constparams.cxx @@ -104,6 +104,8 @@ bool ConstParams::VisitFunctionDecl(FunctionDecl * functionDecl) || name == "compressWheelEvents" || name == "MenuBarSignalKey" || name == "signalDragDropReceived" + || name == "memory_write" + || name == "file_write" // UNO component entry points || name.endswith("component_getFactory") // in Scheduler::, wants to loop until a reference to a bool becomes true diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index 7c7913eadb56..18cd3f0392ca 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -136,7 +136,7 @@ public: void suspendVclEventListening( ); void resumeVclEventListening( ); - void notifyWindowRemoved( vcl::Window& _rWindow ); + void notifyWindowRemoved( vcl::Window const & _rWindow ); // css::lang::XUnoTunnel static const css::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 6bd232f3c593..81b6a45e6766 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -515,7 +515,7 @@ public: // C++ /// @throws css::uno::RuntimeException TabControl* getTabControl() const; - sal_uInt16 insertTab( TabPage*, OUString& sTitle ); + sal_uInt16 insertTab( TabPage*, OUString const & sTitle ); static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; @@ -670,7 +670,7 @@ public: // css::awt::XLayoutConstrains css::awt::Size SAL_CALL getMinimumSize() override; /// @throws css::uno::RuntimeException - static css::awt::Size SAL_CALL implGetMinimumSize( vcl::Window* p ); + static css::awt::Size SAL_CALL implGetMinimumSize( vcl::Window const * p ); static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index 16844fe81efb..b4b8221fe18c 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -227,8 +227,8 @@ protected: css::uno::Reference< css::awt::XTabController > mxTabController; css::uno::Reference< css::util::XModifyListener > mxListener; - void ImplInsertControl( css::uno::Reference< css::awt::XControlModel >& rxModel, const OUString& rName ); - void ImplRemoveControl( css::uno::Reference< css::awt::XControlModel >& rxModel ); + void ImplInsertControl( css::uno::Reference< css::awt::XControlModel > const & rxModel, const OUString& rName ); + void ImplRemoveControl( css::uno::Reference< css::awt::XControlModel > const & rxModel ); virtual void ImplSetPosSize( css::uno::Reference< css::awt::XControl >& rxCtrl ); void ImplUpdateResourceResolver(); void ImplStartListingForResourceEvents(); diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 353267044110..f0e7375d9547 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -127,7 +127,7 @@ namespace toolkit namespace { - sal_Int32 lcl_getStyleColor( WindowStyleSettings_Data& i_rData, Color const & (StyleSettings::*i_pGetter)() const ) + sal_Int32 lcl_getStyleColor( WindowStyleSettings_Data const & i_rData, Color const & (StyleSettings::*i_pGetter)() const ) { const VclPtr<vcl::Window>& pWindow = i_rData.pOwningWindow->GetWindow(); const AllSettings aAllSettings = pWindow->GetSettings(); @@ -135,7 +135,7 @@ namespace toolkit return (aStyleSettings.*i_pGetter)().GetColor(); } - void lcl_setStyleColor( WindowStyleSettings_Data& i_rData, void (StyleSettings::*i_pSetter)( Color const & ), const sal_Int32 i_nColor ) + void lcl_setStyleColor( WindowStyleSettings_Data const & i_rData, void (StyleSettings::*i_pSetter)( Color const & ), const sal_Int32 i_nColor ) { VclPtr<vcl::Window> pWindow = i_rData.pOwningWindow->GetWindow(); AllSettings aAllSettings = pWindow->GetSettings(); @@ -145,7 +145,7 @@ namespace toolkit pWindow->SetSettings( aAllSettings ); } - FontDescriptor lcl_getStyleFont( WindowStyleSettings_Data& i_rData, vcl::Font const & (StyleSettings::*i_pGetter)() const ) + FontDescriptor lcl_getStyleFont( WindowStyleSettings_Data const & i_rData, vcl::Font const & (StyleSettings::*i_pGetter)() const ) { const VclPtr<vcl::Window>& pWindow = i_rData.pOwningWindow->GetWindow(); const AllSettings aAllSettings = pWindow->GetSettings(); @@ -153,7 +153,7 @@ namespace toolkit return VCLUnoHelper::CreateFontDescriptor( (aStyleSettings.*i_pGetter)() ); } - void lcl_setStyleFont( WindowStyleSettings_Data& i_rData, void (StyleSettings::*i_pSetter)( vcl::Font const &), + void lcl_setStyleFont( WindowStyleSettings_Data const & i_rData, void (StyleSettings::*i_pSetter)( vcl::Font const &), vcl::Font const & (StyleSettings::*i_pGetter)() const, const FontDescriptor& i_rFont ) { VclPtr<vcl::Window> pWindow = i_rData.pOwningWindow->GetWindow(); diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index bc221aae7a0c..ff20d4af4388 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -311,7 +311,7 @@ Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() // Uses an out-parameter instead of return value, due to the object reference -void ImplInitWindowEvent( css::awt::WindowEvent& rEvent, vcl::Window* pWindow ) +void ImplInitWindowEvent( css::awt::WindowEvent& rEvent, vcl::Window const * pWindow ) { Point aPos = pWindow->GetPosPixel(); Size aSz = pWindow->GetSizePixel(); @@ -384,7 +384,7 @@ void VCLXWindow::resumeVclEventListening( ) --mpImpl->mnListenerLockLevel; } -void VCLXWindow::notifyWindowRemoved( vcl::Window& _rWindow ) +void VCLXWindow::notifyWindowRemoved( vcl::Window const & _rWindow ) { if ( mpImpl->getContainerListeners().getLength() ) { diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 2cab3bd553e4..6725fac94276 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -188,7 +188,7 @@ namespace toolkit _pWindow->SetSettings( aSettings ); } - static Any getVisualEffect( vcl::Window* _pWindow ) + static Any getVisualEffect( vcl::Window const * _pWindow ) { Any aEffect; @@ -2578,11 +2578,10 @@ sal_Int32 SAL_CALL VCLXMultiPage::insertTab() { TabControl *pTabControl = getTabControl(); VclPtrInstance<TabPage> pTab( pTabControl ); - OUString title (""); - return static_cast< sal_Int32 >( insertTab( pTab, title ) ); + return static_cast< sal_Int32 >( insertTab( pTab, OUString() ) ); } -sal_uInt16 VCLXMultiPage::insertTab( TabPage* pPage, OUString& sTitle ) +sal_uInt16 VCLXMultiPage::insertTab( TabPage* pPage, OUString const & sTitle ) { TabControl *pTabControl = getTabControl(); sal_uInt16 id = sal::static_int_cast< sal_uInt16 >( mTabId++ ); @@ -3706,7 +3705,7 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -css::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( vcl::Window* p ) +css::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( vcl::Window const * p ) { long n = p->GetSettings().GetStyleSettings().GetScrollBarSize(); return css::awt::Size( n, n ); diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index 4cc68e798f61..338265947515 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -222,7 +222,7 @@ namespace toolkit { throw IndexOutOfBoundsException( OUString(), i_context ); } - void lcl_notify( ::osl::ClearableMutexGuard& i_guard, ::cppu::OBroadcastHelper& i_broadcaseHelper, + void lcl_notify( ::osl::ClearableMutexGuard& i_guard, ::cppu::OBroadcastHelper const & i_broadcaseHelper, void ( SAL_CALL XContainerListener::*i_notificationMethod )( const ContainerEvent& ), const sal_Int32 i_accessor, const Sequence< OUString >& i_imageURLs, const Reference< XInterface >& i_context ) { diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 2a26fdf76b79..edee732e8452 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -1323,7 +1323,7 @@ void ControlContainerBase::createPeer( const Reference< XToolkit > & rxToolkit, UnoControlContainer::createPeer( rxToolkit, rParentPeer ); } -void ControlContainerBase::ImplInsertControl( Reference< XControlModel >& rxModel, const OUString& rName ) +void ControlContainerBase::ImplInsertControl( Reference< XControlModel > const & rxModel, const OUString& rName ) { Reference< XPropertySet > xP( rxModel, UNO_QUERY ); @@ -1344,7 +1344,7 @@ void ControlContainerBase::ImplInsertControl( Reference< XControlModel >& rxMode } } -void ControlContainerBase::ImplRemoveControl( Reference< XControlModel >& rxModel ) +void ControlContainerBase::ImplRemoveControl( Reference< XControlModel > const & rxModel ) { Sequence< Reference< XControl > > aControls = getControls(); Reference< XControl > xCtrl = StdTabController::FindControl( aControls, rxModel ); diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index fc585806aceb..8de29806ed17 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -478,7 +478,7 @@ void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) xTW->setMenuBar( mxMenuBar ); } } -static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize ) +static ::Size ImplMapPixelToAppFont( OutputDevice const * pOutDev, const ::Size& aSize ) { ::Size aTmp = pOutDev->PixelToLogic( aSize, MapUnit::MapAppFont ); return aTmp; diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 7b0e3d8ebb5d..f42a0ee6f45f 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -225,7 +225,7 @@ void UnoControlTabPage::createPeer( const Reference< XToolkit > & rxToolkit, con } } -static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize ) +static ::Size ImplMapPixelToAppFont( OutputDevice const * pOutDev, const ::Size& aSize ) { ::Size aTmp = pOutDev->PixelToLogic( aSize, MapUnit::MapAppFont ); return aTmp; diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index d3d92c342a8a..285ab210631c 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star; -css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window* pWindow ) +css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window const * pWindow ) { switch ( pWindow->GetType() ) { @@ -204,7 +204,7 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev ) } -static bool lcl_ImplIsParent( vcl::Window* pParentWindow, vcl::Window* pPossibleChild ) +static bool lcl_ImplIsParent( vcl::Window const * pParentWindow, vcl::Window* pPossibleChild ) { vcl::Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : nullptr; while ( pWindow && ( pWindow != pParentWindow ) ) diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 7730248132b0..b9ce98c567d2 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -868,7 +868,7 @@ bool HierarchyEntry::remove() } -bool HierarchyEntry::first( iterator& it ) +bool HierarchyEntry::first( iterator const & it ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -938,7 +938,7 @@ bool HierarchyEntry::first( iterator& it ) } -bool HierarchyEntry::next( iterator& it ) +bool HierarchyEntry::next( iterator const & it ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx index 08639f3d9810..324d016ad352 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx @@ -126,8 +126,8 @@ public: const HierarchyEntryData& operator*() const; }; - bool first( iterator& it ); - bool next ( iterator& it ); + bool first( iterator const & it ); + bool next ( iterator const & it ); }; } // namespace hierarchy_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 564f998f0377..5ee0acf192a1 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -2165,7 +2165,7 @@ void Content::transfer( //static -bool Content::hasData( ContentProvider* pProvider, const Uri & rUri ) +bool Content::hasData( ContentProvider const * pProvider, const Uri & rUri ) { if ( rUri.isRoot() ) { @@ -2201,7 +2201,7 @@ bool Content::hasData( ContentProvider* pProvider, const Uri & rUri ) //static -bool Content::loadData( ContentProvider* pProvider, +bool Content::loadData( ContentProvider const * pProvider, const Uri & rUri, ContentProperties& rProps ) { @@ -2759,7 +2759,7 @@ uno::Reference< io::XInputStream > Content::getInputStream( /// @throws uno::RuntimeException static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream( const OUString & rUri, - ContentProvider * pProvider, + ContentProvider const * pProvider, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) { OUString aPassword; diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index d17f189a6895..baa47bb37fba 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -112,10 +112,10 @@ private: getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override; - static bool hasData( ContentProvider* pProvider, const Uri & rUri ); + static bool hasData( ContentProvider const * pProvider, const Uri & rUri ); bool hasData( const Uri & rUri ) { return hasData( m_pProvider, rUri ); } - static bool loadData( ContentProvider* pProvider, + static bool loadData( ContentProvider const * pProvider, const Uri & rUri, ContentProperties& rProps ); /// @throws css::ucb::CommandFailedException diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index f21c656795d2..2ffe2711e8b3 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -321,7 +321,7 @@ StorageElementFactory::createStream( const OUString & rUri, } -void StorageElementFactory::releaseElement( Storage * pElement ) +void StorageElementFactory::releaseElement( Storage const * pElement ) { OSL_ASSERT( pElement ); osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx index 15e315ee4d18..6a22421a9df7 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.hxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx @@ -96,7 +96,7 @@ namespace tdoc_ucp { private: friend class Storage; - void releaseElement( Storage * pElement ); + void releaseElement( Storage const * pElement ); /// @throws css::embed::InvalidStorageException /// @throws css::lang::IllegalArgumentException diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx index eb001870c1f7..1966eee522d2 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx @@ -97,7 +97,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( } } -void DAVSessionFactory::releaseElement( DAVSession * pElement ) +void DAVSessionFactory::releaseElement( DAVSession const * pElement ) { OSL_ASSERT( pElement ); osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx index 7fa3b095974e..8aeaf9be2a77 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx @@ -77,7 +77,7 @@ private: ::uno::Reference< ::uno::XComponentContext > m_xContext; - void releaseElement( DAVSession * pElement ); + void releaseElement( DAVSession const * pElement ); friend class DAVSession; }; diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index de0ad9433501..0deeea6217d7 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -605,7 +605,7 @@ KeywordInfo::KeywordElement::KeywordElement( Databases *pDatabases, init( pDatabases,pHdf,data ); } -void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids ) +void KeywordInfo::KeywordElement::init( Databases const *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids ) { const sal_Unicode* idstr = ids.getStr(); std::vector< OUString > id,anchor; diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 9a6fd0296b49..05b82b99729e 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -104,7 +104,7 @@ namespace chelp { css::uno::Sequence< OUString > listAnchor; css::uno::Sequence< OUString > listTitle; - void init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids ); + void init( Databases const *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids ); }; explicit KeywordInfo( const std::vector< KeywordElement >& aVector ); |