summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 12:44:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-15 11:47:12 +0200
commit71b809959bb8f775d83dc52628448bb8b8322b28 (patch)
treef9aa4308050eb7d55611068602c0cf0e3c1b3690 /ucb
parent135907f2061550624ee1859745d94eee01849070 (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 'ucb')
-rw-r--r--ucb/source/ucp/file/bc.cxx16
-rw-r--r--ucb/source/ucp/file/bc.hxx10
-rw-r--r--ucb/source/ucp/file/filnot.cxx2
-rw-r--r--ucb/source/ucp/file/filnot.hxx12
-rw-r--r--ucb/source/ucp/file/filrset.hxx12
-rw-r--r--ucb/source/ucp/file/filstr.cxx2
-rw-r--r--ucb/source/ucp/file/filstr.hxx2
-rw-r--r--ucb/source/ucp/file/filtask.cxx2
-rw-r--r--ucb/source/ucp/file/filtask.hxx2
-rw-r--r--ucb/source/ucp/file/prov.cxx2
-rw-r--r--ucb/source/ucp/file/prov.hxx2
-rw-r--r--ucb/source/ucp/file/shell.cxx4
-rw-r--r--ucb/source/ucp/file/shell.hxx4
-rw-r--r--ucb/source/ucp/ftp/ftpcontentidentifier.cxx4
-rw-r--r--ucb/source/ucp/ftp/ftpcontentidentifier.hxx4
-rw-r--r--ucb/source/ucp/ftp/ftpdirp.hxx4
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetbase.cxx4
-rw-r--r--ucb/source/ucp/ftp/ftpurl.hxx2
-rw-r--r--ucb/source/ucp/gio/gio_inputstream.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_inputstream.hxx8
-rw-r--r--ucb/source/ucp/gio/gio_mount.hxx2
-rw-r--r--ucb/source/ucp/gio/gio_outputstream.cxx6
-rw-r--r--ucb/source/ucp/gio/gio_outputstream.hxx8
-rw-r--r--ucb/source/ucp/gio/gio_seekable.cxx4
-rw-r--r--ucb/source/ucp/gio/gio_seekable.hxx6
-rw-r--r--ucb/source/ucp/gvfs/gvfs_stream.cxx12
-rw-r--r--ucb/source/ucp/gvfs/gvfs_stream.hxx16
-rw-r--r--ucb/source/ucp/webdav-neon/NeonInputStream.cxx6
-rw-r--r--ucb/source/ucp/webdav-neon/NeonInputStream.hxx10
-rw-r--r--ucb/source/ucp/webdav-neon/NeonSession.hxx2
-rw-r--r--ucb/source/ucp/webdav-neon/NeonUri.hxx16
-rw-r--r--ucb/source/ucp/webdav/SerfInputStream.cxx6
-rw-r--r--ucb/source/ucp/webdav/SerfInputStream.hxx10
-rw-r--r--ucb/source/ucp/webdav/SerfSession.hxx2
-rw-r--r--ucb/source/ucp/webdav/SerfUri.hxx16
35 files changed, 111 insertions, 111 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 9d48cfd08726..39a5c8dc230c 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -137,7 +137,7 @@ BaseContent::~BaseContent( )
void SAL_CALL
-BaseContent::acquire( void )
+BaseContent::acquire()
throw()
{
OWeakObject::acquire();
@@ -145,7 +145,7 @@ BaseContent::acquire( void )
void SAL_CALL
-BaseContent::release( void )
+BaseContent::release()
throw()
{
OWeakObject::release();
@@ -292,7 +292,7 @@ XTYPEPROVIDER_IMPL_10( BaseContent,
sal_Int32 SAL_CALL
-BaseContent::createCommandIdentifier( void )
+BaseContent::createCommandIdentifier()
throw( RuntimeException, std::exception )
{
return m_pMyShell->getCommandId();
@@ -1265,7 +1265,7 @@ void SAL_CALL BaseContent::endTask( sal_Int32 CommandId )
ContentEventNotifier*
-BaseContent::cDEL( void )
+BaseContent::cDEL()
{
osl::MutexGuard aGuard( m_aMutex );
@@ -1307,7 +1307,7 @@ BaseContent::cEXC( const OUString& aNewName )
ContentEventNotifier*
-BaseContent::cCEL( void )
+BaseContent::cCEL()
{
osl::MutexGuard aGuard( m_aMutex );
ContentEventNotifier* p = 0;
@@ -1321,7 +1321,7 @@ BaseContent::cCEL( void )
}
PropertySetInfoChangeNotifier*
-BaseContent::cPSL( void )
+BaseContent::cPSL()
{
osl::MutexGuard aGuard( m_aMutex );
PropertySetInfoChangeNotifier* p = 0;
@@ -1336,7 +1336,7 @@ BaseContent::cPSL( void )
PropertyChangeNotifier*
-BaseContent::cPCL( void )
+BaseContent::cPCL()
{
osl::MutexGuard aGuard( m_aMutex );
@@ -1369,7 +1369,7 @@ BaseContent::cPCL( void )
}
-OUString BaseContent::getKey( void )
+OUString BaseContent::getKey()
{
return m_aUncPath;
}
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index f1e698728527..21b6acad5913 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -259,12 +259,12 @@ namespace fileaccess {
// Notifier
- ContentEventNotifier* cDEL( void ) SAL_OVERRIDE;
+ ContentEventNotifier* cDEL() SAL_OVERRIDE;
ContentEventNotifier* cEXC( const OUString& aNewName ) SAL_OVERRIDE;
- ContentEventNotifier* cCEL( void ) SAL_OVERRIDE;
- PropertySetInfoChangeNotifier* cPSL( void ) SAL_OVERRIDE;
- PropertyChangeNotifier* cPCL( void ) SAL_OVERRIDE;
- OUString getKey( void ) SAL_OVERRIDE;
+ ContentEventNotifier* cCEL() SAL_OVERRIDE;
+ PropertySetInfoChangeNotifier* cPSL() SAL_OVERRIDE;
+ PropertyChangeNotifier* cPCL() SAL_OVERRIDE;
+ OUString getKey() SAL_OVERRIDE;
private:
// Data members
diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx
index a66b17ac74d5..2f84445aae84 100644
--- a/ucb/source/ucp/file/filnot.cxx
+++ b/ucb/source/ucp/file/filnot.cxx
@@ -79,7 +79,7 @@ void ContentEventNotifier::notifyChildInserted( const OUString& aChildName )
}
}
-void ContentEventNotifier::notifyDeleted( void )
+void ContentEventNotifier::notifyDeleted()
{
ContentEvent aEvt( m_xCreatorContent,
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 5e782d1b61e2..327ec4832fff 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -56,7 +56,7 @@ namespace fileaccess {
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners );
void notifyChildInserted( const OUString& aChildName );
- void notifyDeleted( void );
+ void notifyDeleted();
void notifyRemoved( const OUString& aChildName );
void notifyExchanged( );
};
@@ -109,11 +109,11 @@ namespace fileaccess {
// Side effect of this function is the change of the name
virtual ContentEventNotifier* cEXC( const OUString& aNewName ) = 0;
// Side effect is the change of the state of the object to "deleted".
- virtual ContentEventNotifier* cDEL( void ) = 0;
- virtual ContentEventNotifier* cCEL( void ) = 0;
- virtual PropertySetInfoChangeNotifier* cPSL( void ) = 0;
- virtual PropertyChangeNotifier* cPCL( void ) = 0;
- virtual OUString getKey( void ) = 0;
+ virtual ContentEventNotifier* cDEL() = 0;
+ virtual ContentEventNotifier* cCEL() = 0;
+ virtual PropertySetInfoChangeNotifier* cPSL() = 0;
+ virtual PropertyChangeNotifier* cPCL() = 0;
+ virtual OUString getKey() = 0;
protected:
~Notifier() {}
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index d60eff191276..625baad0db15 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -63,7 +63,7 @@ class XResultSet_impl : public Notifier,
virtual ~XResultSet_impl();
- virtual ContentEventNotifier* cDEL( void ) SAL_OVERRIDE
+ virtual ContentEventNotifier* cDEL() SAL_OVERRIDE
{
return 0;
}
@@ -73,22 +73,22 @@ class XResultSet_impl : public Notifier,
return 0;
}
- virtual ContentEventNotifier* cCEL( void ) SAL_OVERRIDE
+ virtual ContentEventNotifier* cCEL() SAL_OVERRIDE
{
return 0;
}
- virtual PropertySetInfoChangeNotifier* cPSL( void ) SAL_OVERRIDE
+ virtual PropertySetInfoChangeNotifier* cPSL() SAL_OVERRIDE
{
return 0;
}
- virtual PropertyChangeNotifier* cPCL( void ) SAL_OVERRIDE
+ virtual PropertyChangeNotifier* cPCL() SAL_OVERRIDE
{
return 0;
}
- virtual OUString getKey( void ) SAL_OVERRIDE
+ virtual OUString getKey() SAL_OVERRIDE
{
return m_aBaseDirectory;
}
@@ -628,7 +628,7 @@ class XResultSet_impl : public Notifier,
sal_Int32 m_nMinorErrorCode;
// Methods
- bool SAL_CALL OneMore( void )
+ bool SAL_CALL OneMore()
throw( com::sun::star::sdbc::SQLException,
com::sun::star::uno::RuntimeException );
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 95391728d21c..287381294cb2 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -115,7 +115,7 @@ XStream_impl::getOutputStream( )
}
-void SAL_CALL XStream_impl::truncate(void)
+void SAL_CALL XStream_impl::truncate()
throw( io::IOException, uno::RuntimeException, std::exception )
{
if (osl::FileBase::E_None != m_aFile.setSize(0))
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index 66e2b9878f61..6b10d1811fa2 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -73,7 +73,7 @@ class XStream_impl : public cppu::WeakImplHelper6<
// 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;
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 37f96a9baaaa..35bd200b0b7b 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -147,7 +147,7 @@ void SAL_CALL TaskManager::installError( sal_Int32 CommandId,
sal_Int32 SAL_CALL
-TaskManager::getCommandId( void )
+TaskManager::getCommandId()
{
osl::MutexGuard aGuard( m_aMutex );
return ++m_nCommandId;
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 886bdd8b78ca..acf67c6dffbf 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -157,7 +157,7 @@ namespace fileaccess
const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xCommandEnv )
throw( com::sun::star::ucb::DuplicateCommandIdentifierException );
- sal_Int32 SAL_CALL getCommandId( void );
+ sal_Int32 SAL_CALL getCommandId();
void SAL_CALL abort( sal_Int32 CommandId );
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 1a7e6a1c3abf..de4ef78c768c 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -425,7 +425,7 @@ XPropertySetInfoImpl2::hasPropertyByName(
-void SAL_CALL FileProvider::initProperties( void )
+void SAL_CALL FileProvider::initProperties()
{
osl::MutexGuard aGuard( m_aMutex );
if( ! m_xPropertySetInfo.is() )
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 280e6ea44845..38d278592721 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -192,7 +192,7 @@ namespace fileaccess {
// Members
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
- void SAL_CALL initProperties( void );
+ void SAL_CALL initProperties();
osl::Mutex m_aMutex;
OUString m_HostName;
OUString m_HomeDirectory;
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 7e880e00589b..63c0f74d6343 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -3051,14 +3051,14 @@ shell::getScheme( OUString& Scheme )
}
OUString SAL_CALL
-shell::getImplementationName_static( void )
+shell::getImplementationName_static()
{
return OUString("com.sun.star.comp.ucb.FileProvider");
}
uno::Sequence< OUString > SAL_CALL
-shell::getSupportedServiceNames_static( void )
+shell::getSupportedServiceNames_static()
{
OUString Supported("com.sun.star.ucb.FileContentProvider");
com::sun::star::uno::Sequence< OUString > Seq( &Supported,1 );
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 0985ed66aa6c..3d5cfe2a90af 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -583,9 +583,9 @@ namespace fileaccess {
static void SAL_CALL getScheme( OUString& Scheme );
- static OUString SAL_CALL getImplementationName_static( void );
+ static OUString SAL_CALL getImplementationName_static();
- static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( void );
+ static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
}; // end class shell
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index 6e7d15e036b7..b492c5d582c5 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -62,12 +62,12 @@ FTPContentIdentifier::queryInterface(
}
-void SAL_CALL FTPContentIdentifier::acquire( void ) throw() {
+void SAL_CALL FTPContentIdentifier::acquire() throw() {
OWeakObject::acquire();
}
-void SAL_CALL FTPContentIdentifier::release( void ) throw() {
+void SAL_CALL FTPContentIdentifier::release() throw() {
OWeakObject::release();
}
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index 6ec021c23347..e08eae7b957b 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
@@ -56,9 +56,9 @@ namespace ftp {
queryInterface( const com::sun::star::uno::Type& rType )
throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( void ) throw() SAL_OVERRIDE;
+ virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
- virtual void SAL_CALL release( void ) throw() SAL_OVERRIDE;
+ virtual void SAL_CALL release() throw() SAL_OVERRIDE;
// XTypeProvider
diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx
index c306989b838e..676a5064a35c 100644
--- a/ucb/source/ucp/ftp/ftpdirp.hxx
+++ b/ucb/source/ucp/ftp/ftpdirp.hxx
@@ -67,7 +67,7 @@ namespace ftp {
void SetSec(sal_uInt16 seconds) { Seconds = seconds; }
void SetNanoSec(sal_uInt32 nanoSec) { NanoSeconds = nanoSec; }
- sal_uInt16 GetMonth(void) { return Month; }
+ sal_uInt16 GetMonth() { return Month; }
};
@@ -92,7 +92,7 @@ namespace ftp {
sal_uInt32 m_nMode;
sal_uInt32 m_nSize;
- FTPDirentry(void)
+ FTPDirentry()
: m_aDate(0,0,0,0,0,0,0),
m_nMode(INETCOREFTP_FILEMODE_UNKNOWN),
m_nSize((sal_uInt32)(-1)) { }
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index a1ed5f7aab07..ba9f331c7150 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -442,14 +442,14 @@ public:
{
}
- void SAL_CALL acquire( void )
+ void SAL_CALL acquire()
throw() SAL_OVERRIDE
{
OWeakObject::acquire();
}
- void SAL_CALL release( void )
+ void SAL_CALL release()
throw() SAL_OVERRIDE
{
OWeakObject::release();
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 496c1768a2c7..ecb88416a0ea 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -115,7 +115,7 @@ namespace ftp {
void child(const OUString& title);
/** returns the unencoded title */
- OUString child(void) const;
+ OUString child() const;
std::vector<FTPDirentry> list(sal_Int16 nMode) const
throw(curl_exception);
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;
};
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx
index db2fc812e586..e453b98f1ed0 100644
--- a/ucb/source/ucp/gvfs/gvfs_stream.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx
@@ -40,7 +40,7 @@ Stream::Stream( GnomeVFSHandle *handle,
gnome_vfs_file_info_copy (&m_info, aInfo);
}
-Stream::~Stream( void )
+Stream::~Stream()
{
if (m_handle) {
gnome_vfs_close (m_handle);
@@ -173,7 +173,7 @@ sal_Int32 SAL_CALL Stream::available( )
return 0; // cf. filinpstr.cxx
}
-void SAL_CALL Stream::closeInput( void )
+void SAL_CALL Stream::closeInput()
throw( NotConnectedException,
IOException,
RuntimeException )
@@ -241,7 +241,7 @@ sal_Int64 SAL_CALL Stream::getLength()
// XTruncate
-void SAL_CALL Stream::truncate( void )
+void SAL_CALL Stream::truncate()
throw( com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException )
{
@@ -281,13 +281,13 @@ void SAL_CALL Stream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8
}
}
-void SAL_CALL Stream::flush( void )
+void SAL_CALL Stream::flush()
throw( NotConnectedException, BufferSizeExceededException,
IOException, RuntimeException )
{
}
-void SAL_CALL Stream::closeOutput( void )
+void SAL_CALL Stream::closeOutput()
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException )
@@ -303,7 +303,7 @@ void SAL_CALL Stream::closeOutput( void )
// Misc.
-void Stream::closeStream( void )
+void Stream::closeStream()
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException )
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.hxx b/ucb/source/ucp/gvfs/gvfs_stream.hxx
index e58143471132..aaf249dc45ea 100644
--- a/ucb/source/ucp/gvfs/gvfs_stream.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.hxx
@@ -54,7 +54,7 @@ private:
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException );
- void closeStream( void )
+ void closeStream()
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException );
@@ -67,10 +67,10 @@ public:
// XInterface
virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( void )
+ virtual void SAL_CALL acquire()
throw () SAL_OVERRIDE
{ OWeakObject::acquire(); }
- virtual void SAL_CALL release( void )
+ virtual void SAL_CALL release()
throw() SAL_OVERRIDE
{ OWeakObject::release(); }
@@ -104,12 +104,12 @@ public:
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException ) 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 ) 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 ) SAL_OVERRIDE;
@@ -135,20 +135,20 @@ public:
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException) 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) 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 ) 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 ) SAL_OVERRIDE;
};
diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
index 8f487aac4ef8..c90c07da0dbc 100644
--- a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
@@ -37,13 +37,13 @@ using namespace com::sun::star::io;
using namespace com::sun::star::uno;
using namespace webdav_ucp;
-NeonInputStream::NeonInputStream( void )
+NeonInputStream::NeonInputStream()
: mLen( 0 ),
mPos( 0 )
{
}
-NeonInputStream::~NeonInputStream( void )
+NeonInputStream::~NeonInputStream()
{
}
@@ -123,7 +123,7 @@ sal_Int32 SAL_CALL NeonInputStream::available( )
return sal::static_int_cast<sal_Int32>(mLen - mPos);
}
-void SAL_CALL NeonInputStream::closeInput( void )
+void SAL_CALL NeonInputStream::closeInput()
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException, std::exception )
diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
index 97b5f5b8a578..fa69244c8e93 100644
--- a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
@@ -51,7 +51,7 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream,
sal_Int64 mPos;
public:
- NeonInputStream( void );
+ NeonInputStream();
virtual ~NeonInputStream();
// Add some data to the end of the stream
@@ -62,11 +62,11 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream,
const ::com::sun::star::uno::Type & type )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( void )
+ virtual void SAL_CALL acquire()
throw () SAL_OVERRIDE
{ OWeakObject::acquire(); }
- virtual void SAL_CALL release( void )
+ virtual void SAL_CALL release()
throw() SAL_OVERRIDE
{ OWeakObject::release(); }
@@ -94,12 +94,12 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream,
::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/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index fa848ba759b5..fb03927ed7e0 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -232,7 +232,7 @@ public:
private:
friend class NeonLockStore;
- void Init( void )
+ void Init()
throw (css::uno::RuntimeException, std::exception);
void Init( const DAVRequestEnvironment & rEnv )
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx
index 3e053734714b..214a56124504 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx
@@ -63,22 +63,22 @@ class NeonUri
bool operator!= ( const NeonUri & rOther ) const
{ return !operator==( rOther ); }
- const OUString & GetURI( void ) const
+ const OUString & GetURI() const
{ return mURI; };
- const OUString & GetScheme( void ) const
+ const OUString & GetScheme() const
{ return mScheme; };
- const OUString & GetUserInfo( void ) const
+ const OUString & GetUserInfo() const
{ return mUserInfo; };
- const OUString & GetHost( void ) const
+ const OUString & GetHost() const
{ return mHostName; };
- sal_Int32 GetPort( void ) const
+ sal_Int32 GetPort() const
{ return mPort; };
- const OUString & GetPath( void ) const
+ const OUString & GetPath() const
{ return mPath; };
- OUString GetPathBaseName ( void ) const;
+ OUString GetPathBaseName() const;
- OUString GetPathBaseNameUnescaped ( void ) const;
+ OUString GetPathBaseNameUnescaped() const;
void SetScheme (const OUString& scheme)
{ mScheme = scheme; calculateURI (); };
diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx
index 2c8672ffc263..0c3a5b68d054 100644
--- a/ucb/source/ucp/webdav/SerfInputStream.cxx
+++ b/ucb/source/ucp/webdav/SerfInputStream.cxx
@@ -32,7 +32,7 @@ using namespace http_dav_ucp;
// Constructor
-SerfInputStream::SerfInputStream( void )
+SerfInputStream::SerfInputStream()
: mLen( 0 ),
mPos( 0 )
{
@@ -41,7 +41,7 @@ SerfInputStream::SerfInputStream( void )
// Destructor
-SerfInputStream::~SerfInputStream( void )
+SerfInputStream::~SerfInputStream()
{
}
@@ -142,7 +142,7 @@ sal_Int32 SAL_CALL SerfInputStream::available( )
// closeInput
-void SAL_CALL SerfInputStream::closeInput( void )
+void SAL_CALL SerfInputStream::closeInput()
throw( ::com::sun::star::io::NotConnectedException,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException )
diff --git a/ucb/source/ucp/webdav/SerfInputStream.hxx b/ucb/source/ucp/webdav/SerfInputStream.hxx
index d06a84acbd42..1d35c3ebe44a 100644
--- a/ucb/source/ucp/webdav/SerfInputStream.hxx
+++ b/ucb/source/ucp/webdav/SerfInputStream.hxx
@@ -46,7 +46,7 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream,
sal_Int64 mPos;
public:
- SerfInputStream( void );
+ SerfInputStream();
virtual ~SerfInputStream();
// Add some data to the end of the stream
@@ -57,11 +57,11 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream,
const ::com::sun::star::uno::Type & type )
throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
- virtual void SAL_CALL acquire( void )
+ virtual void SAL_CALL acquire()
throw () SAL_OVERRIDE
{ OWeakObject::acquire(); }
- virtual void SAL_CALL release( void )
+ virtual void SAL_CALL release()
throw() SAL_OVERRIDE
{ OWeakObject::release(); }
@@ -89,12 +89,12 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream,
::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException ) 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 ) 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 ) SAL_OVERRIDE;
diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx
index 897613ccbfa3..a2f5402059ce 100644
--- a/ucb/source/ucp/webdav/SerfSession.hxx
+++ b/ucb/source/ucp/webdav/SerfSession.hxx
@@ -253,7 +253,7 @@ public:
private:
friend class SerfLockStore;
- void Init( void )
+ void Init()
throw ( DAVException );
void Init( const DAVRequestEnvironment & rEnv )
diff --git a/ucb/source/ucp/webdav/SerfUri.hxx b/ucb/source/ucp/webdav/SerfUri.hxx
index 02362340f6b0..dc88d74cf816 100644
--- a/ucb/source/ucp/webdav/SerfUri.hxx
+++ b/ucb/source/ucp/webdav/SerfUri.hxx
@@ -62,22 +62,22 @@ class SerfUri
{
return mAprUri;
}
- const OUString & GetURI( void ) const
+ const OUString & GetURI() const
{ return mURI; };
- const OUString & GetScheme( void ) const
+ const OUString & GetScheme() const
{ return mScheme; };
- const OUString & GetUserInfo( void ) const
+ const OUString & GetUserInfo() const
{ return mUserInfo; };
- const OUString & GetHost( void ) const
+ const OUString & GetHost() const
{ return mHostName; };
- sal_Int32 GetPort( void ) const
+ sal_Int32 GetPort() const
{ return mPort; };
- const OUString & GetPath( void ) const
+ const OUString & GetPath() const
{ return mPath; };
- OUString GetPathBaseName ( void ) const;
+ OUString GetPathBaseName() const;
- OUString GetPathBaseNameUnescaped ( void ) const;
+ OUString GetPathBaseNameUnescaped() const;
void SetScheme (const OUString& scheme)
{ mScheme = scheme; calculateURI (); };