summaryrefslogtreecommitdiff
path: root/cppuhelper
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 /cppuhelper
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 'cppuhelper')
-rw-r--r--cppuhelper/qa/unourl/cppu_unourl.cxx2
-rw-r--r--cppuhelper/source/factory.cxx12
-rw-r--r--cppuhelper/source/implbase_ex.cxx2
-rw-r--r--cppuhelper/source/propshlp.cxx6
-rw-r--r--cppuhelper/test/bootstrap/TestEnv.cxx12
-rw-r--r--cppuhelper/test/bootstrap/bootstrap.test.cxx10
6 files changed, 22 insertions, 22 deletions
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index 1bccf2fc3639..a54cf7cf40c9 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -186,7 +186,7 @@ namespace cppu_unourl
}
}
- void testDescriptorKey(void)
+ void testDescriptorKey()
{
struct Test
{
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 8cbec655be6b..a634086fd33b 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -104,7 +104,7 @@ public:
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
+ Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
@@ -240,7 +240,7 @@ sal_Bool OSingleFactoryHelper::supportsService(
}
// XServiceInfo
-Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames(void)
+Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
{
return aServiceNames;
@@ -522,7 +522,7 @@ public:
throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
- Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
+ Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XUnloadingPreference
sal_Bool SAL_CALL releaseOnNotification()
@@ -811,7 +811,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
}
// XServiceInfo
-Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames(void)
+Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( aMutex );
@@ -892,7 +892,7 @@ public:
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
+ Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XUnloadingPreference
sal_Bool SAL_CALL releaseOnNotification()
@@ -935,7 +935,7 @@ sal_Bool OFactoryProxyHelper::supportsService(const OUString& ServiceName)
}
// XServiceInfo
-Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames(void)
+Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException, std::exception)
{
Reference<XServiceInfo > xInfo( xFactory, UNO_QUERY );
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index b32d373dc4cf..4d9e04f01788 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -48,7 +48,7 @@ namespace cppu
/** Shared mutex for implementation helper initialization.
Not for public use.
*/
-::osl::Mutex & SAL_CALL getImplHelperInitMutex(void)
+::osl::Mutex & SAL_CALL getImplHelperInitMutex()
{
return theImplHelperInitMutex::get();
}
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index f2835f454112..42fdfcae17a5 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -78,7 +78,7 @@ public:
OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ );
// XPropertySetInfo-methods
- virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual Sequence< Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -96,7 +96,7 @@ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl(
/**
* Return the sequence of properties, which are provided through the constructor.
*/
-Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception)
+Sequence< Property > OPropertySetHelperInfo_Impl::getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
return aInfos;
}
@@ -1108,7 +1108,7 @@ sal_Bool OPropertyArrayHelper::fillPropertyMembersByHandle
}
-Sequence< Property > OPropertyArrayHelper::getProperties(void)
+Sequence< Property > OPropertyArrayHelper::getProperties()
{
return aInfos;
}
diff --git a/cppuhelper/test/bootstrap/TestEnv.cxx b/cppuhelper/test/bootstrap/TestEnv.cxx
index 8c3dc010b71a..0a08b54bd559 100644
--- a/cppuhelper/test/bootstrap/TestEnv.cxx
+++ b/cppuhelper/test/bootstrap/TestEnv.cxx
@@ -46,8 +46,8 @@ public:
explicit TestEnv();
protected:
- virtual void v_enter(void);
- virtual void v_leave(void);
+ virtual void v_enter();
+ virtual void v_leave();
virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam);
virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam);
@@ -61,9 +61,9 @@ TestEnv::TestEnv()
LOG_LIFECYCLE_TestEnv_emit(fprintf(stderr, "LIFE: %s -> %p\n", "TestEnv::TestEnv(...)", this));
}
-TestEnv::~TestEnv(void)
+TestEnv::~TestEnv()
{
- LOG_LIFECYCLE_TestEnv_emit(fprintf(stderr, "LIFE: %s -> %p\n", "TestEnv::~TestEnv(void)", this));
+ LOG_LIFECYCLE_TestEnv_emit(fprintf(stderr, "LIFE: %s -> %p\n", "TestEnv::~TestEnv()", this));
}
@@ -81,12 +81,12 @@ void TestEnv::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam)
++ m_inCount;
}
-void TestEnv::v_enter(void)
+void TestEnv::v_enter()
{
++ m_inCount;
}
-void TestEnv::v_leave(void)
+void TestEnv::v_leave()
{
-- m_inCount;
}
diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx
index bfb3e7520015..d4d766e54acb 100644
--- a/cppuhelper/test/bootstrap/bootstrap.test.cxx
+++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx
@@ -144,7 +144,7 @@ static void s_test__loadSharedLibComponentFactory__purpose_purpose()
s_test__loadSharedLibComponentFactory(":testenv", ":testenv");
}
-static rtl::OUString s_getSDrive(void)
+static rtl::OUString s_getSDrive()
{
rtl::OUString path;//("file://");
@@ -180,14 +180,14 @@ static void s_test__createSimpleRegistry(rtl::OUString const & clientPurpose)
}
}
-static void s_test__createSimpleRegistry__free(void)
+static void s_test__createSimpleRegistry__free()
{
s_comment += "\ts_test__createSimpleRegistry__free\n";
s_test__createSimpleRegistry(rtl::OUString());
}
-static void s_test__createSimpleRegistry__purpose(void)
+static void s_test__createSimpleRegistry__purpose()
{
s_comment += "\ts_test__createSimpleRegistry__purpose\n";
@@ -226,14 +226,14 @@ static void s_test__bootstrap_InitialComponentContext(rtl::OUString const & clie
xComponent->dispose();
}
-static void s_test__bootstrap_InitialComponentContext__free(void)
+static void s_test__bootstrap_InitialComponentContext__free()
{
s_comment += "\ts_test__bootstrap_InitialComponentContext__free\n";
s_test__bootstrap_InitialComponentContext(rtl::OUString());
}
-static void s_test__bootstrap_InitialComponentContext__purpose(void)
+static void s_test__bootstrap_InitialComponentContext__purpose()
{
s_comment += "\ts_test__bootstrap_InitialComponentContext__purpose\n";