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 /xmlsecurity | |
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 'xmlsecurity')
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/certificatechooser.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 4 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 8 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/certificatechooser.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/certificateviewer.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 6 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/resourcemanager.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/resourcemanager.hxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/saxhelper.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/saxhelper.hxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/xmlstreamio.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/xmlstreamio.hxx | 6 |
14 files changed, 27 insertions, 27 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 40bafdd4c755..f12837a49ca2 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -54,7 +54,7 @@ private: bool mbInitialized; - sal_uInt16 GetSelectedEntryPos( void ) const; + sal_uInt16 GetSelectedEntryPos() const; DECL_LINK(ViewButtonHdl, void *); DECL_LINK( CertificateHighlightHdl, void* ); DECL_LINK( CertificateSelectHdl, void* ); diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 4e9188616099..f3eea2ba062d 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -102,7 +102,7 @@ private: vcl::Font m_aFixedWidthFont; DECL_LINK( ElementSelectHdl, void* ); - void Clear( void ); + void Clear(); void InsertElement( const OUString& _rField, const OUString& _rValue, const OUString& _rDetails, bool _bFixedWidthFont = false ); public: @@ -129,7 +129,7 @@ private: DECL_LINK( ViewCertHdl, void* ); DECL_LINK( CertSelectHdl, void* ); - void Clear( void ); + void Clear(); SvTreeListEntry* InsertCert( SvTreeListEntry* _pParent, const OUString& _rName, css::uno::Reference< css::security::XCertificate > rxCert, bool bValid); diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 63c16d71293f..2707fe5e2ccd 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -87,7 +87,7 @@ public: mpDlg = pTabDlg; } - virtual void ClosePage( void ) = 0; + virtual void ClosePage() = 0; }; class MacroSecurityLevelTP : public MacroSecurityTP @@ -106,7 +106,7 @@ protected: public: MacroSecurityLevelTP( vcl::Window* pParent, MacroSecurity* _pDlg ); - virtual void ClosePage( void ) SAL_OVERRIDE; + virtual void ClosePage() SAL_OVERRIDE; }; @@ -134,7 +134,7 @@ private: DECL_LINK( TrustCertLBSelectHdl, void* ); DECL_LINK( TrustFileLocLBSelectHdl, void* ); - void FillCertLB( void ); + void FillCertLB(); void ImplCheckButtons(); public: @@ -142,7 +142,7 @@ public: virtual ~MacroSecurityTrustedSourcesTP(); virtual void ActivatePage() SAL_OVERRIDE; - virtual void ClosePage( void ) SAL_OVERRIDE; + virtual void ClosePage() SAL_OVERRIDE; }; diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index c475a3c4be0e..4f822527997b 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; #define INVAL_SEL 0xFFFF -sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) const +sal_uInt16 CertificateChooser::GetSelectedEntryPos() const { sal_uInt16 nSel = INVAL_SEL; diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 309a29a6bbf2..7a14960be47c 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -151,7 +151,7 @@ inline Details_UserDatat::Details_UserDatat( const OUString& _rTxt, bool _bFixed } -void CertificateViewerDetailsTP::Clear( void ) +void CertificateViewerDetailsTP::Clear() { m_pValueDetails->SetText( OUString() ); sal_uLong i = 0; @@ -393,7 +393,7 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl) return 0; } -void CertificateViewerCertPathTP::Clear( void ) +void CertificateViewerCertPathTP::Clear() { mpCertStatusML->SetText( OUString() ); sal_uLong i = 0; diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index e5246617540a..c06982339d02 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -167,7 +167,7 @@ IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl) return 0; } -void MacroSecurityLevelTP::ClosePage( void ) +void MacroSecurityLevelTP::ClosePage() { mpDlg->maSecOptions.SetMacroSecurityLevel( mnCurLevel ); } @@ -296,7 +296,7 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl) return 0; } -void MacroSecurityTrustedSourcesTP::FillCertLB( void ) +void MacroSecurityTrustedSourcesTP::FillCertLB() { m_pTrustCertLB->Clear(); @@ -403,7 +403,7 @@ void MacroSecurityTrustedSourcesTP::ActivatePage() FillCertLB(); } -void MacroSecurityTrustedSourcesTP::ClosePage( void ) +void MacroSecurityTrustedSourcesTP::ClosePage() { sal_Int32 nEntryCnt = m_pTrustFileLocLB->GetEntryCount(); if( nEntryCnt ) diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index ed2c02c8d9da..83420b9d9a16 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -36,14 +36,14 @@ namespace XmlSec static ResMgr* pResMgr = 0; static SvtSysLocale* pSysLocale = 0; - ResMgr* GetResMgr( void ) + ResMgr* GetResMgr() { if (!pResMgr) pResMgr = ResMgr::CreateResMgr("xmlsec"); return pResMgr; } - const LocaleDataWrapper& GetLocaleData( void ) + const LocaleDataWrapper& GetLocaleData() { if (!pSysLocale) pSysLocale = new SvtSysLocale; diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx index 5d7cebcf4a73..992e33909e74 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.hxx +++ b/xmlsecurity/source/dialogs/resourcemanager.hxx @@ -34,9 +34,9 @@ class LocaleDataWrapper; namespace XmlSec { - ResMgr* GetResMgr( void ); + ResMgr* GetResMgr(); - const LocaleDataWrapper& GetLocaleData( void ); + const LocaleDataWrapper& GetLocaleData(); DateTime GetDateTime( const ::com::sun::star::util::DateTime& _rDT ); OUString GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT ); OUString GetDateString( const ::com::sun::star::util::DateTime& _rDT ); diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 075167865815..be771e099251 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -217,7 +217,7 @@ void SAXHelper::setCurrentNode(const xmlNodePtr pNode) /** * XDocumentHandler -- start an xml document */ -void SAXHelper::startDocument( void ) +void SAXHelper::startDocument() throw( cssxs::SAXException , cssu::RuntimeException ) { if( m_pParserCtxt == NULL) @@ -246,7 +246,7 @@ void SAXHelper::startDocument( void ) /** * XDocumentHandler -- end an xml document */ -void SAXHelper::endDocument( void ) +void SAXHelper::endDocument() throw( cssxs::SAXException , cssu::RuntimeException ) { m_pSaxHandler->endDocument( m_pParserCtxt ) ; diff --git a/xmlsecurity/source/xmlsec/saxhelper.hxx b/xmlsecurity/source/xmlsec/saxhelper.hxx index 4683d3fa8f03..bdd2099125da 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.hxx +++ b/xmlsecurity/source/xmlsec/saxhelper.hxx @@ -45,10 +45,10 @@ class SAXHelper void setCurrentNode(const xmlNodePtr pNode); xmlDocPtr getDocument() { return m_pParserCtxt->myDoc;} - void startDocument( void ) + void startDocument() throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; - void endDocument( void ) + void endDocument() throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; void startElement( diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index 469cdeb030c4..69f6c5130ab5 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -37,7 +37,7 @@ XMLElementWrapper_XmlSecImpl::XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNod /* XUnoTunnel */ -cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId( void ) +cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() throw (cssu::RuntimeException) { static ::cppu::OImplementationId* pId = 0; diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index eb029cade1a8..4ecaf789b7b3 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -65,7 +65,7 @@ public: /* com::sun::star::lang::XUnoTunnel */ virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId( void ) + static com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId() throw(com::sun::star::uno::RuntimeException); /* com::sun::star::lang::XServiceInfo */ diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 1034e8bde594..032ee47dae22 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -197,7 +197,7 @@ int xmlRegisterStreamInputCallbacks( return 0 ; } -int xmlUnregisterStreamInputCallbacks( void ) +int xmlUnregisterStreamInputCallbacks() { if( ( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) { //Clear the uir-stream binding diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.hxx b/xmlsecurity/source/xmlsec/xmlstreamio.hxx index f0d566ff6ece..4765a0299816 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.hxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.hxx @@ -23,14 +23,14 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/xml/crypto/XUriBinding.hpp> -int xmlEnableStreamInputCallbacks( void ) ; -void xmlDisableStreamInputCallbacks( void ) ; +int xmlEnableStreamInputCallbacks() ; +void xmlDisableStreamInputCallbacks() ; int xmlRegisterStreamInputCallbacks( ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding ) ; -int xmlUnregisterStreamInputCallbacks( void ) ; +int xmlUnregisterStreamInputCallbacks() ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSTREAMIO_HXX |