diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /testtools | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'testtools')
-rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 20 | ||||
-rw-r--r-- | testtools/source/bridgetest/cppobj.cxx | 30 | ||||
-rw-r--r-- | testtools/source/performance/pseudo.cxx | 22 | ||||
-rw-r--r-- | testtools/source/performance/ubobject.cxx | 8 | ||||
-rw-r--r-- | testtools/source/performance/ubtest.cxx | 52 |
5 files changed, 66 insertions, 66 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index a9d2cf8cf8b7..7509afb1f826 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -72,7 +72,7 @@ namespace bridge_test template< class T> Sequence<T> cloneSequence(const Sequence<T>& val); -//-------------------------------------------------------------------------------------------------- + inline static Sequence< OUString > getSupportedServiceNames() { OUString aName( SERVICENAME ); @@ -282,7 +282,7 @@ static sal_Bool performAnyTest( const Reference< XBridgeTest > &xLBT, const Test return bReturn; } -//_______________________________________________________________________________________ + static sal_Bool performSequenceOfCallTest( const Reference < XBridgeTest > &xLBT ) { sal_Int32 i,nRounds; @@ -327,7 +327,7 @@ public: }; -//_______________________________________________________________________________________ + static sal_Bool performRecursiveCallTest( const Reference < XBridgeTest > & xLBT ) { xLBT->startRecursiveCall( new ORecursiveCall , 50 ); @@ -344,20 +344,20 @@ public: virtual void SAL_CALL release() throw (); }; -//______________________________________________________________________________ + MyClass::MyClass() { } -//______________________________________________________________________________ + MyClass::~MyClass() { } -//______________________________________________________________________________ + void MyClass::acquire() throw () { OWeakObject::acquire(); } -//______________________________________________________________________________ + void MyClass::release() throw () { OWeakObject::release(); @@ -1234,19 +1234,19 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) } // XServiceInfo -//__________________________________________________________________________________________________ + OUString TestBridgeImpl::getImplementationName() throw (RuntimeException) { return OUString( IMPLNAME ); } -//__________________________________________________________________________________________________ + sal_Bool TestBridgeImpl::supportsService( const OUString & rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } -//__________________________________________________________________________________________________ + Sequence< OUString > TestBridgeImpl::getSupportedServiceNames() throw (RuntimeException) { diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index 370c2b74adad..f488800397dd 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -61,7 +61,7 @@ using namespace test::testtools::bridgetest; namespace bridge_object { -//-------------------------------------------------------------------------------------------------- + inline static Sequence< OUString > getSupportedServiceNames() { OUString aName( SERVICENAME ); @@ -479,13 +479,13 @@ public: Dummy(): WeakComponentImplHelperBase(*Mutex::getGlobalMutex()){} }; -//__________________________________________________________________________________________________ + Any Test_Impl::transportAny( const Any & value ) throw ( ::com::sun::star::uno::RuntimeException) { return value; } -//__________________________________________________________________________________________________ + namespace { @@ -513,7 +513,7 @@ void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(::com::su m_nLastCallId = nCallId; } -//__________________________________________________________________________________________________ + void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (::com::sun::star::uno::RuntimeException) { wait(nWaitMUSEC); @@ -521,13 +521,13 @@ void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (:: m_nLastCallId = nCallId; } -//__________________________________________________________________________________________________ + sal_Bool Test_Impl::sequenceOfCallTestPassed() throw (::com::sun::star::uno::RuntimeException) { return m_bSequenceOfCallTestPassed; } -//__________________________________________________________________________________________________ + void SAL_CALL Test_Impl::startRecursiveCall( const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) throw(::com::sun::star::uno::RuntimeException) @@ -564,7 +564,7 @@ OUString Test_Impl::testMulti(Reference< XMulti > const & multi) return testtools::bridgetest::testMulti(multi); } -//__________________________________________________________________________________________________ + void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int16 nShort, sal_uInt16 nUShort, sal_Int32 nLong, sal_uInt32 nULong, @@ -582,7 +582,7 @@ void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, eEnum, rStr, xTest, rAny, rSequence ); _aStructData = rStruct; } -//__________________________________________________________________________________________________ + TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, @@ -606,7 +606,7 @@ TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& n return _aStructData; } -//__________________________________________________________________________________________________ + TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, @@ -638,7 +638,7 @@ TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nB rStruct = _aStructData; return _aStructData; } -//__________________________________________________________________________________________________ + TestData Test_Impl::raiseException( sal_Int16 nArgumentPos, const OUString & rMsg, const Reference< XInterface > & xContext ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { @@ -692,7 +692,7 @@ void dothrow( RuntimeException const & e ) #endif dothrow2( e ); } -//______________________________________________________________________________ + sal_Int32 Test_Impl::getRuntimeException() throw (RuntimeException) { @@ -707,7 +707,7 @@ sal_Int32 Test_Impl::getRuntimeException() } return 0; // for dummy } -//__________________________________________________________________________________________________ + void Test_Impl::setRuntimeException( sal_Int32 ) throw(::com::sun::star::uno::RuntimeException) { RuntimeException aExc; @@ -1145,19 +1145,19 @@ Reference< XCurrentContextChecker > Test_Impl::getCurrentContextChecker() } // XServiceInfo -//__________________________________________________________________________________________________ + OUString Test_Impl::getImplementationName() throw (RuntimeException) { return OUString( IMPLNAME ); } -//__________________________________________________________________________________________________ + sal_Bool Test_Impl::supportsService( const OUString & rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } -//__________________________________________________________________________________________________ + Sequence< OUString > Test_Impl::getSupportedServiceNames() throw (RuntimeException) { diff --git a/testtools/source/performance/pseudo.cxx b/testtools/source/performance/pseudo.cxx index 3c5d35ccbf67..613ae9af9132 100644 --- a/testtools/source/performance/pseudo.cxx +++ b/testtools/source/performance/pseudo.cxx @@ -59,7 +59,7 @@ struct pseudo_unoInterfaceProxy : public uno_Interface typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ ); }; -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL pseudo_unoInterfaceProxy_dispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberType, @@ -71,7 +71,7 @@ static void SAL_CALL pseudo_unoInterfaceProxy_dispatch( (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberType, pReturn, pArgs, ppException ); } -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL pseudo_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy ) { pseudo_unoInterfaceProxy * pThis = @@ -89,7 +89,7 @@ static void SAL_CALL pseudo_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, v #endif delete pThis; } -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL pseudo_unoInterfaceProxy_acquire( uno_Interface * pUnoI ) { if (1 == osl_atomic_increment( &static_cast< pseudo_unoInterfaceProxy * >( pUnoI )->nRef )) @@ -105,7 +105,7 @@ static void SAL_CALL pseudo_unoInterfaceProxy_acquire( uno_Interface * pUnoI ) OSL_ASSERT( pThis == static_cast< uno_Interface * >( pUnoI ) ); } } -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL pseudo_unoInterfaceProxy_release( uno_Interface * pUnoI ) { if (! osl_atomic_decrement( & static_cast< pseudo_unoInterfaceProxy * >( pUnoI )->nRef )) @@ -115,7 +115,7 @@ static void SAL_CALL pseudo_unoInterfaceProxy_release( uno_Interface * pUnoI ) static_cast< pseudo_unoInterfaceProxy * >( pUnoI )->pPseudoMapping->pTo, pUnoI ); } } -//__________________________________________________________________________________________________ + inline pseudo_unoInterfaceProxy::pseudo_unoInterfaceProxy( pseudo_Mapping * pPseudoMapping_, uno_Interface * pUnoI_, typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ ) @@ -137,7 +137,7 @@ inline pseudo_unoInterfaceProxy::pseudo_unoInterfaceProxy( uno_Interface::pDispatcher = pseudo_unoInterfaceProxy_dispatch; } -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL pseudo_Mapping_mapInterface( uno_Mapping * pMapping, void ** ppOut, void * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr ) @@ -180,12 +180,12 @@ static void SAL_CALL pseudo_Mapping_mapInterface( } } } -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL pseudo_Mapping_free( uno_Mapping * pMapping ) { delete static_cast< pseudo_Mapping * >( pMapping ); } -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL pseudo_Mapping_acquire( uno_Mapping * pMapping ) { if (1 == osl_atomic_increment( & static_cast< pseudo_Mapping * >( pMapping )->nRef )) @@ -198,7 +198,7 @@ static void SAL_CALL pseudo_Mapping_acquire( uno_Mapping * pMapping ) aMappingPurpose.pData ); } } -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL pseudo_Mapping_release( uno_Mapping * pMapping ) { if (! osl_atomic_decrement( & static_cast< pseudo_Mapping * >( pMapping )->nRef )) @@ -207,7 +207,7 @@ static void SAL_CALL pseudo_Mapping_release( uno_Mapping * pMapping ) } } -//__________________________________________________________________________________________________ + pseudo_Mapping::pseudo_Mapping( uno_ExtEnvironment * pFrom_, uno_ExtEnvironment * pTo_ ) : nRef( 1 ) , pFrom( pFrom_ ) @@ -220,7 +220,7 @@ pseudo_Mapping::pseudo_Mapping( uno_ExtEnvironment * pFrom_, uno_ExtEnvironment uno_Mapping::release = pseudo_Mapping_release; uno_Mapping::mapInterface = pseudo_Mapping_mapInterface; } -//__________________________________________________________________________________________________ + pseudo_Mapping::~pseudo_Mapping() { (*((uno_Environment *)pTo)->release)( (uno_Environment *)pTo ); diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx index 404e14fc5a79..15560436cf5d 100644 --- a/testtools/source/performance/ubobject.cxx +++ b/testtools/source/performance/ubobject.cxx @@ -44,7 +44,7 @@ using namespace com::sun::star::test::performance; namespace benchmark_object { -//-------------------------------------------------------------------------------------------------- + inline static Sequence< OUString > getSupportedServiceNames() { OUString aName( SERVICENAME); @@ -201,19 +201,19 @@ public: //################################################################################################## // XServiceInfo -//__________________________________________________________________________________________________ + OUString ServiceImpl::getImplementationName() throw (RuntimeException) { return OUString( IMPLNAME ); } -//__________________________________________________________________________________________________ + sal_Bool ServiceImpl::supportsService( const OUString & rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } -//__________________________________________________________________________________________________ + Sequence< OUString > ServiceImpl::getSupportedServiceNames() throw (RuntimeException) { diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index acdeb8255200..783c28a3643a 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -107,7 +107,7 @@ static inline sal_uInt32 getSystemTicks() #endif } -//-------------------------------------------------------------------------------------------------- + static void out( const sal_Char * pText, FILE * stream = stderr, sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) { @@ -130,14 +130,14 @@ static void out( const sal_Char * pText, FILE * stream = stderr, ++s_nPos; } } -//-------------------------------------------------------------------------------------------------- + static inline void out( const OUString & rText, FILE * stream = stderr, sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) { OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) ); out( aText.getStr(), stream, nStart, cFillchar ); } -//-------------------------------------------------------------------------------------------------- + static inline void out( double fVal, FILE * stream = stderr, sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) { @@ -145,7 +145,7 @@ static inline void out( double fVal, FILE * stream = stderr, ::snprintf( ar, sizeof(ar), (fVal < 0.000001 ? "%g" : "%f"), fVal ); out( ar, stream, nStart, cFillchar ); } -//-------------------------------------------------------------------------------------------------- + static inline void out( sal_Int64 nVal, FILE * stream = stderr, sal_Int32 nStart = -1, sal_Char cFillchar = ' ' ) { @@ -312,7 +312,7 @@ Reference< XSingleServiceFactory > loadLibComponentFactory( return xRet; } -//-------------------------------------------------------------------------------------------------- + template< class T > static void createInstance( Reference< T > & rxOut, const Reference< XMultiServiceFactory > & xMgr, @@ -392,7 +392,7 @@ static void createInstance( Reference< T > & rxOut, } } -//-------------------------------------------------------------------------------------------------- + inline static Sequence< OUString > getSupportedServiceNames() { OUString aName( SERVICENAME ); @@ -423,12 +423,12 @@ public: //################################################################################################## -//__________________________________________________________________________________________________ + TestImpl::TestImpl( const Reference< XMultiServiceFactory > & xSMgr ) : _xSMgr( xSMgr ) { } -//__________________________________________________________________________________________________ + TestImpl::~TestImpl() { } @@ -440,26 +440,26 @@ static Reference< XInterface > SAL_CALL TestImpl_create( const Reference< XMulti } // XServiceInfo -//__________________________________________________________________________________________________ + OUString TestImpl::getImplementationName() throw (RuntimeException) { return OUString( IMPLNAME ); } -//__________________________________________________________________________________________________ + sal_Bool TestImpl::supportsService( const OUString & rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } -//__________________________________________________________________________________________________ + Sequence< OUString > TestImpl::getSupportedServiceNames() throw (RuntimeException) { return benchmark_test::getSupportedServiceNames(); } -//__________________________________________________________________________________________________ + Reference< XInterface > TestImpl::getDirect() throw (Exception) { @@ -479,7 +479,7 @@ Reference< XInterface > TestImpl::getDirect() } return _xDirect; } -//-------------------------------------------------------------------------------------------------- + Reference< XInterface > TestImpl::resolveObject( const OUString & rUnoUrl ) throw (Exception) { @@ -521,7 +521,7 @@ public: double ratio( const TimeEntry & rEntry ) const; }; -//__________________________________________________________________________________________________ + double TimeEntry::ratio( const TimeEntry & rEntry ) const { double f = rEntry.nTicks * nLoop; @@ -544,7 +544,7 @@ struct TimingSheet t_TimeEntryMap _entries; void insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ); }; -//__________________________________________________________________________________________________ + void TimingSheet::insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nTicks ) { _entries[ pText ] = TimeEntry( nLoop, nTicks ); @@ -553,7 +553,7 @@ void TimingSheet::insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nT //================================================================================================== typedef boost::unordered_map< std::string, TimingSheet > t_TimingSheetMap; -//-------------------------------------------------------------------------------------------------- + static void benchmark( TimingSheet & rSheet, const Reference< XInterface > & xInstance, sal_Int64 nLoop ) throw (Exception) @@ -570,7 +570,7 @@ static void benchmark( ComplexTypes aDummyStruct; - //------------------------------------ + // oneway calls i = nLoop; tStart = getSystemTicks(); @@ -928,10 +928,10 @@ static void benchmark( tEnd = getSystemTicks(); rSheet.insert( "Ba: raising RuntimeException", nLoop, tEnd - tStart ); - //------------------------------------ + } -//-------------------------------------------------------------------------------------------------- + static OUString extractParam( const Sequence< OUString > & rArgs, const OUString & rParam ) { const OUString * pArgs = rArgs.getConstArray(); @@ -949,7 +949,7 @@ static OUString extractParam( const Sequence< OUString > & rArgs, const OUString const sal_Int32 nMagicNumberDirect = 34000; //XMain -//__________________________________________________________________________________________________ + sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) throw (RuntimeException) { @@ -1027,7 +1027,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) t_TimingSheetMap aSheets; TimingSheet aDirect; - //------------------------------------------------------------------------------------------ + if (aArg.indexOf( 'd' ) >= 0) { @@ -1038,7 +1038,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) fprintf( stderr, "Duration (direct in process): %g s\n", (nEnd - nStart)/1000. ); } - //------------------------------------------------------------------------------------------ + if (aArg.indexOf( 'm' ) >= 0) { @@ -1069,7 +1069,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) fprintf( stderr, "Duration (mapped in process): %g s\n", (nStart - nEnd)/1000. ); } - //------------------------------------------------------------------------------------------ + if (aArg.indexOf( 's' ) >= 0) { @@ -1137,7 +1137,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) benchmark( aSheets[ "remote same host" ], xResolvedObject, nLoop / 300 ); } - //------------------------------------------------------------------------------------------ + if (aArg.indexOf( 'r' ) >= 0) { @@ -1156,7 +1156,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) fprintf( stderr, "Duration (%s): %g s\n", o.getStr(),(t2 - t1)/1000. ); } - //------------------------------------------------------------------------------------------ + if (aArg.indexOf( 'j' ) >= 0) { @@ -1166,7 +1166,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) nLoop / 1000 ); } - //------------------------------------------------------------------------------------------ + // dump out tables out( "\nTimes( ratio to direct in process )", stream ); |