summaryrefslogtreecommitdiff
path: root/include/tools/wldcrd.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-11 17:44:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-11 21:25:10 +0100
commit35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch)
treebb78f4f13f131f0cb206a9707cc3cfc495a3876a /include/tools/wldcrd.hxx
parent0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (diff)
Adapt the remaining OUString functions to std string_view
...for LIBO_INTERNAL_ONLY. These had been missed by 1b43cceaea2084a0489db68cd0113508f34b6643 "Make many OUString functions take std::u16string_view parameters" because they did not match the multi-overload pattern that was addressed there, but they nevertheless benefit from being changed just as well (witness e.g. the various resulting changes from copy() to subView()). This showed a conversion from OStringChar to std::string_view to be missing (while the corresponding conversion form OUStringChar to std::u16string_view was already present). The improvement to loplugin:stringadd became necessary to fix > [CPT] compilerplugins/clang/test/stringadd.cxx > error: 'error' diagnostics expected but not seen: > File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd] > File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd] > 2 errors generated. Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/tools/wldcrd.hxx')
-rw-r--r--include/tools/wldcrd.hxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/tools/wldcrd.hxx b/include/tools/wldcrd.hxx
index 5fc3d87e4ab5..fd127a30a1af 100644
--- a/include/tools/wldcrd.hxx
+++ b/include/tools/wldcrd.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_TOOLS_WLDCRD_HXX
#define INCLUDED_TOOLS_WLDCRD_HXX
+#include <sal/config.h>
+
+#include <string_view>
+
#include <tools/toolsdllapi.h>
#include <osl/thread.h>
#include <rtl/ustring.hxx>
@@ -38,7 +42,7 @@ public:
{
}
- WildCard(const OUString& rWildCard, const char cSeparator = '\0')
+ WildCard(std::u16string_view rWildCard, const char cSeparator = '\0')
: aWildString(OUStringToOString(rWildCard, osl_getThreadTextEncoding()))
, cSepSymbol(cSeparator)
{
@@ -49,12 +53,12 @@ public:
return OStringToOUString(aWildString, osl_getThreadTextEncoding());
}
- void setGlob(const OUString& rString)
+ void setGlob(std::u16string_view rString)
{
aWildString = OUStringToOString(rString, osl_getThreadTextEncoding());
}
- bool Matches( const OUString& rStr ) const;
+ bool Matches( std::u16string_view rStr ) const;
};
#endif