From c4a9241f72e3b7bf84eaadc51dbaa2accc7b920c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 25 Mar 2015 15:37:53 +0200 Subject: new clang plugin: staticmethods Genius suggestion from Tor Lillqvist, write a clang plugin that finds methods that can be static. Change-Id: Ie6684cc95d088e8750b300a028b49f763da00345 --- include/comphelper/ChainablePropertySet.hxx | 10 +++++----- include/comphelper/MasterPropertySet.hxx | 10 +++++----- include/comphelper/accessibletexthelper.hxx | 6 +++--- include/comphelper/componentbase.hxx | 4 ++-- include/comphelper/numberedcollection.hxx | 4 ++-- include/comphelper/propertycontainer.hxx | 2 +- include/comphelper/propstate.hxx | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'include/comphelper') diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx index 31e1de7a5bbd..07210beaa516 100644 --- a/include/comphelper/ChainablePropertySet.hxx +++ b/include/comphelper/ChainablePropertySet.hxx @@ -96,16 +96,16 @@ namespace comphelper virtual void _postGetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; - void _preGetPropertyState () + static void _preGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) + static void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException ); - void _postGetPropertyState () + static void _postGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) + static void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException ); - ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) + static ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); public: diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx index b2cb4d9a1067..bff7835bbba3 100644 --- a/include/comphelper/MasterPropertySet.hxx +++ b/include/comphelper/MasterPropertySet.hxx @@ -84,16 +84,16 @@ namespace comphelper virtual void _postGetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0; - void _preGetPropertyState () + static void _preGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) + static void _getPropertyState( const comphelper::PropertyInfo& rInfo, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException ); - void _postGetPropertyState () + static void _postGetPropertyState () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) + static void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException ); - ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) + static ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); public: diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index 6edef5b11c2a..af4d69055a5d 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -52,9 +52,9 @@ namespace comphelper ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > implGetBreakIterator(); ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification > implGetCharacterClassification(); - bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); - bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); - bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); + static bool implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength ); + static bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); + static bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); virtual OUString implGetText() = 0; virtual ::com::sun::star::lang::Locale implGetLocale() = 0; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0; diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx index 7881ae4de5e0..349e6c648641 100644 --- a/include/comphelper/componentbase.hxx +++ b/include/comphelper/componentbase.hxx @@ -100,8 +100,8 @@ namespace comphelper The default implementation returns . */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - getComponent() const; + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + getComponent(); private: ::cppu::OBroadcastHelper& m_rBHelper; diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx index f1d6ccc3d1df..c231863f6d9b 100644 --- a/include/comphelper/numberedcollection.hxx +++ b/include/comphelper/numberedcollection.hxx @@ -152,8 +152,8 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex */ ::sal_Int32 impl_searchFreeNumber (); - void impl_cleanUpDeadItems ( TNumberedItemHash& lItems , - const TDeadItemList& lDeadItems); + static void impl_cleanUpDeadItems ( TNumberedItemHash& lItems , + const TDeadItemList& lDeadItems); // member diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx index 70ec84e0350f..1561b61e8165 100644 --- a/include/comphelper/propertycontainer.hxx +++ b/include/comphelper/propertycontainer.hxx @@ -49,7 +49,7 @@ protected: OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper); /// for scripting : the types of the interfaces supported by this class - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > getBaseTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > getBaseTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); // OPropertySetHelper overridables virtual sal_Bool SAL_CALL convertFastPropertyValue( diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx index a8029a6b849d..1bd91e2a9990 100644 --- a/include/comphelper/propstate.hxx +++ b/include/comphelper/propstate.hxx @@ -75,7 +75,7 @@ namespace comphelper void firePropertyChange(sal_Int32 nHandle, const ::com::sun::star::uno::Any& aNewValue, const ::com::sun::star::uno::Any& aOldValue); - css::uno::Sequence getTypes(); + static css::uno::Sequence getTypes(); }; -- cgit