From 6f50961e69406a17d6ec998956a6b33208b1001b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Oct 2018 12:06:00 +0200 Subject: remove more rtl::OUString and OString prefixes which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/o3tl/string_view.hxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/o3tl') diff --git a/include/o3tl/string_view.hxx b/include/o3tl/string_view.hxx index 303e4800af79..bdc81e8d7261 100644 --- a/include/o3tl/string_view.hxx +++ b/include/o3tl/string_view.hxx @@ -28,7 +28,7 @@ #include // An approximation of C++17 , including implicit conversion -// from rtl::OString and rtl::OUString. +// from OString and OUString. namespace o3tl { @@ -547,7 +547,7 @@ public: data_(s.data()), size_(s.size()) {} // For std::string_view, this will be provided by a (LIBO_INTERNAL_ONLY) - // non-explicit conversion operator from rtl::OString: + // non-explicit conversion operator from OString: template basic_string_view( OString const & s, typename std::enable_if< @@ -556,7 +556,7 @@ public: data_(s.getStr()), size_(s.getLength()) {} // For std::u16string_view, this will be provided by a (LIBO_INTERNAL_ONLY) - // non-explicit conversion operator from rtl::OUString: + // non-explicit conversion operator from OUString: template basic_string_view( OUString const & s, typename std::enable_if< @@ -566,10 +566,10 @@ public: // For std::u16string_view, this would either be provided by a // (LIBO_INTERNAL_ONLY) non-explicit conversion operator from - // rtl::OUStringLiteral, or rtl::OUStringLiteral would be given up in favor + // OUStringLiteral, or OUStringLiteral would be given up in favor // of std::u16string_view anyway (but this constructor also serves to reject // as ambiguous construction of a o3tl::u16string_view from a narrow string - // literal, which would otherwise go via the above rtl::OUString + // literal, which would otherwise go via the above OUString // constructor): template constexpr basic_string_view( OUStringLiteral literal, @@ -858,7 +858,7 @@ namespace o3tl { // LO-specific convenience functions: // For std::u16string_view, this will be provided by a (LIBO_INTERNAL_ONLY) -// rtl::OUString constructor: +// OUString constructor: inline OUString toOUString(u16string_view s) { return OUString(s.data(), s.size()); } -- cgit