diff options
Diffstat (limited to 'sal/osl/unx/file_path_helper.cxx')
-rw-r--r-- | sal/osl/unx/file_path_helper.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index 923b588a20c9..7fc2effb5f03 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -28,14 +28,14 @@ const sal_Unicode FPH_CHAR_PATH_SEPARATOR = '/'; const sal_Unicode FPH_CHAR_DOT = '.'; const sal_Unicode FPH_CHAR_COLON = ':'; -static const rtl::OUString FPH_PATH_SEPARATOR() -{ return rtl::OUString(FPH_CHAR_PATH_SEPARATOR); } +static const OUString FPH_PATH_SEPARATOR() +{ return OUString(FPH_CHAR_PATH_SEPARATOR); } -static const rtl::OUString FPH_LOCAL_DIR_ENTRY() -{ return rtl::OUString(FPH_CHAR_DOT); } +static const OUString FPH_LOCAL_DIR_ENTRY() +{ return OUString(FPH_CHAR_DOT); } -static const rtl::OUString FPH_PARENT_DIR_ENTRY() -{ return rtl::OUString(".."); } +static const OUString FPH_PARENT_DIR_ENTRY() +{ return OUString(".."); } void osl_systemPathRemoveSeparator(rtl_uString* pustrPath) { @@ -62,7 +62,7 @@ void osl_systemPathEnsureSeparator(rtl_uString** ppustrPath) OSL_PRECOND((nullptr != ppustrPath) && (nullptr != *ppustrPath), "osl_systemPathEnsureSeparator: Invalid parameter"); if ((ppustrPath != nullptr) && (*ppustrPath != nullptr)) { - rtl::OUString path(*ppustrPath); + OUString path(*ppustrPath); sal_Int32 lp = path.getLength(); sal_Int32 i = path.lastIndexOf(FPH_CHAR_PATH_SEPARATOR); @@ -89,8 +89,8 @@ void osl_systemPathMakeAbsolutePath( const rtl_uString* pustrRelPath, rtl_uString** ppustrAbsolutePath) { - rtl::OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath))); - rtl::OUString rel(const_cast<rtl_uString*>(pustrRelPath)); + OUString base(rtl_uString_getStr(const_cast<rtl_uString*>(pustrBasePath))); + OUString rel(const_cast<rtl_uString*>(pustrRelPath)); if (!base.isEmpty()) osl_systemPathEnsureSeparator(&base.pData); @@ -108,11 +108,11 @@ void osl_systemPathGetFileNameOrLastDirectoryPart( OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart, "osl_systemPathGetFileNameOrLastDirectoryPart: Invalid parameter"); - rtl::OUString path(const_cast<rtl_uString*>(pustrPath)); + OUString path(const_cast<rtl_uString*>(pustrPath)); osl_systemPathRemoveSeparator(path.pData); - rtl::OUString last_part; + OUString last_part; if (path.getLength() > 1 || (path.getLength() == 1 && path[0] != FPH_CHAR_PATH_SEPARATOR)) { @@ -130,7 +130,7 @@ bool osl_systemPathIsHiddenFileOrDirectoryEntry( if ((pustrPath == nullptr) || (pustrPath->length == 0)) return false; - rtl::OUString fdp; + OUString fdp; osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &fdp.pData); return ((fdp.pData->length > 0) && @@ -143,7 +143,7 @@ bool osl_systemPathIsLocalOrParentDirectoryEntry( { OSL_PRECOND(pustrPath, "osl_systemPathIsLocalOrParentDirectoryEntry: Invalid parameter"); - rtl::OUString dirent; + OUString dirent; osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &dirent.pData); @@ -161,7 +161,7 @@ public: returns the first path in list, no need to call reset first */ - path_list_iterator(const rtl::OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) : + path_list_iterator(const OUString& path_list, sal_Unicode list_separator = FPH_CHAR_COLON) : m_path_list(path_list), m_end(m_path_list.getStr() + m_path_list.getLength() + 1), m_separator(list_separator) @@ -191,9 +191,9 @@ public: return (m_path_segment_end >= m_end); } - rtl::OUString get_current_item() const + OUString get_current_item() const { - return rtl::OUString( + return OUString( m_path_segment_begin, (m_path_segment_end - m_path_segment_begin)); } @@ -211,7 +211,7 @@ private: } private: - rtl::OUString const m_path_list; + OUString const m_path_list; const sal_Unicode* m_end; const sal_Unicode m_separator; const sal_Unicode* m_path_segment_begin; @@ -226,13 +226,13 @@ bool osl_searchPath( OSL_PRECOND(pustrFilePath && pustrSearchPathList && ppustrPathFound, "osl_searchPath: Invalid parameter"); bool bfound = false; - rtl::OUString fp(const_cast<rtl_uString*>(pustrFilePath)); - rtl::OUString pl = rtl::OUString(const_cast<rtl_uString*>(pustrSearchPathList)); + OUString fp(const_cast<rtl_uString*>(pustrFilePath)); + OUString pl = OUString(const_cast<rtl_uString*>(pustrSearchPathList)); path_list_iterator pli(pl); while (!pli.done()) { - rtl::OUString p = pli.get_current_item(); + OUString p = pli.get_current_item(); osl::systemPathEnsureSeparator(p); p += fp; |