From 0d5d6344bd1ada7d1d2d392100e0b6ddb40dfd36 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Thu, 20 May 2010 15:19:42 +0200 Subject: QmlJS: Collect import version numbers in Bind. --- src/plugins/qmljseditor/qmljsmodelmanager.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/plugins/qmljseditor/qmljsmodelmanager.cpp') diff --git a/src/plugins/qmljseditor/qmljsmodelmanager.cpp b/src/plugins/qmljseditor/qmljsmodelmanager.cpp index 405f94d1c3..5151bb534a 100644 --- a/src/plugins/qmljseditor/qmljsmodelmanager.cpp +++ b/src/plugins/qmljseditor/qmljsmodelmanager.cpp @@ -236,15 +236,15 @@ static void findNewFileImports(const Document::Ptr &doc, const Snapshot &snapsho QStringList *importedFiles, QSet *scannedPaths) { // scan files and directories that are explicitly imported - foreach (const QString &fileImport, doc->bind()->fileImports()) { - if (! snapshot.document(fileImport)) - *importedFiles += fileImport; + foreach (const Bind::ImportInfo &fileImport, doc->bind()->fileImports()) { + if (! snapshot.document(fileImport.name)) + *importedFiles += fileImport.name; } - foreach (const QString &directoryImport, doc->bind()->directoryImports()) { - if (snapshot.documentsInDirectory(directoryImport).isEmpty()) { - if (! scannedPaths->contains(directoryImport)) { - *importedFiles += qmlFilesInDirectory(directoryImport); - scannedPaths->insert(directoryImport); + foreach (const Bind::ImportInfo &directoryImport, doc->bind()->directoryImports()) { + if (snapshot.documentsInDirectory(directoryImport.name).isEmpty()) { + if (! scannedPaths->contains(directoryImport.name)) { + *importedFiles += qmlFilesInDirectory(directoryImport.name); + scannedPaths->insert(directoryImport.name); } } } @@ -256,10 +256,10 @@ static void findNewLibraryImports(const Document::Ptr &doc, const Snapshot &snap { // scan library imports const QStringList importPaths = modelManager->importPaths(); - foreach (const QString &libraryImport, doc->bind()->libraryImports()) { + foreach (const Bind::ImportInfo &libraryImport, doc->bind()->libraryImports()) { foreach (const QString &importPath, importPaths) { QDir dir(importPath); - dir.cd(libraryImport); + dir.cd(libraryImport.name); const QString targetPath = dir.absolutePath(); // if we know there is a library, done -- cgit v1.2.1