From 71b809959bb8f775d83dc52628448bb8b8322b28 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 14 Apr 2015 12:44:47 +0200 Subject: remove unnecessary use of void in function declarations ie. void f(void); becomes void f(); I used the following command to make the changes: git grep -lP '\(\s*void\s*\)' -- *.cxx \ | xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;' and ran it for both .cxx and .hxx files. Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd --- unotools/source/accessibility/accessiblerelationsethelper.cxx | 6 +++--- unotools/source/accessibility/accessiblestatesethelper.cxx | 6 +++--- unotools/source/config/securityoptions.cxx | 4 ++-- unotools/source/config/xmlaccelcfg.cxx | 4 ++-- unotools/source/ucbhelper/ucblockbytes.cxx | 10 +++++----- unotools/source/ucbhelper/ucblockbytes.hxx | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'unotools') diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx index 6881e608e6e5..3ea79605a11d 100644 --- a/unotools/source/accessibility/accessiblerelationsethelper.cxx +++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx @@ -138,7 +138,7 @@ AccessibleRelationSetHelper::AccessibleRelationSetHelper (const AccessibleRelati mpHelperImpl = new AccessibleRelationSetHelperImpl(); } -AccessibleRelationSetHelper::~AccessibleRelationSetHelper(void) +AccessibleRelationSetHelper::~AccessibleRelationSetHelper() { delete mpHelperImpl; } @@ -229,7 +229,7 @@ void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelatio //===== XTypeProvider ======================================================= uno::Sequence< ::com::sun::star::uno::Type> - AccessibleRelationSetHelper::getTypes (void) + AccessibleRelationSetHelper::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard (maMutex); @@ -243,7 +243,7 @@ uno::Sequence< ::com::sun::star::uno::Type> } uno::Sequence SAL_CALL - AccessibleRelationSetHelper::getImplementationId (void) + AccessibleRelationSetHelper::getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) { return css::uno::Sequence(); diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx index a1b2f87670a5..2ed4117be4cb 100644 --- a/unotools/source/accessibility/accessiblestatesethelper.cxx +++ b/unotools/source/accessibility/accessiblestatesethelper.cxx @@ -148,7 +148,7 @@ AccessibleStateSetHelper::AccessibleStateSetHelper (const AccessibleStateSetHelp mpHelperImpl = new AccessibleStateSetHelperImpl(); } -AccessibleStateSetHelper::~AccessibleStateSetHelper(void) +AccessibleStateSetHelper::~AccessibleStateSetHelper() { delete mpHelperImpl; } @@ -242,7 +242,7 @@ void AccessibleStateSetHelper::RemoveState(sal_Int16 aState) //===== XTypeProvider ======================================================= uno::Sequence< ::com::sun::star::uno::Type> - AccessibleStateSetHelper::getTypes (void) + AccessibleStateSetHelper::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::com::sun::star::uno::Type aTypeList[] = { @@ -255,7 +255,7 @@ uno::Sequence< ::com::sun::star::uno::Type> } uno::Sequence SAL_CALL - AccessibleStateSetHelper::getImplementationId (void) + AccessibleStateSetHelper::getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) { return css::uno::Sequence(); diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 71dcb5a233ae..cf5c3b9d188a 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -153,7 +153,7 @@ class SvtSecurityOptions_Impl : public ConfigItem *//*-*****************************************************************************************************/ void SetProperty( sal_Int32 nHandle, const Any& rValue, bool bReadOnly ); - void LoadAuthors( void ); + void LoadAuthors(); static sal_Int32 GetHandle( const OUString& rPropertyName ); bool GetOption( SvtSecurityOptions::EOption eOption, bool*& rpValue, bool*& rpRO ); @@ -406,7 +406,7 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu } } -void SvtSecurityOptions_Impl::LoadAuthors( void ) +void SvtSecurityOptions_Impl::LoadAuthors() { m_seqTrustedAuthors.realloc( 0 ); // first clear Sequence< OUString > lAuthors = GetNodeNames( PROPERTYNAME_MACRO_TRUSTEDAUTHORS ); diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index 6e906c8b5992..47796e6364a3 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -74,12 +74,12 @@ OUString OReadAccelatorDocumentHandler::getErrorLineString() return OUString(); } -void SAL_CALL OReadAccelatorDocumentHandler::startDocument(void) +void SAL_CALL OReadAccelatorDocumentHandler::startDocument() throw ( SAXException, RuntimeException, std::exception ) { } -void SAL_CALL OReadAccelatorDocumentHandler::endDocument(void) +void SAL_CALL OReadAccelatorDocumentHandler::endDocument() throw( SAXException, RuntimeException, std::exception ) { if ( m_nElementDepth > 0 ) diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index c3b60498dff5..e5dd6b2da1e1 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -82,14 +82,14 @@ public: // XActiveDataControl. virtual void SAL_CALL addListener ( const Reference &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL removeListener ( const Reference &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL start (void) throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL terminate (void) throw(RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL start() throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL terminate() throw(RuntimeException, std::exception) SAL_OVERRIDE { m_xLockBytes->terminate_Impl(); } // XActiveDataSink. virtual void SAL_CALL setInputStream ( const Reference &rxInputStream) throw(RuntimeException, std::exception) SAL_OVERRIDE { m_xLockBytes->setInputStream_Impl (rxInputStream); } - virtual Reference SAL_CALL getInputStream (void) throw(RuntimeException, std::exception) SAL_OVERRIDE + virtual Reference SAL_CALL getInputStream() throw(RuntimeException, std::exception) SAL_OVERRIDE { return m_xLockBytes->getInputStream_Impl(); } }; @@ -109,8 +109,8 @@ public: // XActiveDataControl. virtual void SAL_CALL addListener ( const Reference &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL removeListener ( const Reference &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL start (void) throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL terminate (void) throw(RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL start() throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL terminate() throw(RuntimeException, std::exception) SAL_OVERRIDE { m_xLockBytes->terminate_Impl(); } // XActiveDataStreamer diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index e19c919dedb4..10ef2830c9eb 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -107,7 +107,7 @@ class UcbLockBytes : public virtual SvLockBytes UcbLockBytes( UcbLockBytesHandler* pHandler ); protected: - virtual ~UcbLockBytes (void); + virtual ~UcbLockBytes(); public: // properties: Referer, PostMimeType @@ -145,7 +145,7 @@ public: bool setInputStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > &rxInputStream, bool bSetXSeekable = true ); bool setStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > &rxStream ); - void terminate_Impl (void); + void terminate_Impl(); ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > getInputStream_Impl() const { -- cgit