From d0b12f8f198e9dffe5b12bb290f530965972d881 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Wed, 11 May 2011 09:11:43 +0200 Subject: [PATCH] QmlJS: Remove unused argument for Link helper function. --- src/libs/qmljs/qmljslink.cpp | 4 ++-- src/libs/qmljs/qmljslink.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index 13f4cde2e24..f8a2533191f 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -256,12 +256,12 @@ ObjectValue *Link::importFileOrDirectory(Document::Ptr doc, const ImportInfo &im import Qt 4.6 as Xxx (import com.nokia.qt is the same as the ones above) */ -ObjectValue *Link::importNonFile(Document::Ptr doc, const ImportInfo &importInfo, const QString &forcedPackageName) +ObjectValue *Link::importNonFile(Document::Ptr doc, const ImportInfo &importInfo) { Q_D(Link); ObjectValue *import = new ObjectValue(engine()); - const QString packageName = forcedPackageName.isEmpty() ? Bind::toString(importInfo.ast()->importUri, '.') : forcedPackageName; + const QString packageName = Bind::toString(importInfo.ast()->importUri, '.'); const ComponentVersion version = importInfo.version(); bool importFound = false; diff --git a/src/libs/qmljs/qmljslink.h b/src/libs/qmljs/qmljslink.h index 886abfd4b46..b94ef86e992 100644 --- a/src/libs/qmljs/qmljslink.h +++ b/src/libs/qmljs/qmljslink.h @@ -75,7 +75,7 @@ private: void populateImportedTypes(Interpreter::TypeEnvironment *typeEnv, Document::Ptr doc); Interpreter::ObjectValue *importFileOrDirectory(Document::Ptr doc, const Interpreter::ImportInfo &importInfo); - Interpreter::ObjectValue *importNonFile(Document::Ptr doc, const Interpreter::ImportInfo &importInfo, const QString &forcedPackageName = QString()); + Interpreter::ObjectValue *importNonFile(Document::Ptr doc, const Interpreter::ImportInfo &importInfo); void importObject(Bind *bind, const QString &name, Interpreter::ObjectValue *object, NameId *targetNamespace); bool importLibrary(Document::Ptr doc,