Improve the QML/JS type reader

Don't alternate between paths and URIs if we only need the URIs, and
don't rely on casting from ASCII to QString or QChar.

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

3 files changed, 5 insertions, 5 deletions

diff --git a/tools/shared/importedmembersvisitor.cpp b/tools/shared/importedmembersvisitor.cpp
index 2162044f99..36282ea55c 100644
--- a/tools/shared/importedmembersvisitor.cpp
+++ b/tools/shared/importedmembersvisitor.cpp
@@ -63,7 +63,7 @@ bool ImportedMembersVisitor::visit(UiObjectDefinition *definition)
     QString superType;
     for (auto segment = definition->qualifiedTypeNameId; segment; segment = segment->next) {
         if (!superType.isEmpty())
-            superType.append('.');
+            superType.append(u'.');
         superType.append(segment->name.toString());
     }
     scope->setSuperclassName(superType);
@@ -125,12 +125,12 @@ bool ImportedMembersVisitor::visit(UiSourceElement *sourceElement)
         method.setMethodType(MetaMethod::Method);
         FormalParameterList *parameters = fexpr->formals;
         while (parameters) {
-            method.addParameter(parameters->element->bindingIdentifier.toString(), "");
+            method.addParameter(parameters->element->bindingIdentifier.toString(), QString());
             parameters = parameters->next;
         }
         currentObject()->addMethod(method);
     } else if (ClassExpression *clexpr = sourceElement->sourceElement->asClassDefinition()) {
-        MetaProperty prop { clexpr->name.toString(), "", false, false, false, false, 1 };
+        MetaProperty prop { clexpr->name.toString(), QString(), false, false, false, false, 1 };
         currentObject()->addProperty(prop);
     } else if (cast<VariableStatement *>(sourceElement->sourceElement)) {
         // nothing to do
diff --git a/tools/shared/qmljstypereader.cpp b/tools/shared/qmljstypereader.cpp
index 3825535d44..527dba4535 100644
--- a/tools/shared/qmljstypereader.cpp
+++ b/tools/shared/qmljstypereader.cpp
@@ -52,7 +52,7 @@ static QList<QmlJSTypeReader::Import> parseHeaders(QQmlJS::AST::UiHeaderItemList
         auto uri = import->importUri;
         while (uri) {
             path.append(uri->name);
-            path.append(QLatin1Char('/'));
+            path.append(u'.');
             uri = uri->next;
         }
         path.chop(1);
diff --git a/tools/shared/qmljstypereader.h b/tools/shared/qmljstypereader.h
index 8485f6be6b..9afa5d46e6 100644
--- a/tools/shared/qmljstypereader.h
+++ b/tools/shared/qmljstypereader.h
@@ -50,7 +50,7 @@ class QmlJSTypeReader
 {
 public:
     struct Import {
-        QString path;
+        QString module;
         QTypeRevision version;
         QString prefix;
     };