generators: Inline methods in gen::VersionInfo

To be able to use in constexpr context

Change-Id: If17e7346828a9c9561b0c0a1240b8d5515bae16e
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 15 insertions, 38 deletions

diff --git a/src/lib/corelib/generators/generatorversioninfo.cpp b/src/lib/corelib/generators/generatorversioninfo.cpp
index 26983bf06..c5c8db03f 100644
--- a/src/lib/corelib/generators/generatorversioninfo.cpp
+++ b/src/lib/corelib/generators/generatorversioninfo.cpp
@@ -42,42 +42,10 @@
 namespace qbs {
 namespace gen {
 
-VersionInfo::VersionInfo(const Version &version,
-                         utils::ArchitectureFlags archs)
-    : m_version(version), m_archs(archs)
-{
-}
-
-bool VersionInfo::operator<(const VersionInfo &other) const
-{
-    return m_version < other.m_version;
-}
-
-bool VersionInfo::operator==(const VersionInfo &other) const
-{
-    return m_version == other.m_version
-            && m_archs == other.m_archs;
-}
-
-Version VersionInfo::version() const
-{
-    return m_version;
-}
-
-bool VersionInfo::containsArchitecture(utils::Architecture arch) const
-{
-    return m_archs & arch;
-}
-
 int VersionInfo::marketingVersion() const
 {
     return m_version.majorVersion();
 }
 
-quint32 qHash(const VersionInfo &info)
-{
-    return qHash(info.version().toString());
-}
-
 } // namespace gen
 } // namespace qbs
diff --git a/src/lib/corelib/generators/generatorversioninfo.h b/src/lib/corelib/generators/generatorversioninfo.h
index 93af4cab0..bbae4c53f 100644
--- a/src/lib/corelib/generators/generatorversioninfo.h
+++ b/src/lib/corelib/generators/generatorversioninfo.h
@@ -53,13 +53,19 @@ namespace gen {
 class QBS_EXPORT VersionInfo
 {
 public:
-    VersionInfo(const Version &version, utils::ArchitectureFlags archs);
+    VersionInfo(const Version &version, utils::ArchitectureFlags archs)
+        : m_version(version), m_archs(archs)
+    {
+    }
 
-    bool operator<(const VersionInfo &other) const;
-    bool operator==(const VersionInfo &other) const;
+    bool operator<(const VersionInfo &other) const { return m_version < other.m_version; }
+    bool operator==(const VersionInfo &other) const
+    {
+        return m_version == other.m_version && m_archs == other.m_archs;
+    }
 
-    Version version() const;
-    bool containsArchitecture(utils::Architecture arch) const;
+    Version version() const { return m_version; }
+    bool containsArchitecture(utils::Architecture arch) const { return m_archs & arch; }
 
     int marketingVersion() const;
 
@@ -68,7 +74,10 @@ private:
     utils::ArchitectureFlags m_archs;
 };
 
-quint32 qHash(const VersionInfo &info);
+inline quint32 qHash(const VersionInfo &info)
+{
+    return qHash(info.version().toString());
+}
 
 } // namespace gen
 } // namespace qbs