diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-26 15:30:19 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-26 15:33:35 +0100 |
| commit | 3ce8a7dab59b7a77e1223d1357e6c32c31e4fba6 (patch) | |
| tree | 9d6b6ac9fb7e0874580568220e802ba9e0dc94cd /sal | |
| parent | e4fbe2582c4e042f50db3d5d86b717fe15721ab5 (diff) | |
const_cast: convert some C-style casts and remove some redundant ones
Change-Id: I03e43d219a65aa270f73a91896e0e7a567d424bc
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/file.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/unx/profile.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/unx/tempfile.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/rtl/process/rtl_Process.cxx | 2 | ||||
| -rw-r--r-- | sal/rtl/strtmpl.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 143207efbd5f..d3c3f95b5cd9 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -315,7 +315,7 @@ oslFileError FileHandle_Impl::setSize (sal_uInt64 uSize) if (-1 == lseek (m_fd, (off_t)(nSize - 1), SEEK_SET)) return result; - if (-1 == write (m_fd, (char*)"", (size_t)1)) + if (-1 == write (m_fd, "", (size_t)1)) { /* Failure. Restore saved position */ (void) lseek (m_fd, (off_t)(nCurPos), SEEK_SET); diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index 9ca76445f78f..ce40c80938be 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -398,7 +398,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, } else { - pStr=(sal_Char*)pszDefault; + pStr=const_cast<sal_Char*>(pszDefault); } if ( pStr != 0 ) diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx index 38cc0b83502f..040d3c483042 100644 --- a/sal/osl/unx/tempfile.cxx +++ b/sal/osl/unx/tempfile.cxx @@ -192,7 +192,7 @@ static oslFileError osl_create_temp_file_impl_( rtl_uStringbuffer_newFromStr_WithLength( &tmp_file_path, - rtl_uString_getStr((rtl_uString*)pustr_base_directory), + rtl_uString_getStr(const_cast<rtl_uString*>(pustr_base_directory)), len_base_dir); rtl_uStringbuffer_ensureCapacity( diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index 6640eed804e3..535b4f1f903b 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -50,7 +50,7 @@ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = NU } rtl::OString aString; aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ); - printf("%s\n", (char *)aString.getStr( ) ); + printf("%s\n", aString.getStr( ) ); } inline ::rtl::OUString getModulePath( void ) diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx index 4a90c2ea74e4..55351501ab3e 100644 --- a/sal/rtl/strtmpl.cxx +++ b/sal/rtl/strtmpl.cxx @@ -1242,7 +1242,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( new )( IMPL_RTL_STRINGDATA** ppThis ) if ( *ppThis) IMPL_RTL_STRINGNAME( release )( *ppThis ); - *ppThis = (IMPL_RTL_STRINGDATA*) (&IMPL_RTL_EMPTYSTRING); + *ppThis = const_cast<IMPL_RTL_STRINGDATA*>(&IMPL_RTL_EMPTYSTRING); } /* ----------------------------------------------------------------------- */ |