3 files changed, 8 insertions, 4 deletions
diff --git a/include/codemaker/commoncpp.hxx b/include/codemaker/commoncpp.hxx
index b7586e872426..dc1b61c6b32c 100644
--- a/include/codemaker/commoncpp.hxx
+++ b/include/codemaker/commoncpp.hxx
@@ -22,6 +22,8 @@
 
 #include <sal/config.h>
 
+#include <string_view>
+
 #include <codemaker/unotype.hxx>
 
 namespace rtl {
@@ -43,7 +45,7 @@ namespace codemaker::cpp {
 rtl::OString scopedCppName(rtl::OString const & type, bool ns_alias=true);
 
 rtl::OString translateUnoToCppType(
-    codemaker::UnoType::Sort sort, rtl::OUString const & nucleus);
+    codemaker::UnoType::Sort sort, std::u16string_view nucleus);
 
 enum class IdentifierTranslationMode {
     Global,
diff --git a/include/codemaker/global.hxx b/include/codemaker/global.hxx
index d865e5270aa4..60e0d1bf774b 100644
--- a/include/codemaker/global.hxx
+++ b/include/codemaker/global.hxx
@@ -23,6 +23,7 @@
 #include <list>
 #include <vector>
 #include <set>
+#include <string_view>
 
 #include <osl/file.hxx>
 #include <rtl/ustring.hxx>
@@ -55,7 +56,7 @@ public:
     friend FileStream &operator<<(FileStream& o, const ::rtl::OString& s);
     friend FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer const * s);
     friend FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s);
-    friend FileStream & operator <<(FileStream & out, rtl::OUString const & s);
+    friend FileStream & operator <<(FileStream & out, std::u16string_view s);
 
 private:
     oslFileHandle m_file;
diff --git a/include/codemaker/typemanager.hxx b/include/codemaker/typemanager.hxx
index 5a2d50ec0d90..f76fbb4ca7ea 100644
--- a/include/codemaker/typemanager.hxx
+++ b/include/codemaker/typemanager.hxx
@@ -22,6 +22,7 @@
 
 #include <sal/config.h>
 
+#include <string_view>
 #include <vector>
 
 #include <codemaker/unotype.hxx>
@@ -63,11 +64,11 @@ private:
 };
 
 
-inline OString u2b(OUString const & s) {
+inline OString u2b(std::u16string_view s) {
     return OUStringToOString(s, RTL_TEXTENCODING_UTF8);
 }
 
-inline OUString b2u(OString const & s) {
+inline OUString b2u(std::string_view s) {
     return OStringToOUString(s, RTL_TEXTENCODING_UTF8);
 }