summaryrefslogtreecommitdiff
path: root/desktop
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 /desktop
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 'desktop')
-rw-r--r--desktop/source/app/cmdlinehelp.cxx2
-rw-r--r--desktop/source/app/cmdlinehelp.hxx2
-rw-r--r--desktop/source/deployment/inc/lockfile.hxx6
-rw-r--r--desktop/source/deployment/misc/lockfile.cxx6
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx4
-rw-r--r--desktop/source/lib/init.cxx2
6 files changed, 11 insertions, 11 deletions
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 61694b8f2791..bd583e0b3867 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -198,7 +198,7 @@ namespace desktop
}
#ifndef UNX
- CmdlineHelpDialog::CmdlineHelpDialog (void)
+ CmdlineHelpDialog::CmdlineHelpDialog()
: ModalDialog( NULL, "CmdLineHelp", "desktop/ui/cmdlinehelp.ui" )
{
get(m_pftHead, "header");
diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx
index 2a3bda797896..07b4f520979d 100644
--- a/desktop/source/app/cmdlinehelp.hxx
+++ b/desktop/source/app/cmdlinehelp.hxx
@@ -32,7 +32,7 @@ namespace desktop
class CmdlineHelpDialog : public ModalDialog
{
public:
- CmdlineHelpDialog ( void );
+ CmdlineHelpDialog();
FixedText* m_pftHead;
FixedText* m_pftLeft;
diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx
index 890c98eee0ac..f3f1da28d07a 100644
--- a/desktop/source/deployment/inc/lockfile.hxx
+++ b/desktop/source/deployment/inc/lockfile.hxx
@@ -68,7 +68,7 @@ namespace desktop {
bool check( fpExecWarning execWarning );
// removes the lockfile
- ~Lockfile(void);
+ ~Lockfile();
private:
bool m_bIPCserver;
@@ -81,8 +81,8 @@ namespace desktop {
OUString m_aId;
OUString m_aDate;
// access to data in file
- void syncToFile(void) const;
- bool isStale(void) const;
+ void syncToFile() const;
+ bool isStale() const;
friend bool Lockfile_execWarning( Lockfile * that );
};
diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx
index 3e191a5ef417..65ca50828f91 100644
--- a/desktop/source/deployment/misc/lockfile.cxx
+++ b/desktop/source/deployment/misc/lockfile.cxx
@@ -140,7 +140,7 @@ namespace desktop {
}
}
- bool Lockfile::isStale( void ) const
+ bool Lockfile::isStale() const
{
// this checks whether the lockfile was created on the same
// host by the same user. Should this be the case it is safe
@@ -169,7 +169,7 @@ namespace desktop {
return false;
}
- void Lockfile::syncToFile( void ) const
+ void Lockfile::syncToFile() const
{
OUString aLockname = m_aLockname;
Config aConfig(aLockname);
@@ -195,7 +195,7 @@ namespace desktop {
aConfig.Flush( );
}
- Lockfile::~Lockfile( void )
+ Lockfile::~Lockfile()
{
// unlock userdata by removing file
if ( m_bRemove )
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 51feccca2ebf..ea00434b2189 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -106,7 +106,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
void revokeEntryFromDb(OUString const & url);
bool activateEntry(OUString const & url);
- Reference< ucb::XSimpleFileAccess3 > getFileAccess( void );
+ Reference< ucb::XSimpleFileAccess3 > getFileAccess();
Reference< ucb::XSimpleFileAccess3 > m_xSFA;
const Reference<deployment::XPackageTypeInfo> m_xHelpTypeInfo;
@@ -601,7 +601,7 @@ void BackendImpl::implCollectXhpFiles( const OUString& aDir,
}
}
-Reference< ucb::XSimpleFileAccess3 > BackendImpl::getFileAccess( void )
+Reference< ucb::XSimpleFileAccess3 > BackendImpl::getFileAccess()
{
if( !m_xSFA.is() )
{
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 186f60bf29f3..0651480dfa79 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -767,7 +767,7 @@ static char* lo_getError (LibreOfficeKit *pThis)
return pMemory;
}
-static void force_c_locale(void)
+static void force_c_locale()
{
// force locale (and resource files loaded) to en-US
OUString aLangISO("en-US");