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 --- ucb/source/ucp/gio/gio_inputstream.cxx | 2 +- ucb/source/ucp/gio/gio_inputstream.hxx | 8 ++++---- ucb/source/ucp/gio/gio_mount.hxx | 2 +- ucb/source/ucp/gio/gio_outputstream.cxx | 6 +++--- ucb/source/ucp/gio/gio_outputstream.hxx | 8 ++++---- ucb/source/ucp/gio/gio_seekable.cxx | 4 ++-- ucb/source/ucp/gio/gio_seekable.hxx | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'ucb/source/ucp/gio') diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx index 4a14f22c4b15..6d11bc325043 100644 --- a/ucb/source/ucp/gio/gio_inputstream.cxx +++ b/ucb/source/ucp/gio/gio_inputstream.cxx @@ -35,7 +35,7 @@ InputStream::InputStream(GFileInputStream *pStream) : Seekable(G_SEEKABLE(pStrea throw io::NotConnectedException(); } -InputStream::~InputStream( void ) +InputStream::~InputStream() { closeInput(); } diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx index d469787e1898..bb821f2e004e 100644 --- a/ucb/source/ucp/gio/gio_inputstream.hxx +++ b/ucb/source/ucp/gio/gio_inputstream.hxx @@ -47,8 +47,8 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release( void ) throw() SAL_OVERRIDE { OWeakObject::release(); } + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData, @@ -71,12 +71,12 @@ public: ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available( void ) + virtual sal_Int32 SAL_CALL available() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL closeInput( void ) + virtual void SAL_CALL closeInput() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/ucb/source/ucp/gio/gio_mount.hxx b/ucb/source/ucp/gio/gio_mount.hxx index 1781b7bd1079..0f3c14559447 100644 --- a/ucb/source/ucp/gio/gio_mount.hxx +++ b/ucb/source/ucp/gio/gio_mount.hxx @@ -53,7 +53,7 @@ struct OOoMountOperationClass }; -GType ooo_mount_operation_get_type (void); +GType ooo_mount_operation_get_type(); GMountOperation *ooo_mount_operation_new(const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rEnv); G_END_DECLS diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx index d8cf60f9aca6..1161bc299781 100644 --- a/ucb/source/ucp/gio/gio_outputstream.cxx +++ b/ucb/source/ucp/gio/gio_outputstream.cxx @@ -35,7 +35,7 @@ OutputStream::OutputStream(GFileOutputStream *pStream) : Seekable(G_SEEKABLE(pSt throw io::NotConnectedException(); } -OutputStream::~OutputStream( void ) +OutputStream::~OutputStream() { closeOutput(); } @@ -52,7 +52,7 @@ void SAL_CALL OutputStream::writeBytes( const com::sun::star::uno::Sequence< sal convertToIOException(pError, static_cast< cppu::OWeakObject * >(this)); } -void SAL_CALL OutputStream::flush( void ) +void SAL_CALL OutputStream::flush() throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception ) { @@ -64,7 +64,7 @@ void SAL_CALL OutputStream::flush( void ) convertToIOException(pError, static_cast< cppu::OWeakObject * >(this)); } -void SAL_CALL OutputStream::closeOutput( void ) +void SAL_CALL OutputStream::closeOutput() throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception ) { diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx index 6dc44175b084..c5ff0a6fdf6a 100644 --- a/ucb/source/ucp/gio/gio_outputstream.hxx +++ b/ucb/source/ucp/gio/gio_outputstream.hxx @@ -47,8 +47,8 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release( void ) throw() SAL_OVERRIDE { OWeakObject::release(); } + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // XOutputStream virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) @@ -57,14 +57,14 @@ public: com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush( void ) + virtual void SAL_CALL flush() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput( void ) + virtual void SAL_CALL closeOutput() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index ec326cfe545e..509eb29e7bed 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -35,11 +35,11 @@ Seekable::Seekable(GSeekable *pStream) : mpStream(pStream) throw io::NotConnectedException(); } -Seekable::~Seekable( void ) +Seekable::~Seekable() { } -void SAL_CALL Seekable::truncate( void ) +void SAL_CALL Seekable::truncate() throw( io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx index 5e7a3c45533a..ea93781c05f2 100644 --- a/ucb/source/ucp/gio/gio_seekable.hxx +++ b/ucb/source/ucp/gio/gio_seekable.hxx @@ -45,8 +45,8 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release( void ) throw() SAL_OVERRIDE { OWeakObject::release(); } + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // XSeekable virtual void SAL_CALL seek( sal_Int64 location ) @@ -63,7 +63,7 @@ public: ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTruncate - virtual void SAL_CALL truncate( void ) + virtual void SAL_CALL truncate() throw( com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; -- cgit