1 files changed, 14 insertions, 12 deletions
diff --git a/src/qmltyperegistrar/qqmltyperegistrar_p.h b/src/qmltyperegistrar/qqmltyperegistrar_p.h
index a01b4f1e15..fdfbe15ab7 100644
--- a/src/qmltyperegistrar/qqmltyperegistrar_p.h
+++ b/src/qmltyperegistrar/qqmltyperegistrar_p.h
@@ -15,8 +15,8 @@
 // We mean it.
 //
 
-#include <QJsonObject>
-#include <QTypeRevision>
+#include <QtCore/qcbormap.h>
+#include <QtCore/qversionnumber.h>
 
 #include <cstdlib>
 
@@ -30,24 +30,26 @@ class QmlTypeRegistrar
     QString m_targetNamespace;
     QTypeRevision m_moduleVersion;
     QList<quint8> m_pastMajorVersions;
-    QStringList m_includes;
+    QList<QString> m_includes;
     bool m_followForeignVersioning = false;
-    QVector<QJsonObject> m_types;
-    QVector<QJsonObject> m_foreignTypes;
-    QStringList m_referencedTypes;
+    QVector<MetaType> m_types;
+    QVector<MetaType> m_foreignTypes;
+    QList<QAnyStringView> m_referencedTypes;
+    QList<UsingDeclaration> m_usingDeclarations;
 
-    QJsonValue findType(const QString &name) const;
-    QJsonValue findTypeForeign(const QString &name) const;
+    MetaType findType(QAnyStringView name) const;
+    MetaType findTypeForeign(QAnyStringView name) const;
 
 public:
-    void write(QTextStream &os);
-    void generatePluginTypes(const QString &pluginTypesFile);
+    void write(QTextStream &os, QAnyStringView outFileName) const;
+    bool generatePluginTypes(const QString &pluginTypesFile);
     void setModuleNameAndNamespace(const QString &module, const QString &targetNamespace);
     void setModuleVersions(QTypeRevision moduleVersion, const QList<quint8> &pastMajorVersions,
                            bool followForeignVersioning);
     void setIncludes(const QList<QString> &includes);
-    void setTypes(const QVector<QJsonObject> &types, const QVector<QJsonObject> &foreignTypes);
-    void setReferencedTypes(const QStringList &referencedTypes);
+    void setTypes(const QVector<MetaType> &types, const QVector<MetaType> &foreignTypes);
+    void setReferencedTypes(const QList<QAnyStringView> &referencedTypes);
+    void setUsingDeclarations(const QList<UsingDeclaration> &usingDeclarations);
 
     static bool argumentsFromCommandLineAndFile(QStringList &allArguments,
                                                 const QStringList &arguments);