diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /sal/qa/osl | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'sal/qa/osl')
-rw-r--r-- | sal/qa/osl/condition/osl_Condition.cxx | 6 | ||||
-rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 162 | ||||
-rw-r--r-- | sal/qa/osl/mutex/osl_Mutex.cxx | 22 | ||||
-rw-r--r-- | sal/qa/osl/process/osl_Thread.cxx | 98 | ||||
-rw-r--r-- | sal/qa/osl/process/osl_process.cxx | 4 | ||||
-rw-r--r-- | sal/qa/osl/security/osl_Security.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/setthreadname/test-setthreadname.cxx | 2 |
7 files changed, 148 insertions, 148 deletions
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx index 48e04011e38a..3c3401a8eb6d 100644 --- a/sal/qa/osl/condition/osl_Condition.cxx +++ b/sal/qa/osl/condition/osl_Condition.cxx @@ -76,7 +76,7 @@ protected: ::osl::Condition& m_MyCon; ConditionType m_MyType; - void SAL_CALL run() + void SAL_CALL run() SAL_OVERRIDE { switch ( m_MyType ) { @@ -233,7 +233,7 @@ namespace osl_Condition bool bRes, bRes1, bRes2; TimeValue *tv1; - void setUp( ) + void setUp( ) SAL_OVERRIDE { tv1 = new TimeValue; tv1->Seconds = 1; @@ -241,7 +241,7 @@ namespace osl_Condition } - void tearDown( ) + void tearDown( ) SAL_OVERRIDE { delete tv1; } diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 525630368fc4..df9d3a5046b3 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -1306,12 +1306,12 @@ namespace osl_FileBase public: getTempDirURL() :nError(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { nError = FileBase::getTempDirURL( aUStr ); } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1366,7 +1366,7 @@ namespace osl_FileBase } // initialization - void setUp() + void setUp() SAL_OVERRIDE { pHandle = new oslFileHandle(); pUStr_DirURL = new ::rtl::OUString( aUserDirectoryURL ); @@ -1374,7 +1374,7 @@ namespace osl_FileBase //*pUStr_DirURL = aUserDirectoryURL; /// create temp file in /tmp/PID or c:\temp\PID.*/ } - void tearDown() + void tearDown() SAL_OVERRIDE { delete pUStr_DirURL; delete pUStr_FileURL; @@ -1480,11 +1480,11 @@ namespace osl_VolumeInfo public: ctors() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1576,11 +1576,11 @@ namespace osl_VolumeInfo public: isValid() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -2390,7 +2390,7 @@ namespace osl_FileStatus public: ctors() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); @@ -2412,7 +2412,7 @@ namespace osl_FileStatus */ } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -2466,7 +2466,7 @@ namespace osl_FileStatus } // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); @@ -2480,7 +2480,7 @@ namespace osl_FileStatus CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { ::osl::FileBase::RC nError1 = pDir->close(); delete pDir; @@ -2672,7 +2672,7 @@ namespace osl_FileStatus public: getFileType() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile: $TEMP/tmpdir/tmpname. // a tempdirectory: $TEMP/tmpdir/tmpdir. @@ -2698,7 +2698,7 @@ namespace osl_FileStatus } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove all in $TEMP/tmpdir. deleteTestDirectory( aTmpName3, aTmpName1 ); @@ -2801,7 +2801,7 @@ namespace osl_FileStatus public: getAttributes() :nError(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { aTypeURL = aUserDirectoryURL.copy( 0 ); concatURL( aTypeURL, aTmpName2 ); @@ -2816,7 +2816,7 @@ namespace osl_FileStatus CPPUNIT_ASSERT( nError == FileBase::E_None ); } - void tearDown() + void tearDown() SAL_OVERRIDE { deleteTestFile( aTypeURL ); deleteTestFile( aTypeURL_Hid ); @@ -2931,7 +2931,7 @@ namespace osl_FileStatus public: getAccessTime() :nError(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { aTypeURL = aUserDirectoryURL.copy( 0 ); concatURL( aTypeURL, aTmpName2 ); @@ -2941,7 +2941,7 @@ namespace osl_FileStatus } - void tearDown() + void tearDown() SAL_OVERRIDE { deleteTestFile( aTypeURL ); } @@ -3045,7 +3045,7 @@ namespace osl_FileStatus getFileSize() :nError(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { aTypeURL = aUserDirectoryURL.copy( 0 ); concatURL( aTypeURL, aTmpName2 ); @@ -3054,7 +3054,7 @@ namespace osl_FileStatus CPPUNIT_ASSERT( nError == FileBase::E_None ); } - void tearDown() + void tearDown() SAL_OVERRIDE { deleteTestFile( aTypeURL ); } @@ -3109,7 +3109,7 @@ namespace osl_FileStatus public: getFileName() :nError(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { aTypeURL = aUserDirectoryURL.copy( 0 ); concatURL( aTypeURL, aTmpName2 ); @@ -3118,7 +3118,7 @@ namespace osl_FileStatus CPPUNIT_ASSERT( nError == FileBase::E_None ); } - void tearDown() + void tearDown() SAL_OVERRIDE { deleteTestFile( aTypeURL ); } @@ -3155,14 +3155,14 @@ namespace osl_FileStatus getFileURL() :nError(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { createTestFile( aTmpName6 ); nError = ::osl::DirectoryItem::get( aTmpName6, rItem ); CPPUNIT_ASSERT( nError == FileBase::E_None ); } - void tearDown() + void tearDown() SAL_OVERRIDE { deleteTestFile( aTmpName6 ); } @@ -3200,14 +3200,14 @@ namespace osl_FileStatus getLinkTargetURL() :nError(FileBase::E_None) {} // test code. // initialization - void setUp() + void setUp() SAL_OVERRIDE { aTypeURL = aUserDirectoryURL.copy( 0 ); concatURL( aTypeURL, aTmpName2 ); createTestFile( aTypeURL ); } - void tearDown() + void tearDown() SAL_OVERRIDE { deleteTestFile( aTypeURL ); } @@ -3287,14 +3287,14 @@ namespace osl_File public: // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); createTestFile( aTmpName4 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -3346,14 +3346,14 @@ namespace osl_File , nError2(FileBase::E_None) , nError3(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); createTestFile( aTmpName4 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -3471,14 +3471,14 @@ namespace osl_File , nError2(FileBase::E_None) , nError3(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); createTestFile( aTmpName4 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -3535,7 +3535,7 @@ namespace osl_File setPos() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); @@ -3552,7 +3552,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -3639,7 +3639,7 @@ namespace osl_File public: getPos() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); @@ -3656,7 +3656,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -3705,7 +3705,7 @@ namespace osl_File public: isEndOfFile() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); @@ -3722,7 +3722,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -3800,7 +3800,7 @@ namespace osl_File public: setSize() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); @@ -3817,7 +3817,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -3900,7 +3900,7 @@ namespace osl_File public: read() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); @@ -3917,7 +3917,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -3989,13 +3989,13 @@ namespace osl_File public: write() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpname. createTestFile( aTmpName6 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpname. deleteTestFile( aTmpName6 ); @@ -4050,7 +4050,7 @@ namespace osl_File public: readLine() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpname. createTestFile( aTmpName6 ); @@ -4075,7 +4075,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpname. deleteTestFile( aTmpName6 ); @@ -4162,7 +4162,7 @@ namespace osl_File public: copy() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); @@ -4179,7 +4179,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -4297,7 +4297,7 @@ namespace osl_File public: move() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); @@ -4314,7 +4314,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -4459,7 +4459,7 @@ namespace osl_File public: remove() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); @@ -4476,7 +4476,7 @@ namespace osl_File CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -4545,13 +4545,13 @@ namespace osl_File public: setAttributes() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestFile( aTmpName6 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName6 ); @@ -4641,13 +4641,13 @@ namespace osl_File public: setTime() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestFile( aTmpName6 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName6 ); @@ -4725,14 +4725,14 @@ namespace osl_File public: sync() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestFile( aTmpName6 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName6 ); @@ -4814,13 +4814,13 @@ namespace osl_DirectoryItem public: ctors() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpname. createTestFile( aTmpName6 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpname. deleteTestFile( aTmpName6 ); @@ -4856,13 +4856,13 @@ namespace osl_DirectoryItem public: copy_assin_Ctors() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpname. createTestFile( aTmpName6 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpname. deleteTestFile( aTmpName6 ); @@ -4919,13 +4919,13 @@ namespace osl_DirectoryItem public: is() :nError1(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpname. createTestFile( aTmpName6 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpname. deleteTestFile( aTmpName6 ); @@ -4968,13 +4968,13 @@ namespace osl_DirectoryItem public: get() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpname. createTestFile( aTmpName6 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpname. deleteTestFile( aTmpName6 ); @@ -5035,14 +5035,14 @@ namespace osl_DirectoryItem public: getFileStatus() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); createTestFile( aTmpName4 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -5129,14 +5129,14 @@ namespace osl_Directory public: ctors() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); createTestFile( aTmpName4 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -5194,14 +5194,14 @@ namespace osl_Directory public: open() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); createTestFile( aTmpName4 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -5293,14 +5293,14 @@ namespace osl_Directory public: isOpen() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempfile in $TEMP/tmpdir/tmpname. createTestDirectory( aTmpName3 ); createTestFile( aTmpName4 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove the tempfile in $TEMP/tmpdir/tmpname. deleteTestFile( aTmpName4 ); @@ -5351,13 +5351,13 @@ namespace osl_Directory public: close() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempdirectory : $TEMP/tmpdir. createTestDirectory( aTmpName3 ); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove a tempdirectory : $TEMP/tmpdir. deleteTestDirectory( aTmpName3 ); @@ -5409,7 +5409,7 @@ namespace osl_Directory public: reset() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempdirectory : $TEMP/tmpdir. createTestDirectory( aTmpName3 ); @@ -5419,7 +5419,7 @@ namespace osl_Directory createTestFile( aTmpName3, aHidURL1); } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove three files : $TEMP/tmpdir/tmpname, $TEMP/tmpdir/tmpdir, $TEMP/tmpdir/hiddenfile, deleteTestFile( aTmpName3, aHidURL1); @@ -5525,7 +5525,7 @@ namespace osl_Directory public: getNextItem() :nError1(FileBase::E_None),nError2(FileBase::E_None) {} // initialization - void setUp() + void setUp() SAL_OVERRIDE { // create a tempdirectory : $TEMP/tmpdir. createTestDirectory( aTmpName3 ); @@ -5536,7 +5536,7 @@ namespace osl_Directory } - void tearDown() + void tearDown() SAL_OVERRIDE { // remove three files : $TEMP/tmpdir/tmpname, $TEMP/tmpdir/tmpdir, $TEMP/tmpdir/hiddenfile, deleteTestFile( aTmpName3, aHidURL1 ); @@ -6131,7 +6131,7 @@ namespace osl_Directory { } - virtual void DirectoryCreated(const rtl::OUString& /*aDirectoryUrl*/) + virtual void DirectoryCreated(const rtl::OUString& /*aDirectoryUrl*/) SAL_OVERRIDE { i++; }; diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index 096de9c9b8c9..2d5e977c96ed 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx @@ -103,7 +103,7 @@ public: protected: struct resource *pResource; - void SAL_CALL run( ) + void SAL_CALL run( ) SAL_OVERRIDE { pResource->lock.acquire( ); for( sal_Int8 i = 0; i < 3; i++ ) @@ -131,7 +131,7 @@ public: protected: struct resource *pResource; - void SAL_CALL run( ) + void SAL_CALL run( ) SAL_OVERRIDE { pResource->lock.acquire( ); for( sal_Int8 i = 0; i < 3; i++ ) @@ -169,7 +169,7 @@ public: protected: struct chain* pChain; - void SAL_CALL run( ) + void SAL_CALL run( ) SAL_OVERRIDE { //block here if the mutex has been acquired pChain->lock.acquire( ); @@ -207,7 +207,7 @@ public: protected: Mutex* pMyMutex; - void SAL_CALL run() + void SAL_CALL run() SAL_OVERRIDE { // block here if the mutex has been acquired pMyMutex->acquire( ); @@ -229,7 +229,7 @@ public: protected: Mutex* pMyMutex; - void SAL_CALL run( ) + void SAL_CALL run( ) SAL_OVERRIDE { // block here if the mutex has been acquired pMyMutex->acquire( ); @@ -251,7 +251,7 @@ public: CPPUNIT_ASSERT_MESSAGE( "#GlobalMutexThread does not shutdown properly.\n", !isRunning( ) ); } protected: - void SAL_CALL run( ) + void SAL_CALL run( ) SAL_OVERRIDE { // block here if the mutex has been acquired Mutex* pGlobalMutex; @@ -276,7 +276,7 @@ namespace osl_Mutex struct chain m_Data; struct resource m_Res; - void setUp( ) + void setUp( ) SAL_OVERRIDE { for ( sal_Int8 i=0; i < BUFFER_SIZE; i++ ) m_Data.buffer[i] = 0; @@ -286,7 +286,7 @@ namespace osl_Mutex m_Res.data2 = 0; } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -574,7 +574,7 @@ public: protected: Mutex* pMyMutex; - void SAL_CALL run( ) + void SAL_CALL run( ) SAL_OVERRIDE { // block here if the mutex has been acquired MutexGuard aGuard( pMyMutex ); @@ -660,7 +660,7 @@ public: protected: Mutex* pMyMutex; - void SAL_CALL run( ) + void SAL_CALL run( ) SAL_OVERRIDE { // acquire the mutex // printf("# ClearGuardThread" ); @@ -802,7 +802,7 @@ public: protected: Mutex* pMyMutex; - void SAL_CALL run( ) + void SAL_CALL run( ) SAL_OVERRIDE { // acquire the mutex printf("# ResettableGuard\n" ); diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index e13797b475cf..74e692e2c0f6 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -238,7 +238,7 @@ protected: @see ThreadSafeValue */ - void SAL_CALL run() + void SAL_CALL run() SAL_OVERRIDE { while(schedule()) { @@ -249,7 +249,7 @@ protected: public: - virtual void SAL_CALL suspend() + virtual void SAL_CALL suspend() SAL_OVERRIDE { m_aFlag.acquire(); ::osl::Thread::suspend(); @@ -286,7 +286,7 @@ public: //m_bWait = sal_True; } - virtual void SAL_CALL suspend() + virtual void SAL_CALL suspend() SAL_OVERRIDE { m_aFlag.acquire(); ::osl::Thread::suspend(); @@ -297,7 +297,7 @@ protected: //sal_Bool m_bWait; sal_Int32 m_nWaitSec; - void SAL_CALL run() + void SAL_CALL run() SAL_OVERRIDE { /// if the thread should terminate, schedule return false while (m_aFlag.getValue() < 20 && schedule()) @@ -315,7 +315,7 @@ protected: } } } - void SAL_CALL onTerminated() + void SAL_CALL onTerminated() SAL_OVERRIDE { t_print("normally terminate this thread %u!\n", (unsigned) getIdentifier()); } @@ -343,7 +343,7 @@ public: { m_bSuspend = true; } - virtual void SAL_CALL suspend() + virtual void SAL_CALL suspend() SAL_OVERRIDE { m_aFlag.acquire(); ::osl::Thread::suspend(); @@ -351,7 +351,7 @@ public: } protected: bool m_bSuspend; - void SAL_CALL run() + void SAL_CALL run() SAL_OVERRIDE { //if the thread should terminate, schedule return false while (schedule()) @@ -386,14 +386,14 @@ class ONoScheduleThread : public Thread public: sal_Int32 getValue() { return m_aFlag.getValue(); } - virtual void SAL_CALL suspend() + virtual void SAL_CALL suspend() SAL_OVERRIDE { m_aFlag.acquire(); ::osl::Thread::suspend(); m_aFlag.release(); } protected: - void SAL_CALL run() + void SAL_CALL run() SAL_OVERRIDE { while (m_aFlag.getValue() < 10) { @@ -401,7 +401,7 @@ protected: ThreadHelper::thread_sleep_tenth_sec(1); } } - void SAL_CALL onTerminated() + void SAL_CALL onTerminated() SAL_OVERRIDE { t_print("normally terminate this thread %u!\n", (unsigned) getIdentifier()); } @@ -430,14 +430,14 @@ public: OAddThread(){} sal_Int32 getValue() { return m_aFlag.getValue(); } - virtual void SAL_CALL suspend() + virtual void SAL_CALL suspend() SAL_OVERRIDE { m_aFlag.acquire(); ::osl::Thread::suspend(); m_aFlag.release(); } protected: - void SAL_CALL run() + void SAL_CALL run() SAL_OVERRIDE { //if the thread should terminate, schedule return false while (schedule()) @@ -445,7 +445,7 @@ protected: m_aFlag.addValue(1); } } - void SAL_CALL onTerminated() + void SAL_CALL onTerminated() SAL_OVERRIDE { // t_print("normally terminate this thread %d!\n", getIdentifier()); } @@ -502,11 +502,11 @@ namespace osl_Thread public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -572,11 +572,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -653,11 +653,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -747,11 +747,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -832,11 +832,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -911,11 +911,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1003,11 +1003,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1070,11 +1070,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1530,11 +1530,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1585,11 +1585,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1616,11 +1616,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1659,11 +1659,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1724,11 +1724,11 @@ namespace osl_Thread class yield : public CppUnit::TestFixture { public: - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1749,11 +1749,11 @@ namespace osl_Thread { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1910,7 +1910,7 @@ public: private: char m_nData; - void SAL_CALL run() + void SAL_CALL run() SAL_OVERRIDE { char * pc = new char[2]; // strcpy(pc, &m_nData); @@ -1940,7 +1940,7 @@ class idThread: public Thread public: oslThreadIdentifier m_Id; private: - void SAL_CALL run() + void SAL_CALL run() SAL_OVERRIDE { oslThreadIdentifier* pId = new oslThreadIdentifier; *pId = getIdentifier(); @@ -1968,11 +1968,11 @@ namespace osl_ThreadData { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -1992,11 +1992,11 @@ namespace osl_ThreadData { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } @@ -2106,11 +2106,11 @@ namespace osl_ThreadData { public: // initialise your test code values here. - void setUp() + void setUp() SAL_OVERRIDE { } - void tearDown() + void tearDown() SAL_OVERRIDE { } diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 9df0de13f922..e4d2028fb55e 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -433,13 +433,13 @@ public: } - virtual void setUp() + virtual void setUp() SAL_OVERRIDE { temp_file_path_ = create_temp_file(temp_file_url_); parameters_[1] = temp_file_path_.pData; } - virtual void tearDown() + virtual void tearDown() SAL_OVERRIDE { osl::File::remove(temp_file_url_); } diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index 54fb89c7d435..61a79340ca24 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -336,7 +336,7 @@ class MyTestPlugInImpl: public CPPUNIT_NS::TestPlugInDefaultImpl public: MyTestPlugInImpl() {}; void initialize( CPPUNIT_NS::TestFactoryRegistry *registry, - const CPPUNIT_NS::PlugInParameters ¶meters ); + const CPPUNIT_NS::PlugInParameters ¶meters ) SAL_OVERRIDE; }; diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx b/sal/qa/osl/setthreadname/test-setthreadname.cxx index d9a15f132380..d55284925c56 100644 --- a/sal/qa/osl/setthreadname/test-setthreadname.cxx +++ b/sal/qa/osl/setthreadname/test-setthreadname.cxx @@ -33,7 +33,7 @@ namespace { class TestThread: public osl::Thread, private boost::noncopyable { private: - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; }; void TestThread::run() { |