Standard plural of leaf is leaves.

5 files changed, 10 insertions, 10 deletions

diff --git a/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp b/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp
index 1ee6403c577..dc3dbfca7ca 100644
--- a/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp
+++ b/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp
@@ -47,7 +47,7 @@ QueryWrapperTest::testQueryWrapper()
         QueryWrapper::TermList & tl = wrap.getTermList();
 
         QueryTermList terms;
-        q.getLeafs(terms);
+        q.getLeaves(terms);
         ASSERT_TRUE(tl.size() == 5 && terms.size() == 5);
         for (size_t i = 0; i < 5; ++i) {
             EXPECT_EQUAL(tl[i].getTerm(), terms[i]);
diff --git a/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp b/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp
index dddb6d28d48..c1311a80c7a 100644
--- a/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp
@@ -34,12 +34,12 @@ QueryWrapper::QueryWrapper(Query & query) :
     _phraseList(query),
     _termList()
 {
-    QueryTermList leafs;
-    query.getLeafs(leafs);
-    for (size_t i = 0; i < leafs.size(); ++i) {
+    QueryTermList leaves;
+    query.getLeaves(leaves);
+    for (size_t i = 0; i < leaves.size(); ++i) {
         size_t index = 0;
-        PhraseQueryNode * parent = _phraseList.findPhrase(leafs[i], index);
-        _termList.push_back(Term(leafs[i], parent, index));
+        PhraseQueryNode * parent = _phraseList.findPhrase(leaves[i], index);
+        _termList.push_back(Term(leaves[i], parent, index));
     }
 }
 
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index ee091354a30..4d31c71c0a0 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -781,7 +781,7 @@ void
 SearchVisitor::setupSnippetModifiers()
 {
     QueryTermList qtl;
-    _query.getLeafs(qtl);
+    _query.getLeaves(qtl);
     _snippetModifierManager.setup(qtl, _fieldSearchSpecMap.specMap(), _fieldSearchSpecMap.documentTypeMap().begin()->second,
                                   *_fieldPathMap, _rankController.getRankProcessor()->get_query_env());
 }
diff --git a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
index e70655a4d07..c11f9e839cf 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
@@ -226,7 +226,7 @@ void FieldIdTSearcherMap::prepare(const DocumentTypeIndexFieldMapT& difm,
                                   search::fef::IQueryEnvironment& query_env)
 {
     QueryTermList qtl;
-    query.getLeafs(qtl);
+    query.getLeaves(qtl);
     vespalib::string tmp;
     for (auto& searcher : *this) {
         QueryTermList onlyInIndex;
diff --git a/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp
index fdde633bd91..e33408a2e26 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp
@@ -186,7 +186,7 @@ bool FieldSearchSpecMap::buildFieldsInQuery(const Query & query, StringFieldIdTM
 {
     bool retval(true);
     ConstQueryTermList qtl;
-    query.getLeafs(qtl);
+    query.getLeaves(qtl);
 
     for (const auto & term : qtl) {
         for (const auto & dtm : documentTypeMap()) {
@@ -282,7 +282,7 @@ void
 FieldSearchSpecMap::reconfigFromQuery(const Query & query)
 {
     ConstQueryTermList qtl;
-    query.getLeafs(qtl);
+    query.getLeaves(qtl);
 
     for (const auto & termA : qtl) {
         for (const auto & ifm : documentTypeMap()) {