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 --- package/inc/ZipPackage.hxx | 2 +- package/inc/ZipPackageBuffer.hxx | 2 +- package/inc/ZipPackageEntry.hxx | 4 ++-- package/inc/ZipPackageStream.hxx | 2 +- package/source/manifest/ManifestImport.cxx | 2 +- package/source/manifest/ManifestImport.hxx | 2 +- package/source/zipapi/Deflater.cxx | 2 +- package/source/zipapi/ZipEnumeration.cxx | 2 +- package/source/zipapi/ZipOutputEntry.cxx | 2 +- package/source/zipapi/ZipOutputStream.cxx | 2 +- package/source/zippackage/ZipPackage.cxx | 4 ++-- package/source/zippackage/ZipPackageBuffer.cxx | 2 +- package/source/zippackage/ZipPackageFolderEnumeration.cxx | 2 +- package/source/zippackage/ZipPackageFolderEnumeration.hxx | 2 +- package/source/zippackage/ZipPackageSink.cxx | 4 ++-- package/source/zippackage/ZipPackageStream.cxx | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) (limited to 'package') diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index 3e03b1396b39..86d6e10c8290 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -124,7 +124,7 @@ protected: public: ZipPackage( const ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > &xContext ); - virtual ~ZipPackage( void ); + virtual ~ZipPackage(); ZipFile& getZipFile() { return *m_pZipFile;} sal_Int32 getFormat() const { return m_nFormat; } diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx index bdffcb729156..8f1b9ff7b97d 100644 --- a/package/inc/ZipPackageBuffer.hxx +++ b/package/inc/ZipPackageBuffer.hxx @@ -37,7 +37,7 @@ protected: bool m_bMustInitBuffer; public: ZipPackageBuffer(sal_Int64 nNewBufferSize); - virtual ~ZipPackageBuffer(void); + virtual ~ZipPackageBuffer(); inline void realloc ( sal_Int32 nSize ) { m_aBuffer.realloc ( nSize ); } inline const sal_Int8 * getConstArray () const { return m_aBuffer.getConstArray(); } diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx index d1ff8de8b5cf..fe19772f5d05 100644 --- a/package/inc/ZipPackageEntry.hxx +++ b/package/inc/ZipPackageEntry.hxx @@ -58,7 +58,7 @@ protected: public: ZipEntry aEntry; ZipPackageEntry(); - virtual ~ZipPackageEntry( void ); + virtual ~ZipPackageEntry(); const OUString& GetMediaType () const { return msMediaType; } void SetMediaType ( const OUString & sNewType) { msMediaType = sNewType; } @@ -73,7 +73,7 @@ public: const css::uno::Sequence < sal_Int8 >& rEncryptionKey, const rtlRandomPool &rRandomPool ) = 0; - void clearParent ( void ) + void clearParent() { // xParent.clear(); mpParent = NULL; diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index af2c7217d86d..d94d662bfbc5 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -124,7 +124,7 @@ public: const css::uno::Reference < css::uno::XComponentContext >& xContext, sal_Int32 nFormat, bool bAllowRemoveOnInsert ); - virtual ~ZipPackageStream( void ); + virtual ~ZipPackageStream(); ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRawEncrStreamNoHeaderCopy(); ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > TryToGetRawFromDataStream( diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index e242eac90603..9376ab060721 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -94,7 +94,7 @@ ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManV aStack.reserve( 10 ); } -ManifestImport::~ManifestImport ( void ) +ManifestImport::~ManifestImport() { } diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 23151358bc56..7bebfb1f13f1 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -122,7 +122,7 @@ protected: public: ManifestImport( std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rNewVector ); - virtual ~ManifestImport( void ); + virtual ~ManifestImport(); virtual void SAL_CALL startDocument( ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument( ) diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 9ff3e7d5d1b8..939814a345b8 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -31,7 +31,7 @@ using namespace ZipUtils; * library. */ -Deflater::~Deflater(void) +Deflater::~Deflater() { end(); } diff --git a/package/source/zipapi/ZipEnumeration.cxx b/package/source/zipapi/ZipEnumeration.cxx index c5686d6c3b62..aab7325afdb0 100644 --- a/package/source/zipapi/ZipEnumeration.cxx +++ b/package/source/zipapi/ZipEnumeration.cxx @@ -26,7 +26,7 @@ ZipEnumeration::ZipEnumeration( EntryHash & rNewEntryHash) , aIterator(rEntryHash.begin()) { } -ZipEnumeration::~ZipEnumeration( void ) +ZipEnumeration::~ZipEnumeration() { } bool SAL_CALL ZipEnumeration::hasMoreElements() diff --git a/package/source/zipapi/ZipOutputEntry.cxx b/package/source/zipapi/ZipOutputEntry.cxx index ae7b64530b0f..de44ae46f6b4 100644 --- a/package/source/zipapi/ZipOutputEntry.cxx +++ b/package/source/zipapi/ZipOutputEntry.cxx @@ -71,7 +71,7 @@ ZipOutputEntry::ZipOutputEntry( } } -ZipOutputEntry::~ZipOutputEntry( void ) +ZipOutputEntry::~ZipOutputEntry() { } diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index 7cf7074548f5..7c7924d63ea7 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -47,7 +47,7 @@ ZipOutputStream::ZipOutputStream( const uno::Reference < io::XOutputStream > &xO { } -ZipOutputStream::~ZipOutputStream( void ) +ZipOutputStream::~ZipOutputStream() { } diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index ca47523d560d..5013e93a2e5f 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -162,7 +162,7 @@ ZipPackage::ZipPackage ( const uno::Reference < XComponentContext > &xContext ) m_xRootFolder = m_pRootFolder = new ZipPackageFolder( m_xContext, m_nFormat, m_bAllowRemoveOnInsert ); } -ZipPackage::~ZipPackage( void ) +ZipPackage::~ZipPackage() { delete m_pZipFile; @@ -1656,7 +1656,7 @@ uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno:: namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; } -Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId( void ) +Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId() throw ( RuntimeException ) { ::cppu::OImplementationId &rId = lcl_ImplId::get(); diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/zippackage/ZipPackageBuffer.cxx index 931c045de655..00f2640114b9 100644 --- a/package/source/zippackage/ZipPackageBuffer.cxx +++ b/package/source/zippackage/ZipPackageBuffer.cxx @@ -38,7 +38,7 @@ ZipPackageBuffer::ZipPackageBuffer(sal_Int64 nNewBufferSize ) , m_bMustInitBuffer ( true ) { } -ZipPackageBuffer::~ZipPackageBuffer(void) +ZipPackageBuffer::~ZipPackageBuffer() { } diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/zippackage/ZipPackageFolderEnumeration.cxx index 1699ce6d67ff..8189e553cb67 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx @@ -35,7 +35,7 @@ ZipPackageFolderEnumeration::ZipPackageFolderEnumeration ( ContentHash &rInput) { } -ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration( void ) +ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration() { } diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx index 569714665509..7c8e79ebefba 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -36,7 +36,7 @@ protected: public: //ZipPackageFolderEnumeration (unordered_map < OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); ZipPackageFolderEnumeration (ContentHash &rInput); - virtual ~ZipPackageFolderEnumeration( void ); + virtual ~ZipPackageFolderEnumeration(); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements( ) diff --git a/package/source/zippackage/ZipPackageSink.cxx b/package/source/zippackage/ZipPackageSink.cxx index c33911e2c6c6..738ccb4f9d14 100644 --- a/package/source/zippackage/ZipPackageSink.cxx +++ b/package/source/zippackage/ZipPackageSink.cxx @@ -19,11 +19,11 @@ #include -ZipPackageSink::ZipPackageSink(void) +ZipPackageSink::ZipPackageSink() : xStream ( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > (NULL)) { } -ZipPackageSink::~ZipPackageSink(void) +ZipPackageSink::~ZipPackageSink() { } void SAL_CALL ZipPackageSink::setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream ) diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 8e2bbb07dadf..0676ce5802ea 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -113,7 +113,7 @@ ZipPackageStream::ZipPackageStream ( ZipPackage & rNewPackage, aEntry.nExtraLen = -1; } -ZipPackageStream::~ZipPackageStream( void ) +ZipPackageStream::~ZipPackageStream() { } -- cgit