feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Remove unused argument for Link helper function.

Browse Source
This commit is contained in:
Christian Kamm
2011-05-11 09:11:43 +02:00
parent 587a2c3a2a
commit d0b12f8f19
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/qmljs/qmljslink.cpp
View File

@@ -256,12 +256,12 @@ ObjectValue *Link::importFileOrDirectory(Document::Ptr doc, const ImportInfo &im
import Qt 4.6 as Xxx import Qt 4.6 as Xxx
(import com.nokia.qt is the same as the ones above) (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); Q_D(Link);
ObjectValue *import = new ObjectValue(engine()); 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(); const ComponentVersion version = importInfo.version();
bool importFound = false; bool importFound = false;

2
src/libs/qmljs/qmljslink.h
View File

@@ -75,7 +75,7 @@ private:
void populateImportedTypes(Interpreter::TypeEnvironment *typeEnv, Document::Ptr doc); void populateImportedTypes(Interpreter::TypeEnvironment *typeEnv, Document::Ptr doc);
Interpreter::ObjectValue *importFileOrDirectory(Document::Ptr doc, const Interpreter::ImportInfo &importInfo); 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); void importObject(Bind *bind, const QString &name, Interpreter::ObjectValue *object, NameId *targetNamespace);
bool importLibrary(Document::Ptr doc, bool importLibrary(Document::Ptr doc,