From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 12 Oct 2015 16:04:04 +0200
Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
---
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 96 +++++++--------
sal/qa/osl/condition/osl_Condition.cxx | 6 +-
sal/qa/osl/file/osl_File.cxx | 154 ++++++++++++------------
sal/qa/osl/mutex/osl_Mutex.cxx | 22 ++--
sal/qa/osl/process/osl_Thread.cxx | 94 +++++++--------
sal/qa/osl/process/osl_process.cxx | 4 +-
sal/qa/osl/security/osl_Security.cxx | 2 +-
sal/qa/osl/setthreadname/test-setthreadname.cxx | 2 +-
sal/qa/rtl/alloc/rtl_alloc.cxx | 8 +-
sal/qa/rtl/bootstrap/expand.cxx | 2 +-
sal/qa/rtl/cipher/rtl_cipher.cxx | 40 +++---
sal/qa/rtl/crc32/rtl_crc32.cxx | 4 +-
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 8 +-
sal/qa/rtl/locale/rtl_locale.cxx | 28 ++---
sal/qa/rtl/process/rtl_Process.cxx | 8 +-
sal/qa/rtl/textenc/rtl_tencinfo.cxx | 10 +-
sal/qa/rtl/uuid/rtl_Uuid.cxx | 8 +-
17 files changed, 248 insertions(+), 248 deletions(-)
(limited to 'sal/qa')
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index c67fe6a2d5e4..ad5bbaae49b3 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -168,7 +168,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[6];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr1 );
arrOUS[1] = new OString( kTestStr14 );
@@ -179,7 +179,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4]; delete arrOUS[5];
@@ -323,11 +323,11 @@ namespace rtl_OStringBuffer
class remove : public CppUnit::TestFixture
{
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -370,7 +370,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[6];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr1 );
arrOUS[1] = new OString( "1" );
@@ -381,7 +381,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4]; delete arrOUS[5];
@@ -501,7 +501,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[6];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr1 );
arrOUS[1] = new OString( "1" );
@@ -512,7 +512,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4]; delete arrOUS[5];
@@ -962,7 +962,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[6];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr1 );
arrOUS[1] = new OString( "1" );
@@ -973,7 +973,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4]; delete arrOUS[5];
@@ -1532,7 +1532,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -1542,7 +1542,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -1939,7 +1939,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -1949,7 +1949,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -2325,7 +2325,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -2335,7 +2335,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -2710,7 +2710,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -2720,7 +2720,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -2945,7 +2945,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -2955,7 +2955,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -3178,7 +3178,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -3188,7 +3188,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -5164,7 +5164,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -5174,7 +5174,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -6175,7 +6175,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -6185,7 +6185,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -8225,7 +8225,7 @@ namespace rtl_OStringBuffer
sal_Int32 intVal;
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -8236,7 +8236,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -8353,7 +8353,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -8363,7 +8363,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -8927,7 +8927,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -8937,7 +8937,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -10913,7 +10913,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -10923,7 +10923,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -11924,7 +11924,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -11934,7 +11934,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -13977,7 +13977,7 @@ namespace rtl_OStringBuffer
sal_Int64 intVal;
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -13988,7 +13988,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -14102,7 +14102,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -14112,7 +14112,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -14685,7 +14685,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -14695,7 +14695,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -15262,7 +15262,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -15272,7 +15272,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -15853,7 +15853,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -15863,7 +15863,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
@@ -15914,7 +15914,7 @@ namespace rtl_OStringBuffer
OString* arrOUS[5];
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
arrOUS[0] = new OString( kTestStr7 );
arrOUS[1] = new OString( );
@@ -15924,7 +15924,7 @@ namespace rtl_OStringBuffer
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete arrOUS[0]; delete arrOUS[1]; delete arrOUS[2];
delete arrOUS[3]; delete arrOUS[4];
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx
index a4177fdbce7c..d13713ea652b 100644
--- a/sal/qa/osl/condition/osl_Condition.cxx
+++ b/sal/qa/osl/condition/osl_Condition.cxx
@@ -49,7 +49,7 @@ protected:
::osl::Condition& m_MyCon;
ConditionType m_MyType;
- void SAL_CALL run() SAL_OVERRIDE
+ void SAL_CALL run() override
{
switch ( m_MyType )
{
@@ -199,7 +199,7 @@ namespace osl_Condition
bool bRes, bRes1, bRes2;
TimeValue *tv1;
- void setUp( ) SAL_OVERRIDE
+ void setUp( ) override
{
tv1 = new TimeValue;
tv1->Seconds = 1;
@@ -207,7 +207,7 @@ namespace osl_Condition
}
- void tearDown( ) SAL_OVERRIDE
+ void tearDown( ) override
{
delete tv1;
}
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 90b976591933..7f5b8489152d 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -1081,12 +1081,12 @@ namespace osl_FileBase
public:
getTempDirURL() :nError(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
nError = FileBase::getTempDirURL( aUStr );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -1139,7 +1139,7 @@ namespace osl_FileBase
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
pHandle = new oslFileHandle();
pUStr_DirURL = new ::rtl::OUString( aUserDirectoryURL );
@@ -1147,7 +1147,7 @@ namespace osl_FileBase
//*pUStr_DirURL = aUserDirectoryURL; /// create temp file in /tmp/PID or c:\temp\PID.*/
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
delete pUStr_DirURL;
delete pUStr_FileURL;
@@ -1246,7 +1246,7 @@ namespace osl_FileStatus
public:
ctors() :nError1(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
@@ -1268,7 +1268,7 @@ namespace osl_FileStatus
*/
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -1319,7 +1319,7 @@ namespace osl_FileStatus
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
@@ -1332,7 +1332,7 @@ namespace osl_FileStatus
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
::osl::FileBase::RC nError1 = pDir->close();
delete pDir;
@@ -1520,7 +1520,7 @@ namespace osl_FileStatus
public:
getFileType() :nError1(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile: $TEMP/tmpdir/tmpname.
// a tempdirectory: $TEMP/tmpdir/tmpdir.
@@ -1546,7 +1546,7 @@ namespace osl_FileStatus
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove all in $TEMP/tmpdir.
deleteTestDirectory( aTmpName3, aTmpName1 );
@@ -1647,7 +1647,7 @@ namespace osl_FileStatus
public:
getAttributes() :nError(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
aTypeURL = aUserDirectoryURL.copy( 0 );
concatURL( aTypeURL, aTmpName2 );
@@ -1662,7 +1662,7 @@ namespace osl_FileStatus
CPPUNIT_ASSERT( nError == FileBase::E_None );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
deleteTestFile( aTypeURL );
deleteTestFile( aTypeURL_Hid );
@@ -1774,7 +1774,7 @@ namespace osl_FileStatus
public:
getAccessTime() :nError(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
aTypeURL = aUserDirectoryURL.copy( 0 );
concatURL( aTypeURL, aTmpName2 );
@@ -1784,7 +1784,7 @@ namespace osl_FileStatus
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
deleteTestFile( aTypeURL );
}
@@ -1885,7 +1885,7 @@ namespace osl_FileStatus
getFileSize() :nError(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
aTypeURL = aUserDirectoryURL.copy( 0 );
concatURL( aTypeURL, aTmpName2 );
@@ -1894,7 +1894,7 @@ namespace osl_FileStatus
CPPUNIT_ASSERT( nError == FileBase::E_None );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
deleteTestFile( aTypeURL );
}
@@ -1948,7 +1948,7 @@ namespace osl_FileStatus
public:
getFileName() :nError(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
aTypeURL = aUserDirectoryURL.copy( 0 );
concatURL( aTypeURL, aTmpName2 );
@@ -1957,7 +1957,7 @@ namespace osl_FileStatus
CPPUNIT_ASSERT( nError == FileBase::E_None );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
deleteTestFile( aTypeURL );
}
@@ -1992,14 +1992,14 @@ namespace osl_FileStatus
getFileURL() :nError(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
createTestFile( aTmpName6 );
nError = ::osl::DirectoryItem::get( aTmpName6, rItem );
CPPUNIT_ASSERT( nError == FileBase::E_None );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
deleteTestFile( aTmpName6 );
}
@@ -2036,14 +2036,14 @@ namespace osl_FileStatus
getLinkTargetURL() :nError(FileBase::E_None) {}
// test code.
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
aTypeURL = aUserDirectoryURL.copy( 0 );
concatURL( aTypeURL, aTmpName2 );
createTestFile( aTypeURL );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
deleteTestFile( aTypeURL );
}
@@ -2119,14 +2119,14 @@ namespace osl_File
public:
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
createTestFile( aTmpName4 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -2177,14 +2177,14 @@ namespace osl_File
, nError2(FileBase::E_None)
, nError3(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
createTestFile( aTmpName4 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -2301,14 +2301,14 @@ namespace osl_File
, nError2(FileBase::E_None)
, nError3(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
createTestFile( aTmpName4 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -2368,7 +2368,7 @@ namespace osl_File
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
@@ -2385,7 +2385,7 @@ namespace osl_File
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -2476,7 +2476,7 @@ namespace osl_File
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
@@ -2493,7 +2493,7 @@ namespace osl_File
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -2545,7 +2545,7 @@ namespace osl_File
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
@@ -2562,7 +2562,7 @@ namespace osl_File
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -2642,7 +2642,7 @@ namespace osl_File
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
@@ -2659,7 +2659,7 @@ namespace osl_File
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -2743,7 +2743,7 @@ namespace osl_File
{
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
@@ -2760,7 +2760,7 @@ namespace osl_File
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -2835,13 +2835,13 @@ namespace osl_File
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpname.
createTestFile( aTmpName6 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpname.
deleteTestFile( aTmpName6 );
@@ -2899,7 +2899,7 @@ namespace osl_File
{
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpname.
createTestFile( aTmpName6 );
@@ -2924,7 +2924,7 @@ namespace osl_File
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpname.
deleteTestFile( aTmpName6 );
@@ -2986,7 +2986,7 @@ namespace osl_File
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
@@ -3003,7 +3003,7 @@ namespace osl_File
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -3117,7 +3117,7 @@ namespace osl_File
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
@@ -3134,7 +3134,7 @@ namespace osl_File
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -3258,7 +3258,7 @@ namespace osl_File
}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
@@ -3275,7 +3275,7 @@ namespace osl_File
CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -3342,13 +3342,13 @@ namespace osl_File
public:
setAttributes() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestFile( aTmpName6 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName6 );
@@ -3436,13 +3436,13 @@ namespace osl_File
public:
setTime() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestFile( aTmpName6 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName6 );
@@ -3519,14 +3519,14 @@ namespace osl_File
public:
sync() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestFile( aTmpName6 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName6 );
@@ -3603,13 +3603,13 @@ namespace osl_DirectoryItem
public:
ctors() :nError1(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpname.
createTestFile( aTmpName6 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpname.
deleteTestFile( aTmpName6 );
@@ -3644,13 +3644,13 @@ namespace osl_DirectoryItem
public:
copy_assin_Ctors() :nError1(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpname.
createTestFile( aTmpName6 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpname.
deleteTestFile( aTmpName6 );
@@ -3706,13 +3706,13 @@ namespace osl_DirectoryItem
public:
is() :nError1(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpname.
createTestFile( aTmpName6 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpname.
deleteTestFile( aTmpName6 );
@@ -3754,13 +3754,13 @@ namespace osl_DirectoryItem
public:
get() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpname.
createTestFile( aTmpName6 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpname.
deleteTestFile( aTmpName6 );
@@ -3820,14 +3820,14 @@ namespace osl_DirectoryItem
public:
getFileStatus() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
createTestFile( aTmpName4 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -3910,14 +3910,14 @@ namespace osl_Directory
public:
ctors() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
createTestFile( aTmpName4 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -3974,14 +3974,14 @@ namespace osl_Directory
public:
open() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
createTestFile( aTmpName4 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -4072,14 +4072,14 @@ namespace osl_Directory
public:
isOpen() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
createTestDirectory( aTmpName3 );
createTestFile( aTmpName4 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
deleteTestFile( aTmpName4 );
@@ -4129,13 +4129,13 @@ namespace osl_Directory
public:
close() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempdirectory : $TEMP/tmpdir.
createTestDirectory( aTmpName3 );
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove a tempdirectory : $TEMP/tmpdir.
deleteTestDirectory( aTmpName3 );
@@ -4185,7 +4185,7 @@ namespace osl_Directory
public:
reset() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempdirectory : $TEMP/tmpdir.
createTestDirectory( aTmpName3 );
@@ -4195,7 +4195,7 @@ namespace osl_Directory
createTestFile( aTmpName3, aHidURL1);
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove three files : $TEMP/tmpdir/tmpname, $TEMP/tmpdir/tmpdir, $TEMP/tmpdir/hiddenfile,
deleteTestFile( aTmpName3, aHidURL1);
@@ -4299,7 +4299,7 @@ namespace osl_Directory
public:
getNextItem() :nError1(FileBase::E_None),nError2(FileBase::E_None) {}
// initialization
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// create a tempdirectory : $TEMP/tmpdir.
createTestDirectory( aTmpName3 );
@@ -4310,7 +4310,7 @@ namespace osl_Directory
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
// remove three files : $TEMP/tmpdir/tmpname, $TEMP/tmpdir/tmpdir, $TEMP/tmpdir/hiddenfile,
deleteTestFile( aTmpName3, aHidURL1 );
@@ -4895,7 +4895,7 @@ namespace osl_Directory
{
}
- virtual void DirectoryCreated(const rtl::OUString& /*aDirectoryUrl*/) SAL_OVERRIDE
+ virtual void DirectoryCreated(const rtl::OUString& /*aDirectoryUrl*/) override
{
i++;
};
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 4c613b6bd22d..106dbc6ea903 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -74,7 +74,7 @@ public:
protected:
struct resource *pResource;
- void SAL_CALL run( ) SAL_OVERRIDE
+ void SAL_CALL run( ) override
{
pResource->lock.acquire( );
for( sal_Int8 i = 0; i < 3; i++ )
@@ -102,7 +102,7 @@ public:
protected:
struct resource *pResource;
- void SAL_CALL run( ) SAL_OVERRIDE
+ void SAL_CALL run( ) override
{
pResource->lock.acquire( );
for( sal_Int8 i = 0; i < 3; i++ )
@@ -139,7 +139,7 @@ public:
protected:
struct chain* pChain;
- void SAL_CALL run( ) SAL_OVERRIDE
+ void SAL_CALL run( ) override
{
//block here if the mutex has been acquired
pChain->lock.acquire( );
@@ -177,7 +177,7 @@ public:
protected:
Mutex* pMyMutex;
- void SAL_CALL run() SAL_OVERRIDE
+ void SAL_CALL run() override
{
// block here if the mutex has been acquired
pMyMutex->acquire( );
@@ -199,7 +199,7 @@ public:
protected:
Mutex* pMyMutex;
- void SAL_CALL run( ) SAL_OVERRIDE
+ void SAL_CALL run( ) override
{
// block here if the mutex has been acquired
pMyMutex->acquire( );
@@ -221,7 +221,7 @@ public:
CPPUNIT_ASSERT_MESSAGE( "#GlobalMutexThread does not shutdown properly.\n", !isRunning( ) );
}
protected:
- void SAL_CALL run( ) SAL_OVERRIDE
+ void SAL_CALL run( ) override
{
// block here if the mutex has been acquired
Mutex* pGlobalMutex;
@@ -244,7 +244,7 @@ namespace osl_Mutex
struct chain m_Data;
struct resource m_Res;
- void setUp( ) SAL_OVERRIDE
+ void setUp( ) override
{
for ( sal_Int8 i=0; i < BUFFER_SIZE; i++ )
m_Data.buffer[i] = 0;
@@ -254,7 +254,7 @@ namespace osl_Mutex
m_Res.data2 = 0;
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -534,7 +534,7 @@ public:
protected:
Mutex* pMyMutex;
- void SAL_CALL run( ) SAL_OVERRIDE
+ void SAL_CALL run( ) override
{
// block here if the mutex has been acquired
MutexGuard aGuard( pMyMutex );
@@ -615,7 +615,7 @@ public:
protected:
Mutex* pMyMutex;
- void SAL_CALL run( ) SAL_OVERRIDE
+ void SAL_CALL run( ) override
{
// acquire the mutex
// printf("# ClearGuardThread" );
@@ -752,7 +752,7 @@ public:
protected:
Mutex* pMyMutex;
- void SAL_CALL run( ) SAL_OVERRIDE
+ void SAL_CALL run( ) 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 403490d66a15..63207f9b1e56 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -235,7 +235,7 @@ protected:
@see ThreadSafeValue
*/
- void SAL_CALL run() SAL_OVERRIDE
+ void SAL_CALL run() override
{
while(schedule())
{
@@ -246,7 +246,7 @@ protected:
public:
- virtual void SAL_CALL suspend() SAL_OVERRIDE
+ virtual void SAL_CALL suspend() override
{
m_aFlag.acquire();
::osl::Thread::suspend();
@@ -282,7 +282,7 @@ public:
//m_bWait = sal_True;
}
- virtual void SAL_CALL suspend() SAL_OVERRIDE
+ virtual void SAL_CALL suspend() override
{
m_aFlag.acquire();
::osl::Thread::suspend();
@@ -293,7 +293,7 @@ protected:
//sal_Bool m_bWait;
sal_Int32 m_nWaitSec;
- void SAL_CALL run() SAL_OVERRIDE
+ void SAL_CALL run() override
{
/// if the thread should terminate, schedule return false
while (m_aFlag.getValue() < 20 && schedule())
@@ -311,7 +311,7 @@ protected:
}
}
}
- void SAL_CALL onTerminated() SAL_OVERRIDE
+ void SAL_CALL onTerminated() override
{
t_print("normally terminate this thread %u!\n", (unsigned) getIdentifier());
}
@@ -335,14 +335,14 @@ class ONoScheduleThread : public Thread
public:
sal_Int32 getValue() { return m_aFlag.getValue(); }
- virtual void SAL_CALL suspend() SAL_OVERRIDE
+ virtual void SAL_CALL suspend() override
{
m_aFlag.acquire();
::osl::Thread::suspend();
m_aFlag.release();
}
protected:
- void SAL_CALL run() SAL_OVERRIDE
+ void SAL_CALL run() override
{
while (m_aFlag.getValue() < 10)
{
@@ -350,7 +350,7 @@ protected:
ThreadHelper::thread_sleep_tenth_sec(1);
}
}
- void SAL_CALL onTerminated() SAL_OVERRIDE
+ void SAL_CALL onTerminated() override
{
t_print("normally terminate this thread %u!\n", (unsigned) getIdentifier());
}
@@ -379,14 +379,14 @@ public:
OAddThread(){}
sal_Int32 getValue() { return m_aFlag.getValue(); }
- virtual void SAL_CALL suspend() SAL_OVERRIDE
+ virtual void SAL_CALL suspend() override
{
m_aFlag.acquire();
::osl::Thread::suspend();
m_aFlag.release();
}
protected:
- void SAL_CALL run() SAL_OVERRIDE
+ void SAL_CALL run() override
{
//if the thread should terminate, schedule return false
while (schedule())
@@ -394,7 +394,7 @@ protected:
m_aFlag.addValue(1);
}
}
- void SAL_CALL onTerminated() SAL_OVERRIDE
+ void SAL_CALL onTerminated() override
{
// t_print("normally terminate this thread %d!\n", getIdentifier());
}
@@ -451,11 +451,11 @@ namespace osl_Thread
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -519,11 +519,11 @@ namespace osl_Thread
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -600,11 +600,11 @@ namespace osl_Thread
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -654,11 +654,11 @@ namespace osl_Thread
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -739,11 +739,11 @@ namespace osl_Thread
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -818,11 +818,11 @@ namespace osl_Thread
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -910,11 +910,11 @@ namespace osl_Thread
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -976,11 +976,11 @@ namespace osl_Thread
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -1434,9 +1434,9 @@ namespace osl_Thread
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE {}
+ void setUp() override {}
- void tearDown() SAL_OVERRIDE {}
+ void tearDown() override {}
// insert your test code here.
void getPriority_001()
@@ -1478,9 +1478,9 @@ namespace osl_Thread
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE {}
+ void setUp() override {}
- void tearDown() SAL_OVERRIDE {}
+ void tearDown() override {}
void getIdentifier_001()
{
@@ -1497,8 +1497,8 @@ namespace osl_Thread
class getCurrentIdentifier : public CppUnit::TestFixture
{
public:
- void setUp() SAL_OVERRIDE {}
- void tearDown() SAL_OVERRIDE {}
+ void setUp() override {}
+ void tearDown() override {}
void getCurrentIdentifier_001()
{
@@ -1526,8 +1526,8 @@ namespace osl_Thread
class waittest : public CppUnit::TestFixture
{
public:
- void setUp() SAL_OVERRIDE {}
- void tearDown() SAL_OVERRIDE {}
+ void setUp() override {}
+ void tearDown() override {}
/** call wait in the run method
@@ -1586,8 +1586,8 @@ namespace osl_Thread
class yield : public CppUnit::TestFixture
{
public:
- void setUp() SAL_OVERRIDE {}
- void tearDown() SAL_OVERRIDE {}
+ void setUp() override {}
+ void tearDown() override {}
void yield_001()
{
@@ -1604,8 +1604,8 @@ namespace osl_Thread
class schedule : public CppUnit::TestFixture
{
public:
- void setUp() SAL_OVERRIDE {}
- void tearDown() SAL_OVERRIDE {}
+ void setUp() override {}
+ void tearDown() override {}
/** The requested thread will get terminate the next time schedule() is called.
@@ -1757,7 +1757,7 @@ public:
private:
char m_nData;
- void SAL_CALL run() SAL_OVERRIDE
+ void SAL_CALL run() override
{
char * pc = new char[2];
// strcpy(pc, &m_nData);
@@ -1787,7 +1787,7 @@ class idThread: public Thread
public:
oslThreadIdentifier m_Id;
private:
- void SAL_CALL run() SAL_OVERRIDE
+ void SAL_CALL run() override
{
oslThreadIdentifier* pId = new oslThreadIdentifier;
*pId = getIdentifier();
@@ -1815,11 +1815,11 @@ namespace osl_ThreadData
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -1838,11 +1838,11 @@ namespace osl_ThreadData
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -1949,11 +1949,11 @@ namespace osl_ThreadData
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index ea430f9f920b..07440dd27a90 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -200,13 +200,13 @@ public:
suExecutableFileURL = suCWD + "/" + EXECUTABLE_NAME;
}
- virtual void setUp() SAL_OVERRIDE
+ virtual void setUp() override
{
temp_file_path_ = create_temp_file(temp_file_url_);
parameters_[1] = temp_file_path_.pData;
}
- virtual void tearDown() SAL_OVERRIDE
+ virtual void tearDown() 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 46b884a3b9ed..a5cc2a03238d 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -308,7 +308,7 @@ class MyTestPlugInImpl: public CPPUNIT_NS::TestPlugInDefaultImpl
public:
MyTestPlugInImpl() {};
void initialize( CPPUNIT_NS::TestFactoryRegistry *registry,
- const CPPUNIT_NS::PlugInParameters ¶meters ) SAL_OVERRIDE;
+ const CPPUNIT_NS::PlugInParameters ¶meters ) override;
};
void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
diff --git a/sal/qa/osl/setthreadname/test-setthreadname.cxx b/sal/qa/osl/setthreadname/test-setthreadname.cxx
index d55284925c56..3b05e392c20d 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() SAL_OVERRIDE;
+ virtual void SAL_CALL run() override;
};
void TestThread::run() {
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 9a5c488ae6ba..1a588653edf7 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -58,12 +58,12 @@ public:
}
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
m_pMemory = static_cast<char*>(rtl_allocateMemory( m_nSizeOfMemory ));
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
rtl_freeMemory(m_pMemory);
m_pMemory = NULL;
@@ -106,12 +106,12 @@ public:
}
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
m_pZeroMemory = static_cast<char*>(rtl_allocateZeroMemory( m_nSizeOfZeroMemory ));
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
rtl_freeZeroMemory(m_pZeroMemory, m_nSizeOfZeroMemory);
// LLA: no check possible, may GPF if there is something wrong.
diff --git a/sal/qa/rtl/bootstrap/expand.cxx b/sal/qa/rtl/bootstrap/expand.cxx
index b1eb23b82543..2e76cbf5d21f 100644
--- a/sal/qa/rtl/bootstrap/expand.cxx
+++ b/sal/qa/rtl/bootstrap/expand.cxx
@@ -20,7 +20,7 @@ namespace {
class Test: public CppUnit::TestFixture {
public:
- virtual void setUp() SAL_OVERRIDE;
+ virtual void setUp() override;
private:
CPPUNIT_TEST_SUITE(Test);
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index 315fb9d57fc0..842ce97c9d93 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -34,11 +34,11 @@ class create : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -106,11 +106,11 @@ class createBF : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -154,11 +154,11 @@ class decode : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -291,11 +291,11 @@ class decodeBF : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -315,11 +315,11 @@ class destroy : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -342,11 +342,11 @@ class destroyBF : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -371,11 +371,11 @@ class encode : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -444,11 +444,11 @@ class encodeBF : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -468,11 +468,11 @@ class init : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -581,11 +581,11 @@ class initBF : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx
index ad7dff456b9f..cce0b40116d6 100644
--- a/sal/qa/rtl/crc32/rtl_crc32.cxx
+++ b/sal/qa/rtl/crc32/rtl_crc32.cxx
@@ -31,11 +31,11 @@ class test : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index 79451cc6fa49..9d6d91758e55 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -104,7 +104,7 @@ protected:
@see ThreadSafeValue
*/
- void SAL_CALL run() SAL_OVERRIDE
+ void SAL_CALL run() override
{
while(schedule())
{
@@ -123,7 +123,7 @@ protected:
public:
- virtual void SAL_CALL suspend() SAL_OVERRIDE
+ virtual void SAL_CALL suspend() override
{
::osl::Thread::suspend();
}
@@ -148,11 +148,11 @@ namespace rtl_DoubleLocking
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index f2b03fefebd1..44f6996b8056 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -38,13 +38,13 @@ class getDefault : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// start message
rtl_locale::setDefaultLocale();
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -67,13 +67,13 @@ class setDefault : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// start message
rtl_locale::setDefaultLocale();
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
setDefaultLocale();
}
@@ -101,13 +101,13 @@ class getLanguage : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// start message
rtl_locale::setDefaultLocale();
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -139,13 +139,13 @@ class getCountry : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// start message
rtl_locale::setDefaultLocale();
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -177,13 +177,13 @@ class getVariant : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// start message
rtl_locale::setDefaultLocale();
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -215,13 +215,13 @@ class hashCode : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// start message
rtl_locale::setDefaultLocale();
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -253,13 +253,13 @@ class equals : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
// start message
rtl_locale::setDefaultLocale();
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index 5b13b3c32120..ee8dcfa7dd29 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -72,11 +72,11 @@ class getAppCommandArg : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -197,11 +197,11 @@ class getGlobalProcessId : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
//gets a 16-byte fixed size identifier which is guaranteed not to change during the current process.
diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
index 001b694d5dbd..2a3e43bdde28 100644
--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
+++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
@@ -33,7 +33,7 @@ namespace
class testBestMime : public CppUnit::TestFixture
{
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
@@ -485,7 +485,7 @@ namespace
class testBestUnix : public CppUnit::TestFixture
{
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
@@ -1017,7 +1017,7 @@ namespace
class testBestWindows : public CppUnit::TestFixture
{
public:
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
@@ -1581,11 +1581,11 @@ namespace
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index d20c38a67ad9..f568d03702c2 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -45,11 +45,11 @@ class createUuid : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
@@ -116,11 +116,11 @@ class createNamedUuid : public CppUnit::TestFixture
{
public:
// initialise your test code values here.
- void setUp() SAL_OVERRIDE
+ void setUp() override
{
}
- void tearDown() SAL_OVERRIDE
+ void tearDown() override
{
}
--
cgit