diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-10-13 08:44:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-10-15 21:15:49 +0200 |
| commit | b4844c310bd9897fef59e8a4da0513100ea86096 (patch) | |
| tree | 379a43d012894ff06d29d79c7d4d8009b7853501 /sal/qa | |
| parent | 8797ba5e5d63151837ba443e1aea9d0997b6b7ab (diff) | |
Repurpose loplugin:stringstatic for O[U]String vars that can be constexpr
...now that warning about O[U]String vars that could be O[U]StringLiteral is no
longer useful
Change-Id: I389e72038171f28482049b41f6224257dd11f452
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157992
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal/qa')
| -rw-r--r-- | sal/qa/osl/socket.cxx | 5 | ||||
| -rw-r--r-- | sal/qa/rtl/strings/test_ostring.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/rtl/strings/test_strings_defaultstringview.cxx | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/sal/qa/osl/socket.cxx b/sal/qa/osl/socket.cxx index ed31c9ede7ae..4598754a2214 100644 --- a/sal/qa/osl/socket.cxx +++ b/sal/qa/osl/socket.cxx @@ -25,7 +25,7 @@ class SocketTest : public CppUnit::TestFixture void test_createInetSocketAddr() { - OUString const in("123.4.56.78"); + OUString constexpr in(u"123.4.56.78"_ustr); auto const addr = osl_createInetSocketAddr(in.pData, 100); CPPUNIT_ASSERT(addr != nullptr); CPPUNIT_ASSERT_EQUAL(osl_Socket_FamilyInet, osl_getFamilyOfSocketAddr(addr)); @@ -39,8 +39,7 @@ class SocketTest : public CppUnit::TestFixture void test_createInetBroadcastAddr() { - OUString const in("123.4.56.78"); - auto const addr = osl_createInetBroadcastAddr(in.pData, 100); + auto const addr = osl_createInetBroadcastAddr(u"123.4.56.78"_ustr.pData, 100); CPPUNIT_ASSERT(addr != nullptr); CPPUNIT_ASSERT_EQUAL(osl_Socket_FamilyInet, osl_getFamilyOfSocketAddr(addr)); OUString out; diff --git a/sal/qa/rtl/strings/test_ostring.cxx b/sal/qa/rtl/strings/test_ostring.cxx index b4fb201cafa3..f0a82a712254 100644 --- a/sal/qa/rtl/strings/test_ostring.cxx +++ b/sal/qa/rtl/strings/test_ostring.cxx @@ -109,7 +109,7 @@ void Test::testCompareTo() void Test::testUtf8StringLiterals() { - const OString sIn(u8"ßa"); + OString sIn(u8"ßa"); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), sIn.getLength()); CPPUNIT_ASSERT_EQUAL(195, int(static_cast<unsigned char>(sIn[0]))); CPPUNIT_ASSERT_EQUAL(159, int(static_cast<unsigned char>(sIn[1]))); diff --git a/sal/qa/rtl/strings/test_strings_defaultstringview.cxx b/sal/qa/rtl/strings/test_strings_defaultstringview.cxx index 591688b31c3c..3e7c5f971599 100644 --- a/sal/qa/rtl/strings/test_strings_defaultstringview.cxx +++ b/sal/qa/rtl/strings/test_strings_defaultstringview.cxx @@ -52,7 +52,7 @@ class Test : public CppUnit::TestFixture OUString("foo").startsWithIgnoreAsciiCase(std::u16string_view())); CPPUNIT_ASSERT_EQUAL(true, OUString("foo").endsWith(std::u16string_view())); CPPUNIT_ASSERT_EQUAL(true, OUString("foo").endsWithIgnoreAsciiCase(std::u16string_view())); - OUString const foo("foo"); // avoid loplugin:stringconstant, loplugin:stringview + OUString constexpr foo(u"foo"_ustr); // avoid loplugin:stringconstant, loplugin:stringview CPPUNIT_ASSERT_EQUAL(false, foo == std::u16string_view()); CPPUNIT_ASSERT_EQUAL(true, foo != std::u16string_view()); CPPUNIT_ASSERT_EQUAL(false, foo < std::u16string_view()); |