diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-20 15:34:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-22 17:52:36 +0000 |
| commit | 90cd1b56c98c56010ca43704df94d6096beee6e0 (patch) | |
| tree | ea65824438301f032519ded952146d399e479db2 /sal | |
| parent | 602fc6153fd1d326a827351e7ade649638446f7c (diff) | |
Convert oslCheckMode to scoped enum
Change-Id: I7cd31d5624682bf7bd021586769593499d2481af
Reviewed-on: https://gerrit.libreoffice.org/25204
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 69ec26e9cdde..6ba45804f706 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -296,12 +296,12 @@ inline void deleteTestDirectory( const ::rtl::OUString& basename, const ::rtl::O /** Check for the file and directory access right. */ -typedef enum { - osl_Check_Mode_Exist, - osl_Check_Mode_OpenAccess, - osl_Check_Mode_ReadAccess, - osl_Check_Mode_WriteAccess -} oslCheckMode; +enum class oslCheckMode { + Exist, + OpenAccess, + ReadAccess, + WriteAccess +}; //check if the file exist inline bool ifFileExist( const ::rtl::OUString & str ) @@ -345,15 +345,15 @@ inline bool checkDirectory( const ::rtl::OUString & str, oslCheckMode nCheckMode if ( ( ::osl::FileBase::E_NOENT != rc ) && ( ::osl::FileBase::E_ACCES != rc ) ){ switch ( nCheckMode ) { - case osl_Check_Mode_Exist: + case oslCheckMode::Exist: if ( rc == ::osl::FileBase::E_None ) bCheckResult = true; break; - case osl_Check_Mode_OpenAccess: + case oslCheckMode::OpenAccess: if ( rc == ::osl::FileBase::E_None ) bCheckResult = true; break; - case osl_Check_Mode_ReadAccess: + case oslCheckMode::ReadAccess: //rc = pDir->getNextItem( rItem, 0 ); rc = aDir.getNextItem( rItem ); if ( ( rc == ::osl::FileBase::E_None ) || ( rc == ::osl::FileBase::E_NOENT ) ) @@ -361,7 +361,7 @@ inline bool checkDirectory( const ::rtl::OUString & str, oslCheckMode nCheckMode else bCheckResult = false; break; - case osl_Check_Mode_WriteAccess: + case oslCheckMode::WriteAccess: ( ( aUString += str ) += aSlashURL ) += aTmpName2; //if ( ( rc = pDir->create( aUString ) ) == ::osl::FileBase::E_None ) if ( ( rc = Directory::create( aUString ) ) == ::osl::FileBase::E_None ) @@ -1104,9 +1104,9 @@ namespace osl_FileBase void getTempDirURL_002() { CPPUNIT_ASSERT_MESSAGE( "test for getTempDirURL function: test for open and write access rights", - checkDirectory( aUStr, osl_Check_Mode_OpenAccess ) && - checkDirectory( aUStr, osl_Check_Mode_ReadAccess ) && - checkDirectory( aUStr,osl_Check_Mode_WriteAccess ) ); + checkDirectory( aUStr, oslCheckMode::OpenAccess ) && + checkDirectory( aUStr, oslCheckMode::ReadAccess ) && + checkDirectory( aUStr, oslCheckMode::WriteAccess ) ); } CPPUNIT_TEST_SUITE( getTempDirURL ); |