diff options
Diffstat (limited to 'idlc')
-rw-r--r-- | idlc/inc/idlc.hxx | 5 | ||||
-rw-r--r-- | idlc/source/idlc.cxx | 2 | ||||
-rw-r--r-- | idlc/source/idlccompile.cxx | 4 | ||||
-rw-r--r-- | idlc/source/idlcproduce.cxx | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/idlc/inc/idlc.hxx b/idlc/inc/idlc.hxx index 42f16836adbb..454e70511612 100644 --- a/idlc/inc/idlc.hxx +++ b/idlc/inc/idlc.hxx @@ -23,6 +23,7 @@ #include "aststack.hxx" #include "options.hxx" #include <memory> +#include <string_view> #ifdef SAL_UNX #define SEPARATOR '/' @@ -46,7 +47,7 @@ public: void init(); - bool dumpDeps(OString const& rDepFile, + bool dumpDeps(std::string_view rDepFile, OString const& rTarget); Options* getOptions() @@ -142,7 +143,7 @@ sal_Int32 compileFile(const OString * pathname); sal_Int32 produceFile(const OString& filenameBase, sPair_t const*const pDepFile); // filenameBase is filename without ".idl" -void removeIfExists(const OString& pathname); +void removeIfExists(std::string_view pathname); bool copyFile(const OString* source, const OString& target); // a null source means stdin diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx index c1d09b4c1b2e..ca47b34fe0d5 100644 --- a/idlc/source/idlc.cxx +++ b/idlc/source/idlc.cxx @@ -315,7 +315,7 @@ struct WriteDummy } bool -Idlc::dumpDeps(OString const& rDepFile, OString const& rTarget) +Idlc::dumpDeps(std::string_view rDepFile, OString const& rTarget) { ::osl::File depFile( OStringToOUString(rDepFile, osl_getThreadTextEncoding())); diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 8db6d82a026f..bf3325d6821a 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -265,7 +265,7 @@ sal_Int32 compileFile(const OString * pathname) { token = dOpt.getToken( 0, ' ', nIndex ); if (token.getLength()) - lCppArgs.push_back(OStringToOUString("-D" + token, RTL_TEXTENCODING_UTF8)); + lCppArgs.push_back("-D" + OStringToOUString(token, RTL_TEXTENCODING_UTF8)); } while( nIndex != -1 ); } @@ -277,7 +277,7 @@ sal_Int32 compileFile(const OString * pathname) { token = incOpt.getToken( 0, ' ', nIndex ); if (token.getLength()) - lCppArgs.push_back(OStringToOUString("-I" + token, RTL_TEXTENCODING_UTF8)); + lCppArgs.push_back("-I" + OStringToOUString(token, RTL_TEXTENCODING_UTF8)); } while( nIndex != -1 ); } diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx index ff9ca2f2d47f..92e7887236d2 100644 --- a/idlc/source/idlcproduce.cxx +++ b/idlc/source/idlcproduce.cxx @@ -113,7 +113,7 @@ static bool cleanPath() return true; } -void removeIfExists(const OString& pathname) +void removeIfExists(std::string_view pathname) { osl::File::remove(OStringToOUString(pathname, RTL_TEXTENCODING_UTF8)); } |