aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qmljs/qmljslink.cpp
diff options
context:
space:
mode:
authorChristian Kamm <[email protected]>2011-10-10 10:32:33 +0200
committerChristian Kamm <[email protected]>2011-10-12 10:52:56 +0200
commit90925c69f6370f41e71851662ce5e88c310621f9 (patch)
tree2d01eee916fd42e56139b537fd8e3084cc70ef23 /src/libs/qmljs/qmljslink.cpp
parent8c94325a03e08c1dcff53fda3a4b02d99856e2ab (diff)
QmlJS: Rename QmlObjectValue -> CppComponentValue.
Reviewed-by: Fawzi Mohamed Reviewed-by: Thomas Hartmann Change-Id: Ib89388d5a5678403e4637eec5829f3520637ee27 Reviewed-on: http://codereview.qt-project.org/6310 Reviewed-by: Christian Kamm <[email protected]> Sanity-Review: Christian Kamm <[email protected]>
Diffstat (limited to 'src/libs/qmljs/qmljslink.cpp')
-rw-r--r--src/libs/qmljs/qmljslink.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp
index d3e553bbc73..7d693ec0c7e 100644
--- a/src/libs/qmljs/qmljslink.cpp
+++ b/src/libs/qmljs/qmljslink.cpp
@@ -366,7 +366,7 @@ Import LinkPrivate::importNonFile(Document::Ptr doc, const ImportInfo &importInf
// if there are cpp-based types for this package, use them too
if (valueOwner->cppQmlTypes().hasModule(packageName)) {
importFound = true;
- foreach (const QmlObjectValue *object,
+ foreach (const CppComponentValue *object,
valueOwner->cppQmlTypes().createObjectsForImport(packageName, version)) {
import.object->setMember(object->className(), object);
}
@@ -439,7 +439,7 @@ bool LinkPrivate::importLibrary(Document::Ptr doc,
} else {
const QString packageName = importInfo.name();
valueOwner->cppQmlTypes().load(libraryInfo.metaObjects(), packageName);
- foreach (const QmlObjectValue *object, valueOwner->cppQmlTypes().createObjectsForImport(packageName, version)) {
+ foreach (const CppComponentValue *object, valueOwner->cppQmlTypes().createObjectsForImport(packageName, version)) {
import->object->setMember(object->className(), object);
}
}
@@ -522,7 +522,7 @@ void LinkPrivate::loadImplicitDefaultImports(Imports *imports)
import.valid = true;
import.info = info;
import.object = new ObjectValue(valueOwner);
- foreach (const QmlObjectValue *object,
+ foreach (const CppComponentValue *object,
valueOwner->cppQmlTypes().createObjectsForImport(
defaultPackage, maxVersion)) {
import.object->setMember(object->className(), object);