From 7049328fb2d656d8454d4f704ad75d057e766c0b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 20 Apr 2021 21:07:42 +0200 Subject: loplugin:stringadd replace OUStringLiteral temporaries with OUString::Concat Change-Id: I656f06a74d9f0180ae460264563d6a935c7d2c60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114377 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sal/osl/unx/file_misc.cxx | 2 +- sal/osl/unx/pipe.cxx | 4 ++-- sal/qa/osl/file/osl_File.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sal') diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index f9f316d8b5fb..906f5a9e209e 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -841,7 +841,7 @@ static oslFileError oslDoCopy(const char* pszSourceFileName, const char* pszDest { //TODO: better pick a temp file name instead of adding .osl-tmp: // use the destination file to avoid EXDEV /* Cross-device link */ - tmpDestFile = pszDestFileName + OStringLiteral(".osl-tmp"); + tmpDestFile = pszDestFileName + OString::Concat(".osl-tmp"); if (rename(pszDestFileName, tmpDestFile.getStr()) != 0) { int e = errno; diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index 034979ba0e4e..d903bdd2f2de 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -166,11 +166,11 @@ static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions Option OSL_VERIFY(osl_psz_getUserIdent(Security, Ident, sizeof(Ident))); - name += OStringLiteral("OSL_PIPE_") + Ident + "_" + pszPipeName; + name += OString::Concat("OSL_PIPE_") + Ident + "_" + pszPipeName; } else { - name += OStringLiteral("OSL_PIPE_") + pszPipeName; + name += OString::Concat("OSL_PIPE_") + pszPipeName; } if (o3tl::make_unsigned(name.getLength()) >= sizeof addr.sun_path) diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 884ff06e917c..b83dbb3b821a 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -380,7 +380,7 @@ static OString outputError(const OString & returnVal, const OString & rightVal, return OString(); OString aString = msg + - OStringLiteral(": the returned value is '") + + OString::Concat(": the returned value is '") + returnVal + "', but the value should be '" + rightVal + -- cgit