diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-14 12:44:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-15 11:47:12 +0200 |
commit | 71b809959bb8f775d83dc52628448bb8b8322b28 (patch) | |
tree | f9aa4308050eb7d55611068602c0cf0e3c1b3690 /sax | |
parent | 135907f2061550624ee1859745d94eee01849070 (diff) |
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
Diffstat (limited to 'sax')
-rw-r--r-- | sax/source/expatwrap/attrlistimpl.cxx | 2 | ||||
-rw-r--r-- | sax/source/expatwrap/attrlistimpl.hxx | 2 | ||||
-rw-r--r-- | sax/source/expatwrap/sax_expat.cxx | 12 | ||||
-rw-r--r-- | sax/source/expatwrap/saxwriter.cxx | 22 | ||||
-rw-r--r-- | sax/source/fastparser/fastparser.cxx | 16 | ||||
-rw-r--r-- | sax/test/sax/testsax.cxx | 26 | ||||
-rw-r--r-- | sax/test/sax/testwriter.cxx | 28 | ||||
-rw-r--r-- | sax/test/saxdemo.cxx | 22 |
8 files changed, 65 insertions, 65 deletions
diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx index fad903fd4ff2..0eba8f06217d 100644 --- a/sax/source/expatwrap/attrlistimpl.cxx +++ b/sax/source/expatwrap/attrlistimpl.cxx @@ -57,7 +57,7 @@ struct AttributeList_impl -sal_Int16 AttributeList::getLength(void) throw (RuntimeException, std::exception) +sal_Int16 AttributeList::getLength() throw (RuntimeException, std::exception) { return static_cast<sal_Int16>(m_pImpl->vecAttribute.size()); } diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx index 160e5fb3952f..a03985e0c669 100644 --- a/sax/source/expatwrap/attrlistimpl.hxx +++ b/sax/source/expatwrap/attrlistimpl.hxx @@ -47,7 +47,7 @@ public: void clear(); public: // XAttributeList - virtual sal_Int16 SAL_CALL getLength(void) + virtual sal_Int16 SAL_CALL getLength() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 1996cf714cbb..aca68c02b7bc 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -169,7 +169,7 @@ public: public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE; private: @@ -366,19 +366,19 @@ public: } public: //XLocator - virtual sal_Int32 SAL_CALL getColumnNumber(void) throw (std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getColumnNumber() throw (std::exception) SAL_OVERRIDE { return XML_GetCurrentColumnNumber( m_pParser->getEntity().pParser ); } - virtual sal_Int32 SAL_CALL getLineNumber(void) throw (std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getLineNumber() throw (std::exception) SAL_OVERRIDE { return XML_GetCurrentLineNumber( m_pParser->getEntity().pParser ); } - virtual OUString SAL_CALL getPublicId(void) throw (std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getPublicId() throw (std::exception) SAL_OVERRIDE { return m_pParser->getEntity().structSource.sPublicId; } - virtual OUString SAL_CALL getSystemId(void) throw (std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getSystemId() throw (std::exception) SAL_OVERRIDE { return m_pParser->getEntity().structSource.sSystemId; } @@ -603,7 +603,7 @@ sal_Bool SaxExpatParser::supportsService(const OUString& ServiceName) throw (std } // XServiceInfo -css::uno::Sequence< OUString > SaxExpatParser::getSupportedServiceNames(void) throw (std::exception) +css::uno::Sequence< OUString > SaxExpatParser::getSupportedServiceNames() throw (std::exception) { css::uno::Sequence<OUString> seq(1); seq[0] = "com.sun.star.xml.sax.Parser"; diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 2c59889cc479..a7460dd25592 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -915,17 +915,17 @@ public: // XActiveDataSource e.WrappedException); } } - virtual Reference< XOutputStream > SAL_CALL getOutputStream(void) + virtual Reference< XOutputStream > SAL_CALL getOutputStream() throw(RuntimeException, std::exception) SAL_OVERRIDE { return m_out; } public: // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startElement(const OUString& aName, @@ -947,18 +947,18 @@ public: // XDocumentHandler throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XExtendedDocumentHandler - virtual void SAL_CALL startCDATA(void) throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endCDATA(void) throw(SAXException,RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startCDATA() throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endCDATA() throw(SAXException,RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL comment(const OUString& sComment) throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL unknown(const OUString& sString) throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL allowLineBreak(void) + virtual void SAL_CALL allowLineBreak() throw(SAXException,RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; private: @@ -1008,7 +1008,7 @@ sal_Bool SAXWriter::supportsService(const OUString& ServiceName) throw(std::exce } // XServiceInfo -Sequence< OUString > SAXWriter::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > SAXWriter::getSupportedServiceNames() throw (std::exception) { Sequence<OUString> seq(1); seq[0] = "com.sun.star.xml.sax.Writer"; @@ -1025,7 +1025,7 @@ void SAXWriter::startDocument() throw(SAXException, RuntimeE } -void SAXWriter::endDocument(void) throw(SAXException, RuntimeException, std::exception) +void SAXWriter::endDocument() throw(SAXException, RuntimeException, std::exception) { if( ! m_bDocStarted ) { @@ -1272,7 +1272,7 @@ void SAXWriter::setDocumentLocator(const Reference< XLocator >&) } -void SAXWriter::startCDATA(void) throw(SAXException, RuntimeException, std::exception) +void SAXWriter::startCDATA() throw(SAXException, RuntimeException, std::exception) { if( ! m_bDocStarted || m_bIsCDATA) { @@ -1289,7 +1289,7 @@ void SAXWriter::startCDATA(void) throw(SAXException, RuntimeException, std::exce m_bIsCDATA = true; } -void SAXWriter::endCDATA(void) throw (SAXException,RuntimeException, std::exception) +void SAXWriter::endCDATA() throw (SAXException,RuntimeException, std::exception) { if( ! m_bDocStarted || ! m_bIsCDATA) { diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index ba0c158eb18e..8768281ea2fe 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -337,34 +337,34 @@ public: void checkDispose() throw (RuntimeException) { if( !mpParser ) throw DisposedException(); } //XLocator - virtual sal_Int32 SAL_CALL getColumnNumber(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getLineNumber(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getPublicId(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSystemId(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getColumnNumber() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getLineNumber() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPublicId() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSystemId() throw (RuntimeException, std::exception) SAL_OVERRIDE; private: FastSaxParserImpl *mpParser; }; -sal_Int32 SAL_CALL FastLocatorImpl::getColumnNumber(void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL FastLocatorImpl::getColumnNumber() throw (RuntimeException, std::exception) { checkDispose(); return xmlSAX2GetColumnNumber( mpParser->getEntity().mpParser ); } -sal_Int32 SAL_CALL FastLocatorImpl::getLineNumber(void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL FastLocatorImpl::getLineNumber() throw (RuntimeException, std::exception) { checkDispose(); return xmlSAX2GetLineNumber( mpParser->getEntity().mpParser ); } -OUString SAL_CALL FastLocatorImpl::getPublicId(void) throw (RuntimeException, std::exception) +OUString SAL_CALL FastLocatorImpl::getPublicId() throw (RuntimeException, std::exception) { checkDispose(); return mpParser->getEntity().maStructSource.sPublicId; } -OUString SAL_CALL FastLocatorImpl::getSystemId(void) throw (RuntimeException, std::exception) +OUString SAL_CALL FastLocatorImpl::getSystemId() throw (RuntimeException, std::exception) { checkDispose(); return mpParser->getEntity().maStructSource.sSystemId; diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index caeac6d771d8..b520059975a3 100644 --- a/sax/test/sax/testsax.cxx +++ b/sax/test/sax/testsax.cxx @@ -63,10 +63,10 @@ public: sal_Int32 hTestHandle) throw ( IllegalArgumentException,RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException); + virtual sal_Bool SAL_CALL testPassed() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException); + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: void testSimple( const Reference < XParser > &r ); @@ -174,22 +174,22 @@ sal_Int32 OSaxParserTest::test( return hTestHandle; } -sal_Bool OSaxParserTest::testPassed(void) throw (RuntimeException) +sal_Bool OSaxParserTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OSaxParserTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OSaxParserTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OSaxParserTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OSaxParserTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OSaxParserTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OSaxParserTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -264,7 +264,7 @@ public: } // ExtendedDocumentHandler - virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException) + virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException) { m_iLevel = 0; m_iElementCount = 0; @@ -275,7 +275,7 @@ public: printf( "document started\n" ); } } - virtual void SAL_CALL endDocument(void) throw (SAXException, RuntimeException) + virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException) { if( m_bPrint ) { printf( "document finished\n" ); @@ -379,13 +379,13 @@ public: return source; } - virtual void SAL_CALL startCDATA(void) throw (SAXException,RuntimeException) + virtual void SAL_CALL startCDATA() throw (SAXException,RuntimeException) { if( m_bPrint ) { printf( "CDataStart :\n" ); } } - virtual void SAL_CALL endCDATA(void) throw (SAXException,RuntimeException) + virtual void SAL_CALL endCDATA() throw (SAXException,RuntimeException) { if( m_bPrint ) { printf( "CEndStart :\n" ); @@ -407,7 +407,7 @@ public: } } - virtual void SAL_CALL allowLineBreak( void) throw (SAXException, RuntimeException ) + virtual void SAL_CALL allowLineBreak() throw (SAXException, RuntimeException ) { } diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx index 3dc52fa83ca2..f078ea88d741 100644 --- a/sax/test/sax/testwriter.cxx +++ b/sax/test/sax/testwriter.cxx @@ -56,9 +56,9 @@ public: public: virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw (NotConnectedException, BufferSizeExceededException, RuntimeException); - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw (NotConnectedException, BufferSizeExceededException, RuntimeException); - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw (NotConnectedException, BufferSizeExceededException, RuntimeException); private: char m_pcFile[256]; @@ -77,13 +77,13 @@ void OFileWriter::writeBytes(const Sequence< sal_Int8 >& aData) } -void OFileWriter::flush(void) +void OFileWriter::flush() throw (NotConnectedException, BufferSizeExceededException, RuntimeException) { fflush( m_f ); } -void OFileWriter::closeOutput(void) +void OFileWriter::closeOutput() throw (NotConnectedException, BufferSizeExceededException, RuntimeException) { fclose( m_f ); @@ -115,11 +115,11 @@ public: sal_Int32 hTestHandle) throw ( IllegalArgumentException,RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException); - virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException); + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: void testSimple( const Reference< XExtendedDocumentHandler > &r ); @@ -152,7 +152,7 @@ public: ~AttributeListImpl(); public: - virtual sal_Int16 SAL_CALL getLength(void) throw (RuntimeException); + virtual sal_Int16 SAL_CALL getLength() throw (RuntimeException); virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException); virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException); virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException); @@ -199,7 +199,7 @@ struct AttributeListImpl_impl -sal_Int16 AttributeListImpl::getLength(void) throw (RuntimeException) +sal_Int16 AttributeListImpl::getLength() throw (RuntimeException) { return m_pImpl->vecAttribute.size(); } @@ -411,25 +411,25 @@ sal_Int32 OSaxWriterTest::test( -sal_Bool OSaxWriterTest::testPassed(void) throw (RuntimeException) +sal_Bool OSaxWriterTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OSaxWriterTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OSaxWriterTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OSaxWriterTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OSaxWriterTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OSaxWriterTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OSaxWriterTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx index 7b014060182e..5af47eb763ff 100644 --- a/sax/test/saxdemo.cxx +++ b/sax/test/saxdemo.cxx @@ -158,7 +158,7 @@ public: // Error handler public: // ExtendedDocumentHandler - virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException) + virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException) { m_iElementCount = 0; m_iAttributeCount = 0; @@ -166,7 +166,7 @@ public: // ExtendedDocumentHandler m_iCharCount=0; printf( "document started\n" ); } - virtual void SAL_CALL endDocument(void) throw (SAXException, RuntimeException) + virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException) { printf( "document finished\n" ); printf( "(ElementCount %d),(AttributeCount %d),(WhitespaceCount %d),(CharCount %d)\n", @@ -221,10 +221,10 @@ public: // ExtendedDocumentHandler return source; } - virtual void SAL_CALL startCDATA(void) throw (SAXException,RuntimeException) + virtual void SAL_CALL startCDATA() throw (SAXException,RuntimeException) { } - virtual void SAL_CALL endCDATA(void) throw (SAXException,RuntimeException) + virtual void SAL_CALL endCDATA() throw (SAXException,RuntimeException) { } virtual void SAL_CALL comment(const OUString& /* sComment */) throw (SAXException,RuntimeException) @@ -234,7 +234,7 @@ public: // ExtendedDocumentHandler { } - virtual void SAL_CALL allowLineBreak( void) throw (SAXException, RuntimeException ) + virtual void SAL_CALL allowLineBreak() throw (SAXException, RuntimeException ) { } @@ -259,7 +259,7 @@ public: ~AttributeListImpl(); public: - virtual sal_Int16 SAL_CALL getLength(void) throw (RuntimeException); + virtual sal_Int16 SAL_CALL getLength() throw (RuntimeException); virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException); virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException); virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException); @@ -306,7 +306,7 @@ struct AttributeListImpl_impl -sal_Int16 AttributeListImpl::getLength(void) throw (RuntimeException) +sal_Int16 AttributeListImpl::getLength() throw (RuntimeException) { return (sal_Int16) m_pImpl->vecAttribute.size(); } @@ -440,9 +440,9 @@ public: public: virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw (NotConnectedException, BufferSizeExceededException, RuntimeException); - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw (NotConnectedException, BufferSizeExceededException, RuntimeException); - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw (NotConnectedException, BufferSizeExceededException, RuntimeException); private: char m_pcFile[256]; @@ -461,13 +461,13 @@ void OFileWriter::writeBytes(const Sequence< sal_Int8 >& aData) } -void OFileWriter::flush(void) +void OFileWriter::flush() throw (NotConnectedException, BufferSizeExceededException, RuntimeException) { fflush( m_f ); } -void OFileWriter::closeOutput(void) +void OFileWriter::closeOutput() throw (NotConnectedException, BufferSizeExceededException, RuntimeException) { fclose( m_f ); |