From c9860ae2d320ea869dd0e22ac6c67338b93a84cf Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 3 Jun 2021 16:31:52 +0200 Subject: [PATCH] QmlDesigner: Add helper function to Import Change-Id: I51401d17ad61326a610ed92c87c6e41f7a137fdf Reviewed-by: Thomas Hartmann --- .../qmldesigner/designercore/include/import.h | 3 +++ .../qmldesigner/designercore/model/import.cpp | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/include/import.h b/src/plugins/qmldesigner/designercore/include/import.h index 88689722c67..99612fa2ada 100644 --- a/src/plugins/qmldesigner/designercore/include/import.h +++ b/src/plugins/qmldesigner/designercore/include/import.h @@ -60,6 +60,9 @@ public: bool operator==(const Import &other) const; bool isSameModule(const Import &other) const; + int majorVersion() const; + static int majorFromVersion(const QString &version); + private: Import(const QString &url, const QString &file, const QString &version, const QString &alias, const QStringList &importPaths); diff --git a/src/plugins/qmldesigner/designercore/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp index 16b1c68c241..d895b07764c 100644 --- a/src/plugins/qmldesigner/designercore/model/import.cpp +++ b/src/plugins/qmldesigner/designercore/model/import.cpp @@ -97,6 +97,18 @@ bool Import::isSameModule(const Import &other) const return file() == other.file(); } +int Import::majorVersion() const +{ + return majorFromVersion(m_version); +} + +int Import::majorFromVersion(const QString &version) +{ + if (version.isEmpty()) + return -1; + return version.split('.').first().toInt(); +} + uint qHash(const Import &import) { return ::qHash(import.url()) ^ ::qHash(import.file()) ^ ::qHash(import.version()) ^ ::qHash(import.alias());