rename mergeItem to inheritItem

Change-Id: I21ad394076a7f2b2b2a1ff8892d427991e5613e4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

2 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/corelib/language/itemreaderastvisitor.cpp b/src/lib/corelib/language/itemreaderastvisitor.cpp
index bffd46e46..3b79db73e 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.cpp
+++ b/src/lib/corelib/language/itemreaderastvisitor.cpp
@@ -304,7 +304,7 @@ bool ItemReaderASTVisitor::visit(AST::UiObjectDefinition *ast)
     const QString baseTypeFileName = m_typeNameToFile.value(fullTypeName);
     if (!baseTypeFileName.isEmpty()) {
         const ItemReaderResult baseFile = m_reader->internalReadFile(baseTypeFileName);
-        mergeItem(item, baseFile.rootItem, baseFile);
+        inheritItem(item, baseFile.rootItem, baseFile);
         if (baseFile.rootItem->m_file->m_idScope) {
             // Make ids from the derived file visible in the base file.
             // ### Do we want to turn off this feature? It's QMLish but kind of strange.
@@ -478,8 +478,8 @@ void ItemReaderASTVisitor::checkImportVersion(const AST::SourceLocation &version
                     toCodeLocation(versionToken));
 }
 
-void ItemReaderASTVisitor::mergeItem(Item *dst, const Item *src,
-                                     const ItemReaderResult &baseFile)
+void ItemReaderASTVisitor::inheritItem(Item *dst, const Item *src,
+        const ItemReaderResult &baseFile)
 {
     if (!src->typeName().isEmpty())
         dst->setTypeName(src->typeName());
@@ -511,9 +511,9 @@ void ItemReaderASTVisitor::mergeItem(Item *dst, const Item *src,
                 } else if (v->type() == Value::ItemValueType) {
                     QBS_CHECK(v.staticCast<ItemValue>()->item());
                     QBS_CHECK(it.value().staticCast<const ItemValue>()->item());
-                    mergeItem(v.staticCast<ItemValue>()->item(),
-                              it.value().staticCast<const ItemValue>()->item(),
-                              baseFile);
+                    inheritItem(v.staticCast<ItemValue>()->item(),
+                                it.value().staticCast<const ItemValue>()->item(),
+                                baseFile);
                 } else {
                     QBS_CHECK(!"unexpected value type");
                 }
diff --git a/src/lib/corelib/language/itemreaderastvisitor.h b/src/lib/corelib/language/itemreaderastvisitor.h
index 409b5104e..b8800608a 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.h
+++ b/src/lib/corelib/language/itemreaderastvisitor.h
@@ -66,7 +66,7 @@ private:
     Item *targetItemForBinding(Item *item, const QStringList &binding,
                                  const CodeLocation &bindingLocation);
     void checkImportVersion(const QbsQmlJS::AST::SourceLocation &versionToken) const;
-    static void mergeItem(Item *dst, const Item *src,
+    static void inheritItem(Item *dst, const Item *src,
                           const ItemReaderResult &baseFile);
     void ensureIdScope(const FileContextPtr &file);
     void setupAlternatives(Item *item);