QmlCompiler: Split importFileOrDirectory() in two

importing a file and importing a directory are really quite different
things and the code paths inside the function were completely separate.

We also don't have to create a map of ImportedTypes if we are only going
to return a single one.

Change-Id: Ifbb0caa70e9272dfde2d9f1cf5ed1b102e02f5cc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 12 insertions, 14 deletions

diff --git a/src/qmlcompiler/qqmljsimporter.cpp b/src/qmlcompiler/qqmljsimporter.cpp
index 5caccd36cb..3a8507aa67 100644
--- a/src/qmlcompiler/qqmljsimporter.cpp
+++ b/src/qmlcompiler/qqmljsimporter.cpp
@@ -264,22 +264,18 @@ QQmlJSScope::Ptr QQmlJSImporter::localFile2ScopeTree(const QString &filePath)
     return result;
 }
 
-QQmlJSImporter::ImportedTypes QQmlJSImporter::importFileOrDirectory(
-        const QString &fileOrDirectory, const QString &prefix)
+QQmlJSScope::Ptr QQmlJSImporter::importFile(const QString &file)
 {
-    AvailableTypes result;
-
-    QString name = fileOrDirectory;
+    return localFile2ScopeTree(file);
+}
 
-    QFileInfo fileInfo(name);
-    if (fileInfo.isFile()) {
-        QQmlJSScope::Ptr scope(localFile2ScopeTree(fileInfo.canonicalFilePath()));
-        result.qmlNames.insert(prefix.isEmpty() ? scope->internalName() : prefix, scope);
-        return result.qmlNames;
-    }
+QQmlJSImporter::ImportedTypes QQmlJSImporter::importDirectory(
+        const QString &directory, const QString &prefix)
+{
+    AvailableTypes result;
 
     QDirIterator it {
-        fileInfo.canonicalFilePath(),
+        directory,
         QStringList() << QLatin1String("*.qml"),
         QDir::NoFilter
     };
diff --git a/src/qmlcompiler/qqmljsimporter_p.h b/src/qmlcompiler/qqmljsimporter_p.h
index 43bc0296b8..245964a339 100644
--- a/src/qmlcompiler/qqmljsimporter_p.h
+++ b/src/qmlcompiler/qqmljsimporter_p.h
@@ -53,8 +53,10 @@ public:
 
     ImportedTypes importBuiltins();
     ImportedTypes importQmltypes(const QStringList &qmltypesFiles);
-    ImportedTypes importFileOrDirectory(
-            const QString &fileOrDirectory, const QString &prefix = QString());
+
+    QQmlJSScope::Ptr importFile(const QString &file);
+    ImportedTypes importDirectory(const QString &directory, const QString &prefix = QString());
+
     ImportedTypes importModule(
             const QString &module, const QString &prefix = QString(),
             QTypeRevision version = QTypeRevision());