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 /scripting/source | |
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 'scripting/source')
-rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 36 | ||||
-rw-r--r-- | scripting/source/stringresource/stringresource.hxx | 18 |
2 files changed, 27 insertions, 27 deletions
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 381552c29369..0c64fa2b6880 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -691,13 +691,13 @@ LocaleItem* StringResourceImpl::getClosestMatchItemForLocale( const Locale& loca return pRetItem; } -void StringResourceImpl::implModified( void ) +void StringResourceImpl::implModified() { m_bModified = true; implNotifyListeners(); } -void StringResourceImpl::implNotifyListeners( void ) +void StringResourceImpl::implNotifyListeners() { EventObject aEvent; aEvent.Source = static_cast< XInterface* >( (OWeakObject*)this ); @@ -729,13 +729,13 @@ bool StringResourceImpl::loadLocale( LocaleItem* pLocaleItem ) return true; } -void StringResourceImpl::implLoadAllLocales( void ) +void StringResourceImpl::implLoadAllLocales() { // Base implementation has nothing to load } -Reference< XMultiComponentFactory > StringResourceImpl::getMultiComponentFactory( void ) +Reference< XMultiComponentFactory > StringResourceImpl::getMultiComponentFactory() { ::osl::MutexGuard aGuard( getMutex() ); @@ -1477,13 +1477,13 @@ public: Reference< io::XInputStream > getInputStreamForSection( sal_Int32 nSize ); void seek( sal_Int32 nPos ); - sal_Int32 getPosition( void ) const + sal_Int32 getPosition() const { return m_nCurPos; } - sal_Int16 readInt16( void ); - sal_Int32 readInt32( void ); - sal_Unicode readUnicodeChar( void ); - OUString readString( void ); + sal_Int16 readInt16(); + sal_Int32 readInt32(); + sal_Unicode readUnicodeChar(); + OUString readString(); }; BinaryInput::BinaryInput( const Sequence< ::sal_Int8 >& aData, Reference< XMultiComponentFactory > xMCF, @@ -1527,7 +1527,7 @@ void BinaryInput::seek( sal_Int32 nPos ) } -sal_Int16 BinaryInput::readInt16( void ) +sal_Int16 BinaryInput::readInt16() { sal_Int16 nRet = 0; if( m_nCurPos + 2 <= m_nSize ) @@ -1541,7 +1541,7 @@ sal_Int16 BinaryInput::readInt16( void ) return nRet; } -sal_Int32 BinaryInput::readInt32( void ) +sal_Int32 BinaryInput::readInt32() { sal_Int32 nRet = 0; if( m_nCurPos + 4 <= m_nSize ) @@ -1559,7 +1559,7 @@ sal_Int32 BinaryInput::readInt32( void ) return nRet; } -sal_Unicode BinaryInput::readUnicodeChar( void ) +sal_Unicode BinaryInput::readUnicodeChar() { sal_uInt16 nRet = 0; if( m_nCurPos + 2 <= m_nSize ) @@ -1574,7 +1574,7 @@ sal_Unicode BinaryInput::readUnicodeChar( void ) return cRet; } -OUString BinaryInput::readString( void ) +OUString BinaryInput::readString() { OUStringBuffer aBuf; sal_Unicode c; @@ -1697,7 +1697,7 @@ bool checkNamingSceme( const OUString& aName, const OUString& aNameBase, return bSuccess; } -void StringResourcePersistenceImpl::implLoadAllLocales( void ) +void StringResourcePersistenceImpl::implLoadAllLocales() { for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { @@ -1770,7 +1770,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< OUStrin } // Scan locale properties files -void StringResourcePersistenceImpl::implScanLocales( void ) +void StringResourcePersistenceImpl::implScanLocales() { // Dummy implementation, method not called for this // base class, but pure virtual not possible- @@ -2542,7 +2542,7 @@ void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Sto // Scan locale properties files -void StringResourceWithStorageImpl::implScanLocales( void ) +void StringResourceWithStorageImpl::implScanLocales() { Reference< container::XNameAccess > xNameAccess( m_xStorage, UNO_QUERY ); if( xNameAccess.is() ) @@ -2897,7 +2897,7 @@ void StringResourceWithLocationImpl::setURL( const OUString& URL ) // Scan locale properties files -void StringResourceWithLocationImpl::implScanLocales( void ) +void StringResourceWithLocationImpl::implScanLocales() { const Reference< ucb::XSimpleFileAccess3 > xFileAccess = getFileAccess(); if( xFileAccess.is() && xFileAccess->isFolder( m_aLocation ) ) @@ -2935,7 +2935,7 @@ bool StringResourceWithLocationImpl::implLoadLocale( LocaleItem* pLocaleItem ) return bSuccess; } -const Reference< ucb::XSimpleFileAccess3 > StringResourceWithLocationImpl::getFileAccess( void ) +const Reference< ucb::XSimpleFileAccess3 > StringResourceWithLocationImpl::getFileAccess() { ::osl::MutexGuard aGuard( getMutex() ); diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 3054da7840cd..a9c51178dda2 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -126,7 +126,7 @@ protected: // Return the context's MultiComponentFactory ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory > - getMultiComponentFactory( void ); + getMultiComponentFactory(); // Returns the LocalItem for a given locale, if it exists, otherwise NULL // This method compares the locales exactly, no closest match search is performed @@ -140,8 +140,8 @@ protected: bool FindClosestMatch, bool bUseDefaultIfNoMatch ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - void implModified( void ); - void implNotifyListeners( void ); + void implModified(); + void implNotifyListeners(); //=== Impl methods for ...ForLocale methods === OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ) @@ -157,7 +157,7 @@ protected: // successful. Default implementation in base class just returns true. virtual bool loadLocale( LocaleItem* pLocaleItem ); - virtual void implLoadAllLocales( void ); + virtual void implLoadAllLocales(); public: StringResourceImpl( @@ -250,7 +250,7 @@ protected: throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // Scan locale properties files - virtual void implScanLocales( void ); + virtual void implScanLocales(); // Method to load a locale if necessary, returns true if loading was successful virtual bool loadLocale( LocaleItem* pLocaleItem ) SAL_OVERRIDE; @@ -258,7 +258,7 @@ protected: // does the actual loading virtual bool implLoadLocale( LocaleItem* pLocaleItem ); - virtual void implLoadAllLocales( void ) SAL_OVERRIDE; + virtual void implLoadAllLocales() SAL_OVERRIDE; void implScanLocaleNames( const ::com::sun::star::uno::Sequence< OUString >& aContentSeq ); static OUString implGetFileNameForLocaleItem( LocaleItem* pLocaleItem, const OUString& aNameBase ); @@ -418,7 +418,7 @@ class StringResourceWithStorageImpl : public StringResourceWithStorageImpl_BASE ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xStorage; bool m_bStorageChanged; - virtual void implScanLocales( void ) SAL_OVERRIDE; + virtual void implScanLocales() SAL_OVERRIDE; virtual bool implLoadLocale( LocaleItem* pLocaleItem ) SAL_OVERRIDE; public: @@ -542,9 +542,9 @@ class StringResourceWithLocationImpl : public StringResourceWithLocationImpl_BAS com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFI; com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInteractionHandler; - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > getFileAccess( void ); + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > getFileAccess(); - virtual void implScanLocales( void ) SAL_OVERRIDE; + virtual void implScanLocales() SAL_OVERRIDE; virtual bool implLoadLocale( LocaleItem* pLocaleItem ) SAL_OVERRIDE; public: |