opencl/inc/opencl_device_selection.h | 10 +++++----- opencl/source/opencl_device.cxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 235ae98ae614315cfe3bb2baf52ca442bcc2f592 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Sun Nov 19 18:27:25 2023 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Sun Nov 19 22:35:12 2023 +0100 Extended loplugin:ostr: opencl Change-Id: I126ed9e9fca6d1ab8d4e42ec0fe1ffb33a5f8ae8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159689 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/opencl/inc/opencl_device_selection.h b/opencl/inc/opencl_device_selection.h index ed4914bbcf39..4baffbf2737c 100644 --- a/opencl/inc/opencl_device_selection.h +++ b/opencl/inc/opencl_device_selection.h @@ -110,7 +110,7 @@ inline OString getDeviceInfoString(cl_device_id aDeviceId, cl_device_info aDevic inline OString getDeviceType(cl_device_id aDeviceId) { - OString sType = ""; + OString sType = ""_ostr; cl_device_type aDeviceType; clGetDeviceInfo(aDeviceId, CL_DEVICE_TYPE, sizeof(aDeviceType), &aDeviceType, nullptr); if (aDeviceType & CL_DEVICE_TYPE_CPU) @@ -263,12 +263,12 @@ inline ds_status writeProfile(const OUString& rStreamName, std::unique_ptr<ds_pr { case DeviceType::NativeCPU: aXmlWriter.startElement("type"); - aXmlWriter.content(OString("native")); + aXmlWriter.content("native"_ostr); aXmlWriter.endElement(); break; case DeviceType::OpenCLDevice: aXmlWriter.startElement("type"); - aXmlWriter.content(OString("opencl")); + aXmlWriter.content("opencl"_ostr); aXmlWriter.endElement(); aXmlWriter.startElement("name"); @@ -285,13 +285,13 @@ inline ds_status writeProfile(const OUString& rStreamName, std::unique_ptr<ds_pr aXmlWriter.startElement("time"); if (rtl::math::approxEqual(rDevice.fTime, DBL_MAX)) - aXmlWriter.content(OString("max")); + aXmlWriter.content("max"_ostr); else aXmlWriter.content(OString::number(rDevice.fTime)); aXmlWriter.endElement(); aXmlWriter.startElement("errors"); - aXmlWriter.content(rDevice.bErrors ? OString("true") : OString("false")); + aXmlWriter.content(rDevice.bErrors ? "true"_ostr : "false"_ostr); aXmlWriter.endElement(); aXmlWriter.endElement(); diff --git a/opencl/source/opencl_device.cxx b/opencl/source/opencl_device.cxx index 10c3103d3631..9bebb3b35ba3 100644 --- a/opencl/source/opencl_device.cxx +++ b/opencl/source/opencl_device.cxx @@ -500,7 +500,7 @@ ds_device const & getDeviceSelection( /* Setup */ std::unique_ptr<ds_profile> aProfile; ds_status status; - status = initDSProfile(aProfile, "LibreOffice v1"); + status = initDSProfile(aProfile, "LibreOffice v1"_ostr); if (status != DS_SUCCESS) {