Use QTypeRevision for all versions and revisions

In many places we carry major and minor versions or revisions that are
loosely coupled to minor versions. As the Qt minor version resets now,
we need to handle these things more systematically. In particular, we
need to add a "major" part to revisions.

QTypeRevision can express the current major/minor pairs more efficiently
and can also be used to add a major version to revisions. This change
does not change the semantics, yet, but only replaces the types.

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

1 files changed, 18 insertions, 17 deletions

diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index 037cf89beb..e98a87e6a9 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -81,20 +81,20 @@ public:
     static QQmlType registerCompositeSingletonType(const QQmlPrivate::RegisterCompositeSingletonType &type);
     static QQmlType registerCompositeType(const QQmlPrivate::RegisterCompositeType &type);
     static bool registerPluginTypes(QObject *instance, const QString &basePath,
-                                    const QString &uri, const QString &typeNamespace, int vmaj,
-                                    QList<QQmlError> *errors);
+                                    const QString &uri, const QString &typeNamespace,
+                                    QTypeRevision version, QList<QQmlError> *errors);
     static QQmlType typeForUrl(const QString &urlString, const QHashedStringRef& typeName,
                                bool isCompositeSingleton, QList<QQmlError> *errors,
-                               int majorVersion = -1, int minorVersion = -1);
+                               QTypeRevision version = QTypeRevision());
 
     static void unregisterType(int type);
 
     static CompositeMetaTypeIds registerInternalCompositeType(const QByteArray &className);
     static void unregisterInternalCompositeType(const CompositeMetaTypeIds &typeIds);
-    static void registerModule(const char *uri, int versionMajor, int versionMinor);
-    static bool protectModule(const QString &uri, int majVersion);
+    static void registerModule(const char *uri, QTypeRevision version);
+    static bool protectModule(const QString &uri, QTypeRevision version);
 
-    static int typeId(const char *uri, int versionMajor, int versionMinor, const char *qmlName);
+    static int typeId(const char *uri, QTypeRevision version, const char *qmlName);
 
     static void registerUndeletableType(const QQmlType &dtype);
 
@@ -108,15 +108,16 @@ public:
         QmlType
     };
 
-    static QQmlType qmlType(const QString &qualifiedName, int, int);
-    static QQmlType qmlType(const QHashedStringRef &name, const QHashedStringRef &module, int, int);
+    static QQmlType qmlType(const QString &qualifiedName, QTypeRevision version);
+    static QQmlType qmlType(const QHashedStringRef &name, const QHashedStringRef &module, QTypeRevision version);
     static QQmlType qmlType(const QMetaObject *);
-    static QQmlType qmlType(const QMetaObject *metaObject, const QHashedStringRef &module, int version_major, int version_minor);
+    static QQmlType qmlType(const QMetaObject *metaObject, const QHashedStringRef &module, QTypeRevision version);
     static QQmlType qmlType(int typeId, TypeIdCategory category = TypeIdCategory::MetaType);
     static QQmlType qmlType(const QUrl &unNormalizedUrl, bool includeNonFileImports = false);
 
-    static QQmlPropertyCache *propertyCache(const QMetaObject *metaObject, int minorVersion = -1);
-    static QQmlPropertyCache *propertyCache(const QQmlType &type, int minorVersion);
+    static QQmlPropertyCache *propertyCache(const QMetaObject *metaObject,
+                                            QTypeRevision version = QTypeRevision());
+    static QQmlPropertyCache *propertyCache(const QQmlType &type, QTypeRevision version);
 
     static void freeUnusedTypesAndCaches();
 
@@ -150,9 +151,9 @@ public:
     static StringConverter customStringConverter(int);
 
     static bool isAnyModule(const QString &uri);
-    static bool isLockedModule(const QString &uri, int majorVersion);
-    static bool isModule(const QString &module, int versionMajor, int versionMinor);
-    static QQmlTypeModule *typeModule(const QString &uri, int majorVersion);
+    static bool isLockedModule(const QString &uri, QTypeRevision version);
+    static bool isModule(const QString &module, QTypeRevision version);
+    static QQmlTypeModule *typeModule(const QString &uri, QTypeRevision version);
 
     static QList<QQmlPrivate::AutoParentFunction> parentFunctions();
 
@@ -197,11 +198,11 @@ public:
     static void clone(QMetaObjectBuilder &builder, const QMetaObject *mo,
                       const QMetaObject *ignoreStart, const QMetaObject *ignoreEnd);
 
-    static void qmlInsertModuleRegistration(const QString &uri, int majorVersion,
+    static void qmlInsertModuleRegistration(const QString &uri, QTypeRevision version,
                                             void (*registerFunction)());
-    static void qmlRemoveModuleRegistration(const QString &uri, int majorVersion);
+    static void qmlRemoveModuleRegistration(const QString &uri, QTypeRevision version);
 
-    static bool qmlRegisterModuleTypes(const QString &uri, int majorVersion);
+    static bool qmlRegisterModuleTypes(const QString &uri, QTypeRevision version);
 };
 
 Q_DECLARE_TYPEINFO(QQmlMetaType, Q_MOVABLE_TYPE);