diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2019-10-06 08:10:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-06 17:06:53 +0200 |
| commit | 0a6b9df8c8fc8e97ac627081485613e336051208 (patch) | |
| tree | 1387d9751601052546c2eeb5af037429718f8aac /xmlreader | |
| parent | 3e5d4ecbde512efe169536544489635f7f076fd2 (diff) | |
convert equals() to operator== in xmlreader::Span
Change-Id: Ic6a8eae344c06be87e2bc4bf7f242a2d18ebc8ad
Reviewed-on: https://gerrit.libreoffice.org/80312
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlreader')
| -rw-r--r-- | xmlreader/source/xmlreader.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index 229be044662c..0194f6c695a7 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -112,7 +112,7 @@ XmlReader::~XmlReader() { int XmlReader::registerNamespaceIri(Span const & iri) { int id = toNamespaceId(namespaceIris_.size()); namespaceIris_.push_back(iri); - if (iri.equals("http://www.w3.org/2001/XMLSchema-instance")) { + if (iri == "http://www.w3.org/2001/XMLSchema-instance") { // Old user layer .xcu files used the xsi namespace prefix without // declaring a corresponding namespace binding, see issue 77174; reading // those files during migration would fail without this hack that can be @@ -190,7 +190,7 @@ int XmlReader::getNamespaceId(Span const & prefix) const { } auto i = std::find_if(namespaces_.crbegin(), namespaces_.crend(), - [&prefix](const NamespaceData& rNamespaceData) { return prefix.equals(rNamespaceData.prefix); }); + [&prefix](const NamespaceData& rNamespaceData) { return prefix == rNamespaceData.prefix; }); if (i != namespaces_.rend()) { @@ -379,7 +379,7 @@ int XmlReader::scanNamespaceIri(char const * begin, char const * end) { assert(begin != nullptr && begin <= end); Span iri(handleAttributeValue(begin, end, false)); for (NamespaceIris::size_type i = 0; i < namespaceIris_.size(); ++i) { - if (namespaceIris_[i].equals(iri)) { + if (namespaceIris_[i] == iri) { return toNamespaceId(i); } } @@ -645,13 +645,13 @@ XmlReader::Result XmlReader::handleStartTag(int * nsId, Span * localName) { char const * valueEnd = pos_ + i; pos_ += i + 1; if (attrNameColon == nullptr && - Span(attrNameBegin, attrNameEnd - attrNameBegin).equals("xmlns")) + Span(attrNameBegin, attrNameEnd - attrNameBegin) == "xmlns") { hasDefaultNs = true; defaultNsId = scanNamespaceIri(valueBegin, valueEnd); } else if (attrNameColon != nullptr && - Span(attrNameBegin, attrNameColon - attrNameBegin).equals( - "xmlns")) + Span(attrNameBegin, attrNameColon - attrNameBegin) == + "xmlns") { namespaces_.emplace_back( Span(attrNameColon + 1, attrNameEnd - (attrNameColon + 1)), |