diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-29 14:06:48 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-29 12:11:48 +0000 |
| commit | b7dd84ce23c15c87937bb5107aba9f098640088b (patch) | |
| tree | eab36d0f774a44633953a222f5ce78f0a083fe4a | |
| parent | decc3a892ba4d5ee8dbcf4031f590e28ee3d58e0 (diff) | |
| download | qbs-b7dd84ce23c15c87937bb5107aba9f098640088b.tar.gz | |
Remove pointless parameter from Item::clone().
Change-Id: I49ba3b789858c76f4f11ba4169fa6712f9df8d4a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/lib/corelib/language/item.cpp | 6 | ||||
| -rw-r--r-- | src/lib/corelib/language/item.h | 2 | ||||
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 2 | ||||
| -rw-r--r-- | src/lib/corelib/language/modulemerger.cpp | 2 | ||||
| -rw-r--r-- | src/lib/corelib/language/value.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/corelib/language/item.cpp b/src/lib/corelib/language/item.cpp index 116c811b3..8400313b4 100644 --- a/src/lib/corelib/language/item.cpp +++ b/src/lib/corelib/language/item.cpp @@ -67,9 +67,9 @@ Item *Item::create(ItemPool *pool) return pool->allocateItem(); } -Item *Item::clone(ItemPool *pool) const +Item *Item::clone() const { - Item *dup = create(pool); + Item *dup = create(pool()); dup->m_id = m_id; dup->m_typeName = m_typeName; dup->m_location = m_location; @@ -85,7 +85,7 @@ Item *Item::clone(ItemPool *pool) const dup->m_children.reserve(m_children.count()); foreach (const Item *child, m_children) { - Item *clonedChild = child->clone(pool); + Item *clonedChild = child->clone(); clonedChild->m_parent = dup; dup->m_children.append(clonedChild); } diff --git a/src/lib/corelib/language/item.h b/src/lib/corelib/language/item.h index 4c86a977b..b2a992832 100644 --- a/src/lib/corelib/language/item.h +++ b/src/lib/corelib/language/item.h @@ -76,7 +76,7 @@ public: typedef QMap<QString, ValuePtr> PropertyMap; static Item *create(ItemPool *pool); - Item *clone(ItemPool *pool) const; + Item *clone() const; ItemPool *pool() const; const QString &id() const; diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 5b2ded6d3..60c72f724 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -425,7 +425,7 @@ QList<Item *> ModuleLoader::multiplexProductItem(ProductContext *dummyContext, I } if (i == 0) continue; // We use the original item for the first profile. - Item * const cloned = productItem->clone(productItem->pool()); + Item * const cloned = productItem->clone(); cloned->setProperty(profileKey, VariantValue::create(profileNames.at(i))); additionalProductItems << cloned; } diff --git a/src/lib/corelib/language/modulemerger.cpp b/src/lib/corelib/language/modulemerger.cpp index 13f29b95f..9648c83a7 100644 --- a/src/lib/corelib/language/modulemerger.cpp +++ b/src/lib/corelib/language/modulemerger.cpp @@ -199,7 +199,7 @@ void ModuleMerger::appendPrototypeValueToNextChain(Item *moduleProto, const QStr ValuePtr protoValue = moduleProto->property(propertyName); if (!protoValue) return; - Item * const clonedModulePrototype = moduleProto->clone(moduleProto->pool()); + Item * const clonedModulePrototype = moduleProto->clone(); Item * const scope = Item::create(clonedModulePrototype->pool()); scope->setFile(clonedModulePrototype->file()); m_mergedModuleItem->scope()->copyProperty(QLatin1String("project"), scope); diff --git a/src/lib/corelib/language/value.cpp b/src/lib/corelib/language/value.cpp index 141e1759d..70e0e066c 100644 --- a/src/lib/corelib/language/value.cpp +++ b/src/lib/corelib/language/value.cpp @@ -151,7 +151,7 @@ ItemValue::~ItemValue() ValuePtr ItemValue::clone() const { - Item *clonedItem = m_item ? m_item->clone(m_item->pool()) : 0; + Item *clonedItem = m_item ? m_item->clone() : 0; return ItemValuePtr(new ItemValue(clonedItem)); } |
