diff --git a/src/libs/ifc/xml/vabstractconverter.h b/src/libs/ifc/xml/vabstractconverter.h index 4d103b65b..eefac4be4 100644 --- a/src/libs/ifc/xml/vabstractconverter.h +++ b/src/libs/ifc/xml/vabstractconverter.h @@ -37,7 +37,10 @@ #include "vdomdocument.h" -#define FORMAT_VERSION(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) +constexpr inline auto FormatVersion(unsigned major, unsigned minor, unsigned patch) -> unsigned +{ + return ((major<<16u)|(minor<<8u)|patch); +} class VAbstractConverter :public VDomDocument { diff --git a/src/libs/ifc/xml/vlabeltemplateconverter.cpp b/src/libs/ifc/xml/vlabeltemplateconverter.cpp index b1f978344..aa74ec4f4 100644 --- a/src/libs/ifc/xml/vlabeltemplateconverter.cpp +++ b/src/libs/ifc/xml/vlabeltemplateconverter.cpp @@ -80,7 +80,7 @@ QString VLabelTemplateConverter::XSDSchema(int ver) const { switch (ver) { - case (0x010000): + case (FormatVersion(1, 0, 0)): return CurrentSchema; default: InvalidVersion(ver); @@ -94,7 +94,7 @@ void VLabelTemplateConverter::ApplyPatches() { switch (m_ver) { - case (0x010000): + case (FormatVersion(1, 0, 0)): break; default: InvalidVersion(m_ver); diff --git a/src/libs/ifc/xml/vlabeltemplateconverter.h b/src/libs/ifc/xml/vlabeltemplateconverter.h index 72524f08c..d3f7ca5e8 100644 --- a/src/libs/ifc/xml/vlabeltemplateconverter.h +++ b/src/libs/ifc/xml/vlabeltemplateconverter.h @@ -39,8 +39,8 @@ public: static const QString LabelTemplateMaxVerStr; static const QString CurrentSchema; - static Q_DECL_CONSTEXPR const int LabelTemplateMinVer = FORMAT_VERSION(1, 0, 0); - static Q_DECL_CONSTEXPR const int LabelTemplateMaxVer = FORMAT_VERSION(1, 0, 0); + static Q_DECL_CONSTEXPR const int LabelTemplateMinVer = FormatVersion(1, 0, 0); + static Q_DECL_CONSTEXPR const int LabelTemplateMaxVer = FormatVersion(1, 0, 0); protected: virtual int MinVer() const override; diff --git a/src/libs/ifc/xml/vlayoutconverter.cpp b/src/libs/ifc/xml/vlayoutconverter.cpp index beaed9420..ed60eae5d 100644 --- a/src/libs/ifc/xml/vlayoutconverter.cpp +++ b/src/libs/ifc/xml/vlayoutconverter.cpp @@ -77,7 +77,7 @@ QString VLayoutConverter::XSDSchema(int ver) const { QHash schemas = { - std::make_pair(FORMAT_VERSION(0, 1, 0), CurrentSchema) + std::make_pair(FormatVersion(0, 1, 0), CurrentSchema) }; if (schemas.contains(ver)) @@ -93,7 +93,7 @@ void VLayoutConverter::ApplyPatches() { switch (m_ver) { - case (FORMAT_VERSION(0, 1, 0)): + case (FormatVersion(0, 1, 0)): break; default: InvalidVersion(m_ver); diff --git a/src/libs/ifc/xml/vlayoutconverter.h b/src/libs/ifc/xml/vlayoutconverter.h index 25874e9e5..eee9aadd1 100644 --- a/src/libs/ifc/xml/vlayoutconverter.h +++ b/src/libs/ifc/xml/vlayoutconverter.h @@ -44,8 +44,8 @@ public: static const QString LayoutMaxVerStr; static const QString CurrentSchema; - static Q_DECL_CONSTEXPR const int LayoutMinVer = FORMAT_VERSION(0, 1, 0); - static Q_DECL_CONSTEXPR const int LayoutMaxVer = FORMAT_VERSION(0, 1, 0); + static Q_DECL_CONSTEXPR const int LayoutMinVer = FormatVersion(0, 1, 0); + static Q_DECL_CONSTEXPR const int LayoutMaxVer = FormatVersion(0, 1, 0); protected: virtual int MinVer() const override; diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index cd70a1af7..6c14beeb8 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -182,70 +182,70 @@ QString VPatternConverter::XSDSchema(int ver) const { QHash schemas = { - std::make_pair(FORMAT_VERSION(0, 1, 4), QStringLiteral("://schema/pattern/v0.1.4.xsd")), - std::make_pair(FORMAT_VERSION(0, 2, 0), QStringLiteral("://schema/pattern/v0.2.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 2, 1), QStringLiteral("://schema/pattern/v0.2.1.xsd")), - std::make_pair(FORMAT_VERSION(0, 2, 2), QStringLiteral("://schema/pattern/v0.2.2.xsd")), - std::make_pair(FORMAT_VERSION(0, 2, 3), QStringLiteral("://schema/pattern/v0.2.3.xsd")), - std::make_pair(FORMAT_VERSION(0, 2, 4), QStringLiteral("://schema/pattern/v0.2.4.xsd")), - std::make_pair(FORMAT_VERSION(0, 2, 5), QStringLiteral("://schema/pattern/v0.2.5.xsd")), - std::make_pair(FORMAT_VERSION(0, 2, 6), QStringLiteral("://schema/pattern/v0.2.6.xsd")), - std::make_pair(FORMAT_VERSION(0, 2, 7), QStringLiteral("://schema/pattern/v0.2.7.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 0), QStringLiteral("://schema/pattern/v0.3.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 1), QStringLiteral("://schema/pattern/v0.3.1.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 2), QStringLiteral("://schema/pattern/v0.3.2.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 3), QStringLiteral("://schema/pattern/v0.3.3.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 4), QStringLiteral("://schema/pattern/v0.3.4.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 5), QStringLiteral("://schema/pattern/v0.3.5.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 6), QStringLiteral("://schema/pattern/v0.3.6.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 7), QStringLiteral("://schema/pattern/v0.3.7.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 8), QStringLiteral("://schema/pattern/v0.3.8.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 9), QStringLiteral("://schema/pattern/v0.3.9.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 0), QStringLiteral("://schema/pattern/v0.4.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 1), QStringLiteral("://schema/pattern/v0.4.1.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 2), QStringLiteral("://schema/pattern/v0.4.2.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 3), QStringLiteral("://schema/pattern/v0.4.3.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 4), QStringLiteral("://schema/pattern/v0.4.4.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 5), QStringLiteral("://schema/pattern/v0.4.5.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 6), QStringLiteral("://schema/pattern/v0.4.6.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 7), QStringLiteral("://schema/pattern/v0.4.7.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 8), QStringLiteral("://schema/pattern/v0.4.8.xsd")), - std::make_pair(FORMAT_VERSION(0, 5, 0), QStringLiteral("://schema/pattern/v0.5.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 5, 1), QStringLiteral("://schema/pattern/v0.5.1.xsd")), - std::make_pair(FORMAT_VERSION(0, 6, 0), QStringLiteral("://schema/pattern/v0.6.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 6, 1), QStringLiteral("://schema/pattern/v0.6.1.xsd")), - std::make_pair(FORMAT_VERSION(0, 6, 2), QStringLiteral("://schema/pattern/v0.6.2.xsd")), - std::make_pair(FORMAT_VERSION(0, 6, 3), QStringLiteral("://schema/pattern/v0.6.3.xsd")), - std::make_pair(FORMAT_VERSION(0, 6, 4), QStringLiteral("://schema/pattern/v0.6.4.xsd")), - std::make_pair(FORMAT_VERSION(0, 6, 5), QStringLiteral("://schema/pattern/v0.6.5.xsd")), - std::make_pair(FORMAT_VERSION(0, 6, 6), QStringLiteral("://schema/pattern/v0.6.6.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 0), QStringLiteral("://schema/pattern/v0.7.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 1), QStringLiteral("://schema/pattern/v0.7.1.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 2), QStringLiteral("://schema/pattern/v0.7.2.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 3), QStringLiteral("://schema/pattern/v0.7.3.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 4), QStringLiteral("://schema/pattern/v0.7.4.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 5), QStringLiteral("://schema/pattern/v0.7.5.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 6), QStringLiteral("://schema/pattern/v0.7.6.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 7), QStringLiteral("://schema/pattern/v0.7.7.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 8), QStringLiteral("://schema/pattern/v0.7.8.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 9), QStringLiteral("://schema/pattern/v0.7.9.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 10), QStringLiteral("://schema/pattern/v0.7.10.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 11), QStringLiteral("://schema/pattern/v0.7.11.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 12), QStringLiteral("://schema/pattern/v0.7.12.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 13), QStringLiteral("://schema/pattern/v0.7.13.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 0), QStringLiteral("://schema/pattern/v0.8.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 1), QStringLiteral("://schema/pattern/v0.8.1.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 2), QStringLiteral("://schema/pattern/v0.8.2.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 3), QStringLiteral("://schema/pattern/v0.8.3.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 4), QStringLiteral("://schema/pattern/v0.8.4.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 5), QStringLiteral("://schema/pattern/v0.8.5.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 6), QStringLiteral("://schema/pattern/v0.8.6.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 7), QStringLiteral("://schema/pattern/v0.8.7.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 8), QStringLiteral("://schema/pattern/v0.8.8.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 9), QStringLiteral("://schema/pattern/v0.8.9.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 10), QStringLiteral("://schema/pattern/v0.8.10.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 11), QStringLiteral("://schema/pattern/v0.8.11.xsd")), - std::make_pair(FORMAT_VERSION(0, 8, 12), CurrentSchema) + std::make_pair(FormatVersion(0, 1, 4), QStringLiteral("://schema/pattern/v0.1.4.xsd")), + std::make_pair(FormatVersion(0, 2, 0), QStringLiteral("://schema/pattern/v0.2.0.xsd")), + std::make_pair(FormatVersion(0, 2, 1), QStringLiteral("://schema/pattern/v0.2.1.xsd")), + std::make_pair(FormatVersion(0, 2, 2), QStringLiteral("://schema/pattern/v0.2.2.xsd")), + std::make_pair(FormatVersion(0, 2, 3), QStringLiteral("://schema/pattern/v0.2.3.xsd")), + std::make_pair(FormatVersion(0, 2, 4), QStringLiteral("://schema/pattern/v0.2.4.xsd")), + std::make_pair(FormatVersion(0, 2, 5), QStringLiteral("://schema/pattern/v0.2.5.xsd")), + std::make_pair(FormatVersion(0, 2, 6), QStringLiteral("://schema/pattern/v0.2.6.xsd")), + std::make_pair(FormatVersion(0, 2, 7), QStringLiteral("://schema/pattern/v0.2.7.xsd")), + std::make_pair(FormatVersion(0, 3, 0), QStringLiteral("://schema/pattern/v0.3.0.xsd")), + std::make_pair(FormatVersion(0, 3, 1), QStringLiteral("://schema/pattern/v0.3.1.xsd")), + std::make_pair(FormatVersion(0, 3, 2), QStringLiteral("://schema/pattern/v0.3.2.xsd")), + std::make_pair(FormatVersion(0, 3, 3), QStringLiteral("://schema/pattern/v0.3.3.xsd")), + std::make_pair(FormatVersion(0, 3, 4), QStringLiteral("://schema/pattern/v0.3.4.xsd")), + std::make_pair(FormatVersion(0, 3, 5), QStringLiteral("://schema/pattern/v0.3.5.xsd")), + std::make_pair(FormatVersion(0, 3, 6), QStringLiteral("://schema/pattern/v0.3.6.xsd")), + std::make_pair(FormatVersion(0, 3, 7), QStringLiteral("://schema/pattern/v0.3.7.xsd")), + std::make_pair(FormatVersion(0, 3, 8), QStringLiteral("://schema/pattern/v0.3.8.xsd")), + std::make_pair(FormatVersion(0, 3, 9), QStringLiteral("://schema/pattern/v0.3.9.xsd")), + std::make_pair(FormatVersion(0, 4, 0), QStringLiteral("://schema/pattern/v0.4.0.xsd")), + std::make_pair(FormatVersion(0, 4, 1), QStringLiteral("://schema/pattern/v0.4.1.xsd")), + std::make_pair(FormatVersion(0, 4, 2), QStringLiteral("://schema/pattern/v0.4.2.xsd")), + std::make_pair(FormatVersion(0, 4, 3), QStringLiteral("://schema/pattern/v0.4.3.xsd")), + std::make_pair(FormatVersion(0, 4, 4), QStringLiteral("://schema/pattern/v0.4.4.xsd")), + std::make_pair(FormatVersion(0, 4, 5), QStringLiteral("://schema/pattern/v0.4.5.xsd")), + std::make_pair(FormatVersion(0, 4, 6), QStringLiteral("://schema/pattern/v0.4.6.xsd")), + std::make_pair(FormatVersion(0, 4, 7), QStringLiteral("://schema/pattern/v0.4.7.xsd")), + std::make_pair(FormatVersion(0, 4, 8), QStringLiteral("://schema/pattern/v0.4.8.xsd")), + std::make_pair(FormatVersion(0, 5, 0), QStringLiteral("://schema/pattern/v0.5.0.xsd")), + std::make_pair(FormatVersion(0, 5, 1), QStringLiteral("://schema/pattern/v0.5.1.xsd")), + std::make_pair(FormatVersion(0, 6, 0), QStringLiteral("://schema/pattern/v0.6.0.xsd")), + std::make_pair(FormatVersion(0, 6, 1), QStringLiteral("://schema/pattern/v0.6.1.xsd")), + std::make_pair(FormatVersion(0, 6, 2), QStringLiteral("://schema/pattern/v0.6.2.xsd")), + std::make_pair(FormatVersion(0, 6, 3), QStringLiteral("://schema/pattern/v0.6.3.xsd")), + std::make_pair(FormatVersion(0, 6, 4), QStringLiteral("://schema/pattern/v0.6.4.xsd")), + std::make_pair(FormatVersion(0, 6, 5), QStringLiteral("://schema/pattern/v0.6.5.xsd")), + std::make_pair(FormatVersion(0, 6, 6), QStringLiteral("://schema/pattern/v0.6.6.xsd")), + std::make_pair(FormatVersion(0, 7, 0), QStringLiteral("://schema/pattern/v0.7.0.xsd")), + std::make_pair(FormatVersion(0, 7, 1), QStringLiteral("://schema/pattern/v0.7.1.xsd")), + std::make_pair(FormatVersion(0, 7, 2), QStringLiteral("://schema/pattern/v0.7.2.xsd")), + std::make_pair(FormatVersion(0, 7, 3), QStringLiteral("://schema/pattern/v0.7.3.xsd")), + std::make_pair(FormatVersion(0, 7, 4), QStringLiteral("://schema/pattern/v0.7.4.xsd")), + std::make_pair(FormatVersion(0, 7, 5), QStringLiteral("://schema/pattern/v0.7.5.xsd")), + std::make_pair(FormatVersion(0, 7, 6), QStringLiteral("://schema/pattern/v0.7.6.xsd")), + std::make_pair(FormatVersion(0, 7, 7), QStringLiteral("://schema/pattern/v0.7.7.xsd")), + std::make_pair(FormatVersion(0, 7, 8), QStringLiteral("://schema/pattern/v0.7.8.xsd")), + std::make_pair(FormatVersion(0, 7, 9), QStringLiteral("://schema/pattern/v0.7.9.xsd")), + std::make_pair(FormatVersion(0, 7, 10), QStringLiteral("://schema/pattern/v0.7.10.xsd")), + std::make_pair(FormatVersion(0, 7, 11), QStringLiteral("://schema/pattern/v0.7.11.xsd")), + std::make_pair(FormatVersion(0, 7, 12), QStringLiteral("://schema/pattern/v0.7.12.xsd")), + std::make_pair(FormatVersion(0, 7, 13), QStringLiteral("://schema/pattern/v0.7.13.xsd")), + std::make_pair(FormatVersion(0, 8, 0), QStringLiteral("://schema/pattern/v0.8.0.xsd")), + std::make_pair(FormatVersion(0, 8, 1), QStringLiteral("://schema/pattern/v0.8.1.xsd")), + std::make_pair(FormatVersion(0, 8, 2), QStringLiteral("://schema/pattern/v0.8.2.xsd")), + std::make_pair(FormatVersion(0, 8, 3), QStringLiteral("://schema/pattern/v0.8.3.xsd")), + std::make_pair(FormatVersion(0, 8, 4), QStringLiteral("://schema/pattern/v0.8.4.xsd")), + std::make_pair(FormatVersion(0, 8, 5), QStringLiteral("://schema/pattern/v0.8.5.xsd")), + std::make_pair(FormatVersion(0, 8, 6), QStringLiteral("://schema/pattern/v0.8.6.xsd")), + std::make_pair(FormatVersion(0, 8, 7), QStringLiteral("://schema/pattern/v0.8.7.xsd")), + std::make_pair(FormatVersion(0, 8, 8), QStringLiteral("://schema/pattern/v0.8.8.xsd")), + std::make_pair(FormatVersion(0, 8, 9), QStringLiteral("://schema/pattern/v0.8.9.xsd")), + std::make_pair(FormatVersion(0, 8, 10), QStringLiteral("://schema/pattern/v0.8.10.xsd")), + std::make_pair(FormatVersion(0, 8, 11), QStringLiteral("://schema/pattern/v0.8.11.xsd")), + std::make_pair(FormatVersion(0, 8, 12), CurrentSchema) }; if (schemas.contains(ver)) @@ -261,259 +261,259 @@ void VPatternConverter::ApplyPatches() { switch (m_ver) { - case (FORMAT_VERSION(0, 1, 4)): + case (FormatVersion(0, 1, 4)): ToV0_2_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 2, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 2, 0)): + case (FormatVersion(0, 2, 0)): ToV0_2_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 2, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 2, 1)): + case (FormatVersion(0, 2, 1)): ToV0_2_2(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 2))); + ValidateXML(XSDSchema(FormatVersion(0, 2, 2))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 2, 2)): + case (FormatVersion(0, 2, 2)): ToV0_2_3(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 3))); + ValidateXML(XSDSchema(FormatVersion(0, 2, 3))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 2, 3)): + case (FormatVersion(0, 2, 3)): ToV0_2_4(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 4))); + ValidateXML(XSDSchema(FormatVersion(0, 2, 4))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 2, 4)): + case (FormatVersion(0, 2, 4)): ToV0_2_5(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 5))); + ValidateXML(XSDSchema(FormatVersion(0, 2, 5))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 2, 5)): + case (FormatVersion(0, 2, 5)): ToV0_2_6(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 6))); + ValidateXML(XSDSchema(FormatVersion(0, 2, 6))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 2, 6)): + case (FormatVersion(0, 2, 6)): ToV0_2_7(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 7))); + ValidateXML(XSDSchema(FormatVersion(0, 2, 7))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 2, 7)): + case (FormatVersion(0, 2, 7)): ToV0_3_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 0)): + case (FormatVersion(0, 3, 0)): ToV0_3_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 1)): + case (FormatVersion(0, 3, 1)): ToV0_3_2(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 2))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 2))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 2)): + case (FormatVersion(0, 3, 2)): ToV0_3_3(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 3))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 3))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 3)): + case (FormatVersion(0, 3, 3)): ToV0_3_4(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 4))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 4))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 4)): + case (FormatVersion(0, 3, 4)): ToV0_3_5(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 5))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 5))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 5)): + case (FormatVersion(0, 3, 5)): ToV0_3_6(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 6))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 6))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 6)): + case (FormatVersion(0, 3, 6)): ToV0_3_7(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 7))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 7))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 7)): + case (FormatVersion(0, 3, 7)): ToV0_3_8(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 8))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 8))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 8)): + case (FormatVersion(0, 3, 8)): ToV0_3_9(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 9))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 9))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 9)): + case (FormatVersion(0, 3, 9)): ToV0_4_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 0)): + case (FormatVersion(0, 4, 0)): ToV0_4_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 1)): + case (FormatVersion(0, 4, 1)): ToV0_4_2(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 2))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 2))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 2)): + case (FormatVersion(0, 4, 2)): ToV0_4_3(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 3))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 3))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 3)): + case (FormatVersion(0, 4, 3)): ToV0_4_4(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 4))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 4))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 4)): + case (FormatVersion(0, 4, 4)): ToV0_4_5(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 5))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 5))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 5)): + case (FormatVersion(0, 4, 5)): ToV0_4_6(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 6))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 6))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 6)): + case (FormatVersion(0, 4, 6)): ToV0_4_7(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 7))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 7))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 7)): + case (FormatVersion(0, 4, 7)): ToV0_4_8(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 8))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 8))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 8)): + case (FormatVersion(0, 4, 8)): ToV0_5_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 5, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 5, 0)): + case (FormatVersion(0, 5, 0)): ToV0_5_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 5, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 5, 1)): + case (FormatVersion(0, 5, 1)): ToV0_6_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 6, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 6, 0)): + case (FormatVersion(0, 6, 0)): ToV0_6_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 6, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 6, 1)): + case (FormatVersion(0, 6, 1)): ToV0_6_2(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 2))); + ValidateXML(XSDSchema(FormatVersion(0, 6, 2))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 6, 2)): + case (FormatVersion(0, 6, 2)): ToV0_6_3(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 3))); + ValidateXML(XSDSchema(FormatVersion(0, 6, 3))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 6, 3)): + case (FormatVersion(0, 6, 3)): ToV0_6_4(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 4))); + ValidateXML(XSDSchema(FormatVersion(0, 6, 4))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 6, 4)): + case (FormatVersion(0, 6, 4)): ToV0_6_5(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 5))); + ValidateXML(XSDSchema(FormatVersion(0, 6, 5))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 6, 5)): + case (FormatVersion(0, 6, 5)): ToV0_6_6(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 6, 6))); + ValidateXML(XSDSchema(FormatVersion(0, 6, 6))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 6, 6)): + case (FormatVersion(0, 6, 6)): ToV0_7_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 0)): + case (FormatVersion(0, 7, 0)): ToV0_7_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 1)): + case (FormatVersion(0, 7, 1)): ToV0_7_2(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 2))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 2))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 2)): + case (FormatVersion(0, 7, 2)): ToV0_7_3(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 3))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 3))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 3)): + case (FormatVersion(0, 7, 3)): ToV0_7_4(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 4))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 4))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 4)): + case (FormatVersion(0, 7, 4)): ToV0_7_5(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 5))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 5))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 5)): + case (FormatVersion(0, 7, 5)): ToV0_7_6(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 6))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 6))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 6)): + case (FormatVersion(0, 7, 6)): ToV0_7_7(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 7))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 7))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 7)): + case (FormatVersion(0, 7, 7)): ToV0_7_8(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 8))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 8))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 8)): + case (FormatVersion(0, 7, 8)): ToV0_7_9(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 9))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 9))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 9)): + case (FormatVersion(0, 7, 9)): ToV0_7_10(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 10))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 10))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 10)): + case (FormatVersion(0, 7, 10)): ToV0_7_11(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 11))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 11))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 11)): + case (FormatVersion(0, 7, 11)): ToV0_7_12(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 12))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 12))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 12)): + case (FormatVersion(0, 7, 12)): ToV0_7_13(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 13))); + ValidateXML(XSDSchema(FormatVersion(0, 7, 13))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 7, 13)): + case (FormatVersion(0, 7, 13)): ToV0_8_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 0)): + case (FormatVersion(0, 8, 0)): ToV0_8_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 1)): + case (FormatVersion(0, 8, 1)): ToV0_8_2(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 2))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 2))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 2)): + case (FormatVersion(0, 8, 2)): ToV0_8_3(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 3))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 3))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 3)): + case (FormatVersion(0, 8, 3)): ToV0_8_4(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 4))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 4))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 4)): + case (FormatVersion(0, 8, 4)): ToV0_8_5(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 5))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 5))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 5)): + case (FormatVersion(0, 8, 5)): ToV0_8_6(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 6))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 6))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 6)): + case (FormatVersion(0, 8, 6)): ToV0_8_7(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 7))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 7))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 7)): + case (FormatVersion(0, 8, 7)): ToV0_8_8(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 8))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 8))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 8)): + case (FormatVersion(0, 8, 8)): ToV0_8_9(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 9))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 9))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 9)): + case (FormatVersion(0, 8, 9)): ToV0_8_10(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 10))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 10))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 10)): + case (FormatVersion(0, 8, 10)): ToV0_8_11(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 11))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 11))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 11)): + case (FormatVersion(0, 8, 11)): ToV0_8_12(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 8, 12))); + ValidateXML(XSDSchema(FormatVersion(0, 8, 12))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 8, 12)): + case (FormatVersion(0, 8, 12)): break; default: InvalidVersion(m_ver); @@ -531,7 +531,7 @@ void VPatternConverter::DowngradeToCurrentMaxVersion() bool VPatternConverter::IsReadOnly() const { // Check if attribute readOnly was not changed in file format - Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == FORMAT_VERSION(0, 8, 12), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == FormatVersion(0, 8, 12), "Check attribute readOnly."); // Possibly in future attribute readOnly will change position etc. @@ -552,7 +552,7 @@ bool VPatternConverter::IsReadOnly() const void VPatternConverter::ToV0_2_0() { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); SetVersion(QStringLiteral("0.2.0")); @@ -567,7 +567,7 @@ void VPatternConverter::ToV0_2_0() void VPatternConverter::ToV0_2_1() { // TODO. Delete if minimal supported version is 0.2.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 1), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.2.1")); @@ -579,7 +579,7 @@ void VPatternConverter::ToV0_2_1() void VPatternConverter::ToV0_2_2() { // TODO. Delete if minimal supported version is 0.2.2 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 2), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 2), "Time to refactor the code."); SetVersion(QStringLiteral("0.2.2")); @@ -590,7 +590,7 @@ void VPatternConverter::ToV0_2_2() void VPatternConverter::ToV0_2_3() { // TODO. Delete if minimal supported version is 0.2.3 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 3), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 3), "Time to refactor the code."); SetVersion(QStringLiteral("0.2.3")); @@ -601,7 +601,7 @@ void VPatternConverter::ToV0_2_3() void VPatternConverter::ToV0_2_4() { // TODO. Delete if minimal supported version is 0.2.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 4), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 4), "Time to refactor the code."); FixToolUnionToV0_2_4(); @@ -613,7 +613,7 @@ void VPatternConverter::ToV0_2_4() void VPatternConverter::ToV0_2_5() { // TODO. Delete if minimal supported version is 0.2.5 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 5), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 5), "Time to refactor the code."); SetVersion(QStringLiteral("0.2.5")); @@ -624,7 +624,7 @@ void VPatternConverter::ToV0_2_5() void VPatternConverter::ToV0_2_6() { // TODO. Delete if minimal supported version is 0.2.6 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 6), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 6), "Time to refactor the code."); SetVersion(QStringLiteral("0.2.6")); @@ -635,7 +635,7 @@ void VPatternConverter::ToV0_2_6() void VPatternConverter::ToV0_2_7() { // TODO. Delete if minimal supported version is 0.2.7 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 7), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 7), "Time to refactor the code."); SetVersion(QStringLiteral("0.2.7")); @@ -646,7 +646,7 @@ void VPatternConverter::ToV0_2_7() void VPatternConverter::ToV0_3_0() { // TODO. Delete if minimal supported version is 0.3.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 0), "Time to refactor the code."); //Cutting path do not create anymore subpaths @@ -660,7 +660,7 @@ void VPatternConverter::ToV0_3_0() void VPatternConverter::ToV0_3_1() { // TODO. Delete if minimal supported version is 0.3.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 1), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.1")); @@ -672,7 +672,7 @@ void VPatternConverter::ToV0_3_1() void VPatternConverter::ToV0_3_2() { // TODO. Delete if minimal supported version is 0.3.2 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 2), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 2), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.2")); @@ -683,7 +683,7 @@ void VPatternConverter::ToV0_3_2() void VPatternConverter::ToV0_3_3() { // TODO. Delete if minimal supported version is 0.3.3 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 3), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 3), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.3")); @@ -694,7 +694,7 @@ void VPatternConverter::ToV0_3_3() void VPatternConverter::ToV0_3_4() { // TODO. Delete if minimal supported version is 0.3.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 4), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 4), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.4")); @@ -705,7 +705,7 @@ void VPatternConverter::ToV0_3_4() void VPatternConverter::ToV0_3_5() { // TODO. Delete if minimal supported version is 0.3.5 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 5), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 5), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.5")); @@ -716,7 +716,7 @@ void VPatternConverter::ToV0_3_5() void VPatternConverter::ToV0_3_6() { // TODO. Delete if minimal supported version is 0.3.6 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 6), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 6), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.6")); @@ -727,7 +727,7 @@ void VPatternConverter::ToV0_3_6() void VPatternConverter::ToV0_3_7() { // TODO. Delete if minimal supported version is 0.3.7 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 7), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 7), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.7")); @@ -738,7 +738,7 @@ void VPatternConverter::ToV0_3_7() void VPatternConverter::ToV0_3_8() { // TODO. Delete if minimal supported version is 0.3.8 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 8), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 8), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.8")); @@ -749,7 +749,7 @@ void VPatternConverter::ToV0_3_8() void VPatternConverter::ToV0_3_9() { // TODO. Delete if minimal supported version is 0.3.9 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 9), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 9), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.9")); @@ -760,7 +760,7 @@ void VPatternConverter::ToV0_3_9() void VPatternConverter::ToV0_4_0() { // TODO. Delete if minimal supported version is 0.4.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 0), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.0")); @@ -774,7 +774,7 @@ void VPatternConverter::ToV0_4_0() void VPatternConverter::ToV0_4_1() { // TODO. Delete if minimal supported version is 0.4.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 1), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.1")); @@ -785,7 +785,7 @@ void VPatternConverter::ToV0_4_1() void VPatternConverter::ToV0_4_2() { // TODO. Delete if minimal supported version is 0.4.2 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 2), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 2), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.2")); @@ -796,7 +796,7 @@ void VPatternConverter::ToV0_4_2() void VPatternConverter::ToV0_4_3() { // TODO. Delete if minimal supported version is 0.4.3 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 3), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 3), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.3")); @@ -807,7 +807,7 @@ void VPatternConverter::ToV0_4_3() void VPatternConverter::ToV0_4_4() { // TODO. Delete if minimal supported version is 0.4.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 4), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 4), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.4")); @@ -820,7 +820,7 @@ void VPatternConverter::ToV0_4_4() void VPatternConverter::ToV0_4_5() { // TODO. Delete if minimal supported version is 0.4.5 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 5), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 5), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.5")); Save(); @@ -830,7 +830,7 @@ void VPatternConverter::ToV0_4_5() void VPatternConverter::ToV0_4_6() { // TODO. Delete if minimal supported version is 0.4.6 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 6), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 6), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.6")); Save(); @@ -840,7 +840,7 @@ void VPatternConverter::ToV0_4_6() void VPatternConverter::ToV0_4_7() { // TODO. Delete if minimal supported version is 0.4.7 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 7), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 7), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.7")); Save(); @@ -850,7 +850,7 @@ void VPatternConverter::ToV0_4_7() void VPatternConverter::ToV0_4_8() { // TODO. Delete if minimal supported version is 0.4.8 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 8), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 8), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.8")); Save(); @@ -860,7 +860,7 @@ void VPatternConverter::ToV0_4_8() void VPatternConverter::ToV0_5_0() { // TODO. Delete if minimal supported version is 0.5.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 5, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 5, 0), "Time to refactor the code."); SetVersion(QStringLiteral("0.5.0")); Save(); @@ -870,7 +870,7 @@ void VPatternConverter::ToV0_5_0() void VPatternConverter::ToV0_5_1() { // TODO. Delete if minimal supported version is 0.5.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 5, 1), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 5, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.5.1")); Save(); @@ -880,7 +880,7 @@ void VPatternConverter::ToV0_5_1() void VPatternConverter::ToV0_6_0() { // TODO. Delete if minimal supported version is 0.6.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0), "Time to refactor the code."); SetVersion(QStringLiteral("0.6.0")); QDomElement label = AddTagPatternLabelV0_5_1(); @@ -894,7 +894,7 @@ void VPatternConverter::ToV0_6_0() void VPatternConverter::ToV0_6_1() { // TODO. Delete if minimal supported version is 0.6.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 1), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.6.1")); Save(); @@ -904,7 +904,7 @@ void VPatternConverter::ToV0_6_1() void VPatternConverter::ToV0_6_2() { // TODO. Delete if minimal supported version is 0.6.2 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 2), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 2), "Time to refactor the code."); SetVersion(QStringLiteral("0.6.2")); AddTagPreviewCalculationsV0_6_2(); @@ -915,7 +915,7 @@ void VPatternConverter::ToV0_6_2() void VPatternConverter::ToV0_6_3() { // TODO. Delete if minimal supported version is 0.6.3 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 3), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 3), "Time to refactor the code."); SetVersion(QStringLiteral("0.6.3")); Save(); @@ -925,7 +925,7 @@ void VPatternConverter::ToV0_6_3() void VPatternConverter::ToV0_6_4() { // TODO. Delete if minimal supported version is 0.6.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 4), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 4), "Time to refactor the code."); SetVersion(QStringLiteral("0.6.4")); Save(); @@ -935,7 +935,7 @@ void VPatternConverter::ToV0_6_4() void VPatternConverter::ToV0_6_5() { // TODO. Delete if minimal supported version is 0.6.5 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 5), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 5), "Time to refactor the code."); SetVersion(QStringLiteral("0.6.5")); Save(); @@ -945,7 +945,7 @@ void VPatternConverter::ToV0_6_5() void VPatternConverter::ToV0_6_6() { // TODO. Delete if minimal supported version is 0.6.6 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 6), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 6), "Time to refactor the code."); SetVersion(QStringLiteral("0.6.6")); Save(); @@ -955,7 +955,7 @@ void VPatternConverter::ToV0_6_6() void VPatternConverter::ToV0_7_0() { // TODO. Delete if minimal supported version is 0.7.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 0), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.0")); Save(); @@ -965,7 +965,7 @@ void VPatternConverter::ToV0_7_0() void VPatternConverter::ToV0_7_1() { // TODO. Delete if minimal supported version is 0.7.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 1), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.1")); Save(); @@ -975,7 +975,7 @@ void VPatternConverter::ToV0_7_1() void VPatternConverter::ToV0_7_2() { // TODO. Delete if minimal supported version is 0.7.2 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 2), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 2), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.2")); Save(); @@ -985,7 +985,7 @@ void VPatternConverter::ToV0_7_2() void VPatternConverter::ToV0_7_3() { // TODO. Delete if minimal supported version is 0.7.3 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 3), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 3), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.3")); Save(); @@ -995,7 +995,7 @@ void VPatternConverter::ToV0_7_3() void VPatternConverter::ToV0_7_4() { // TODO. Delete if minimal supported version is 0.7.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 4), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 4), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.4")); Save(); @@ -1005,7 +1005,7 @@ void VPatternConverter::ToV0_7_4() void VPatternConverter::ToV0_7_5() { // TODO. Delete if minimal supported version is 0.7.5 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 5), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 5), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.5")); Save(); @@ -1015,7 +1015,7 @@ void VPatternConverter::ToV0_7_5() void VPatternConverter::ToV0_7_6() { // TODO. Delete if minimal supported version is 0.7.6 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 6), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 6), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.6")); Save(); @@ -1025,7 +1025,7 @@ void VPatternConverter::ToV0_7_6() void VPatternConverter::ToV0_7_7() { // TODO. Delete if minimal supported version is 0.7.7 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 7), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 7), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.7")); Save(); @@ -1035,7 +1035,7 @@ void VPatternConverter::ToV0_7_7() void VPatternConverter::ToV0_7_8() { // TODO. Delete if minimal supported version is 0.7.8 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 8), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 8), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.8")); Save(); @@ -1045,7 +1045,7 @@ void VPatternConverter::ToV0_7_8() void VPatternConverter::ToV0_7_9() { // TODO. Delete if minimal supported version is 0.7.9 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 9), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 9), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.9")); Save(); @@ -1055,7 +1055,7 @@ void VPatternConverter::ToV0_7_9() void VPatternConverter::ToV0_7_10() { // TODO. Delete if minimal supported version is 0.7.10 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 10), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 10), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.10")); Save(); @@ -1065,7 +1065,7 @@ void VPatternConverter::ToV0_7_10() void VPatternConverter::ToV0_7_11() { // TODO. Delete if minimal supported version is 0.7.11 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 11), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 11), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.11")); Save(); @@ -1075,7 +1075,7 @@ void VPatternConverter::ToV0_7_11() void VPatternConverter::ToV0_7_12() { // TODO. Delete if minimal supported version is 0.7.12 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 12), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 12), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.12")); Save(); @@ -1085,7 +1085,7 @@ void VPatternConverter::ToV0_7_12() void VPatternConverter::ToV0_7_13() { // TODO. Delete if minimal supported version is 0.7.13 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 13), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 7, 13), "Time to refactor the code."); SetVersion(QStringLiteral("0.7.13")); Save(); @@ -1095,7 +1095,7 @@ void VPatternConverter::ToV0_7_13() void VPatternConverter::ToV0_8_0() { // TODO. Delete if minimal supported version is 0.8.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 0), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.0")); Save(); @@ -1105,7 +1105,7 @@ void VPatternConverter::ToV0_8_0() void VPatternConverter::ToV0_8_1() { // TODO. Delete if minimal supported version is 0.8.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 1), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.1")); Save(); @@ -1115,7 +1115,7 @@ void VPatternConverter::ToV0_8_1() void VPatternConverter::ToV0_8_2() { // TODO. Delete if minimal supported version is 0.8.2 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 2), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 2), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.2")); Save(); @@ -1125,7 +1125,7 @@ void VPatternConverter::ToV0_8_2() void VPatternConverter::ToV0_8_3() { // TODO. Delete if minimal supported version is 0.8.3 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 3), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 3), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.3")); Save(); @@ -1135,7 +1135,7 @@ void VPatternConverter::ToV0_8_3() void VPatternConverter::ToV0_8_4() { // TODO. Delete if minimal supported version is 0.8.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 4), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 4), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.4")); Save(); @@ -1145,7 +1145,7 @@ void VPatternConverter::ToV0_8_4() void VPatternConverter::ToV0_8_5() { // TODO. Delete if minimal supported version is 0.8.5 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 5), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 5), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.5")); Save(); @@ -1155,7 +1155,7 @@ void VPatternConverter::ToV0_8_5() void VPatternConverter::ToV0_8_6() { // TODO. Delete if minimal supported version is 0.8.6 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 6), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 6), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.6")); Save(); @@ -1165,7 +1165,7 @@ void VPatternConverter::ToV0_8_6() void VPatternConverter::ToV0_8_7() { // TODO. Delete if minimal supported version is 0.8.7 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 7), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 7), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.7")); Save(); @@ -1175,7 +1175,7 @@ void VPatternConverter::ToV0_8_7() void VPatternConverter::ToV0_8_8() { // TODO. Delete if minimal supported version is 0.8.8 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 8), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 8), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.8")); RemoveGradationV0_8_8(); @@ -1187,7 +1187,7 @@ void VPatternConverter::ToV0_8_8() void VPatternConverter::ToV0_8_9() { // TODO. Delete if minimal supported version is 0.8.9 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 9), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 9), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.9")); Save(); @@ -1197,7 +1197,7 @@ void VPatternConverter::ToV0_8_9() void VPatternConverter::ToV0_8_10() { // TODO. Delete if minimal supported version is 0.8.10 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 10), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 10), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.10")); Save(); @@ -1207,7 +1207,7 @@ void VPatternConverter::ToV0_8_10() void VPatternConverter::ToV0_8_11() { // TODO. Delete if minimal supported version is 0.8.11 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 11), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 11), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.11")); Save(); @@ -1217,7 +1217,7 @@ void VPatternConverter::ToV0_8_11() void VPatternConverter::ToV0_8_12() { // TODO. Delete if minimal supported version is 0.8.12 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 12), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 12), "Time to refactor the code."); SetVersion(QStringLiteral("0.8.12")); Save(); @@ -1227,7 +1227,7 @@ void VPatternConverter::ToV0_8_12() void VPatternConverter::TagUnitToV0_2_0() { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); QDomElement patternElement = documentElement(); @@ -1239,7 +1239,7 @@ void VPatternConverter::TagUnitToV0_2_0() void VPatternConverter::TagIncrementToV0_2_0() { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); const QSet names = FixIncrementsToV0_2_0(); @@ -1253,7 +1253,7 @@ void VPatternConverter::TagIncrementToV0_2_0() void VPatternConverter::ConvertMeasurementsToV0_2_0() { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); const QMap names = OldNamesToNewNames_InV0_2_0(); @@ -1266,7 +1266,7 @@ void VPatternConverter::ConvertMeasurementsToV0_2_0() QSet VPatternConverter::FixIncrementsToV0_2_0() { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); QSet names; @@ -1312,7 +1312,7 @@ QSet VPatternConverter::FixIncrementsToV0_2_0() void VPatternConverter::FixPointExpressionsToV0_2_0(const QSet &names) { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); QString formula; @@ -1376,7 +1376,7 @@ void VPatternConverter::FixPointExpressionsToV0_2_0(const QSet &names) void VPatternConverter::FixArcExpressionsToV0_2_0(const QSet &names) { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); QString formula; @@ -1431,7 +1431,7 @@ void VPatternConverter::FixArcExpressionsToV0_2_0(const QSet &names) void VPatternConverter::FixPathPointExpressionsToV0_2_0(const QSet &names) { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); QString formula; @@ -1476,7 +1476,7 @@ void VPatternConverter::FixPathPointExpressionsToV0_2_0(const QSet &nam void VPatternConverter::ConvertPointExpressionsToV0_2_0(const QMap &names) { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); QString formula; @@ -1540,7 +1540,7 @@ void VPatternConverter::ConvertPointExpressionsToV0_2_0(const QMap &names) { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); QString formula; @@ -1595,7 +1595,7 @@ void VPatternConverter::ConvertArcExpressionsToV0_2_0(const QMap &names) { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); QString formula; @@ -1640,7 +1640,7 @@ void VPatternConverter::ConvertPathPointExpressionsToV0_2_0(const QMap &names) { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); QScopedPointer cal(new qmu::QmuTokenParser(formula, false, false));// Eval formula @@ -1674,7 +1674,7 @@ QString VPatternConverter::FixMeasurementInFormulaToV0_2_0(const QString &formul QString VPatternConverter::FixIncrementInFormulaToV0_2_0(const QString &formula, const QSet &names) { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); qmu::QmuTokenParser *cal = new qmu::QmuTokenParser(formula, false, false);// Eval formula @@ -1708,7 +1708,7 @@ QString VPatternConverter::FixIncrementInFormulaToV0_2_0(const QString &formula, void VPatternConverter::TagMeasurementsToV0_2_0() { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); QDomElement ms = TagMeasurementsV0_1_4(); @@ -1725,7 +1725,7 @@ void VPatternConverter::TagMeasurementsToV0_2_0() void VPatternConverter::ConvertMeasurementsToV0_2_1() { // TODO. Delete if minimal supported version is 0.2.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 1), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 1), "Time to refactor the code."); const QMap names = OldNamesToNewNames_InV0_2_1(); @@ -1740,7 +1740,7 @@ void VPatternConverter::ConvertMeasurementsToV0_2_1() void VPatternConverter::RemoveColorToolCutV0_3_1() { // TODO. Delete if minimal supported version is 0.3.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 3, 1), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 3, 1), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strPoint); @@ -1762,7 +1762,7 @@ void VPatternConverter::RemoveColorToolCutV0_3_1() QString VPatternConverter::MUnitV0_1_4() const { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); const QDomElement element = TagMeasurementsV0_1_4(); @@ -1782,7 +1782,7 @@ QString VPatternConverter::MUnitV0_1_4() const QDomElement VPatternConverter::TagMeasurementsV0_1_4() const { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strMeasurements); @@ -1799,7 +1799,7 @@ QDomElement VPatternConverter::TagMeasurementsV0_1_4() const QDomElement VPatternConverter::TagIncrementsV0_1_4() const { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strIncrements); @@ -1816,7 +1816,7 @@ QDomElement VPatternConverter::TagIncrementsV0_1_4() const void VPatternConverter::FixToolUnionToV0_2_4() { // TODO. Delete if minimal supported version is 0.2.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 4), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 4), "Time to refactor the code."); QDomElement root = documentElement(); @@ -1831,7 +1831,7 @@ void VPatternConverter::FixToolUnionToV0_2_4() void VPatternConverter::ParseModelingToV0_2_4(const QDomElement &modeling) { // TODO. Delete if minimal supported version is 0.2.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 4), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 4), "Time to refactor the code."); QDomElement node = modeling.firstChild().toElement(); @@ -1870,7 +1870,7 @@ void VPatternConverter::ParseModelingToV0_2_4(const QDomElement &modeling) void VPatternConverter::SaveChildrenToolUnionToV0_2_4(quint32 id, const QVector &children) { // TODO. Delete if minimal supported version is 0.2.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 4), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 4), "Time to refactor the code."); QDomElement toolUnion = elementById(id); @@ -1893,7 +1893,7 @@ void VPatternConverter::SaveChildrenToolUnionToV0_2_4(quint32 id, const QVector< QMap VPatternConverter::OldNamesToNewNames_InV0_2_0() { // TODO. Delete if minimal supported version is 0.2.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 0), "Time to refactor the code."); // old name, new name @@ -2073,7 +2073,7 @@ QMap VPatternConverter::OldNamesToNewNames_InV0_2_0() QMap VPatternConverter::OldNamesToNewNames_InV0_2_1() { // TODO. Delete if minimal supported version is 0.2.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 1), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 2, 1), "Time to refactor the code."); // old name, new name @@ -2271,7 +2271,7 @@ void VPatternConverter::FixSubPaths(int i, quint32 id, quint32 baseCurve) void VPatternConverter::TagRemoveAttributeTypeObjectInV0_4_0() { // TODO. Delete if minimal supported version is 0.4.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 0), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strModeling); @@ -2301,7 +2301,7 @@ void VPatternConverter::TagRemoveAttributeTypeObjectInV0_4_0() void VPatternConverter::TagDetailToV0_4_0() { // TODO. Delete if minimal supported version is 0.4.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 0), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strDetail); @@ -2441,7 +2441,7 @@ QDomElement VPatternConverter::GetUnionChildrenNodesV0_4_0(const QDomElement &de void VPatternConverter::LabelTagToV0_4_4(const QString &tagName) { // TODO. Delete if minimal supported version is 0.4.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 4), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 4), "Time to refactor the code."); Unit unit = Unit::Cm; @@ -2493,7 +2493,7 @@ void VPatternConverter::LabelTagToV0_4_4(const QString &tagName) QDomElement VPatternConverter::AddTagPatternLabelV0_5_1() { // TODO. Delete if minimal supported version is 0.6.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strPatternLabel); @@ -2531,7 +2531,7 @@ QDomElement VPatternConverter::AddTagPatternLabelV0_5_1() void VPatternConverter::PortPatternLabeltoV0_6_0(QDomElement &label) { // TODO. Delete if minimal supported version is 0.6.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0), "Time to refactor the code."); if (not UniqueTagText(*strCompanyName).isEmpty()) @@ -2584,7 +2584,7 @@ void VPatternConverter::AddLabelTemplateLineV0_6_0(QDomElement &label, const QSt int alignment, int fontSizeIncrement) { // TODO. Delete if minimal supported version is 0.6.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0), "Time to refactor the code."); QDomElement tagLine = createElement(*strLine); @@ -2602,7 +2602,7 @@ void VPatternConverter::AddLabelTemplateLineV0_6_0(QDomElement &label, const QSt void VPatternConverter::PortPieceLabelstoV0_6_0() { // TODO. Delete if minimal supported version is 0.6.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0), "Time to refactor the code."); const QDomNodeList nodeList = elementsByTagName(*strData); @@ -2690,7 +2690,7 @@ void VPatternConverter::PortPieceLabelstoV0_6_0() void VPatternConverter::RemoveUnusedTagsV0_6_0() { // TODO. Delete if minimal supported version is 0.6.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0), "Time to refactor the code."); RemoveUniqueTagV0_6_0(*strAuthor); @@ -2714,7 +2714,7 @@ void VPatternConverter::RemoveUnusedTagsV0_6_0() void VPatternConverter::RemoveUniqueTagV0_6_0(const QString &tag) { // TODO. Delete if minimal supported version is 0.6.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 0), "Time to refactor the code."); const QDomNodeList nodeList = elementsByTagName(tag); @@ -2731,7 +2731,7 @@ void VPatternConverter::RemoveUniqueTagV0_6_0(const QString &tag) void VPatternConverter::AddTagPreviewCalculationsV0_6_2() { // TODO. Delete if minimal supported version is 0.6.2 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 6, 2), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 6, 2), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strIncrements); @@ -2760,7 +2760,7 @@ void VPatternConverter::RemoveGradationV0_8_8() void VPatternConverter::AddPieceUUIDV0_8_8() { // TODO. Delete if minimal supported version is 0.8.8 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 8, 8), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 8, 8), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strDetail); @@ -2779,7 +2779,7 @@ void VPatternConverter::AddPieceUUIDV0_8_8() void VPatternConverter::TagUnionDetailsToV0_4_0() { // TODO. Delete if minimal supported version is 0.4.0 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 4, 0), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FormatVersion(0, 4, 0), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strTools); diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index e30289b7a..df8e93ac6 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -52,8 +52,8 @@ public: static const QString PatternMaxVerStr; static const QString CurrentSchema; - static Q_DECL_CONSTEXPR const int PatternMinVer = FORMAT_VERSION(0, 1, 4); - static Q_DECL_CONSTEXPR const int PatternMaxVer = FORMAT_VERSION(0, 8, 12); + static Q_DECL_CONSTEXPR const int PatternMinVer = FormatVersion(0, 1, 4); + static Q_DECL_CONSTEXPR const int PatternMaxVer = FormatVersion(0, 8, 12); protected: virtual int MinVer() const override; diff --git a/src/libs/ifc/xml/vvitconverter.cpp b/src/libs/ifc/xml/vvitconverter.cpp index c4da6193a..a5b770c30 100644 --- a/src/libs/ifc/xml/vvitconverter.cpp +++ b/src/libs/ifc/xml/vvitconverter.cpp @@ -83,14 +83,14 @@ QString VVITConverter::XSDSchema(int ver) const { QHash schemas = { - std::make_pair(FORMAT_VERSION(0, 2, 0), QStringLiteral("://schema/individual_measurements/v0.2.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 0), QStringLiteral("://schema/individual_measurements/v0.3.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 1), QStringLiteral("://schema/individual_measurements/v0.3.1.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 2), QStringLiteral("://schema/individual_measurements/v0.3.2.xsd")), - std::make_pair(FORMAT_VERSION(0, 3, 3), QStringLiteral("://schema/individual_measurements/v0.3.3.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 0), QStringLiteral("://schema/individual_measurements/v0.4.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 5, 0), QStringLiteral("://schema/individual_measurements/v0.5.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 5, 1), CurrentSchema), + std::make_pair(FormatVersion(0, 2, 0), QStringLiteral("://schema/individual_measurements/v0.2.0.xsd")), + std::make_pair(FormatVersion(0, 3, 0), QStringLiteral("://schema/individual_measurements/v0.3.0.xsd")), + std::make_pair(FormatVersion(0, 3, 1), QStringLiteral("://schema/individual_measurements/v0.3.1.xsd")), + std::make_pair(FormatVersion(0, 3, 2), QStringLiteral("://schema/individual_measurements/v0.3.2.xsd")), + std::make_pair(FormatVersion(0, 3, 3), QStringLiteral("://schema/individual_measurements/v0.3.3.xsd")), + std::make_pair(FormatVersion(0, 4, 0), QStringLiteral("://schema/individual_measurements/v0.4.0.xsd")), + std::make_pair(FormatVersion(0, 5, 0), QStringLiteral("://schema/individual_measurements/v0.5.0.xsd")), + std::make_pair(FormatVersion(0, 5, 1), CurrentSchema), }; if (schemas.contains(ver)) @@ -108,35 +108,35 @@ void VVITConverter::ApplyPatches() { switch (m_ver) { - case (FORMAT_VERSION(0, 2, 0)): + case (FormatVersion(0, 2, 0)): ToV0_3_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 0)): + case (FormatVersion(0, 3, 0)): ToV0_3_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 1)): + case (FormatVersion(0, 3, 1)): ToV0_3_2(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 2))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 2))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 2)): + case (FormatVersion(0, 3, 2)): ToV0_3_3(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 3, 3))); + ValidateXML(XSDSchema(FormatVersion(0, 3, 3))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 3, 3)): + case (FormatVersion(0, 3, 3)): ToV0_4_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 0)): + case (FormatVersion(0, 4, 0)): ToV0_5_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 5, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 5, 0)): + case (FormatVersion(0, 5, 0)): ToV0_5_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 5, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 5, 1)): + case (FormatVersion(0, 5, 1)): break; default: InvalidVersion(m_ver); @@ -155,7 +155,7 @@ void VVITConverter::DowngradeToCurrentMaxVersion() bool VVITConverter::IsReadOnly() const { // Check if attribute read-only was not changed in file format - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMaxVer == FORMAT_VERSION(0, 5, 1), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMaxVer == FormatVersion(0, 5, 1), "Check attribute read-only."); // Possibly in future attribute read-only will change position etc. @@ -169,7 +169,7 @@ bool VVITConverter::IsReadOnly() const void VVITConverter::AddNewTagsForV0_3_0() { // TODO. Delete if minimal supported version is 0.3.0 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 0), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 0), "Time to refactor the code."); QDomElement rootElement = this->documentElement(); @@ -185,7 +185,7 @@ void VVITConverter::AddNewTagsForV0_3_0() QString VVITConverter::MUnitV0_2_0() { // TODO. Delete if minimal supported version is 0.3.0 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 0), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 0), "Time to refactor the code."); return UniqueTagText(QStringLiteral("unit"), QStringLiteral("cm")); @@ -195,7 +195,7 @@ QString VVITConverter::MUnitV0_2_0() void VVITConverter::ConvertMeasurementsToV0_3_0() { // TODO. Delete if minimal supported version is 0.3.0 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 0), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 0), "Time to refactor the code."); const QString tagBM = QStringLiteral("body-measurements"); @@ -238,7 +238,7 @@ void VVITConverter::ConvertMeasurementsToV0_3_0() QDomElement VVITConverter::AddMV0_3_0(const QString &name, qreal value) { // TODO. Delete if minimal supported version is 0.3.0 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 0), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 0), "Time to refactor the code."); QDomElement element = createElement(QStringLiteral("m")); @@ -255,7 +255,7 @@ QDomElement VVITConverter::AddMV0_3_0(const QString &name, qreal value) void VVITConverter::GenderV0_3_1() { // TODO. Delete if minimal supported version is 0.3.1 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 1), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 1), "Time to refactor the code."); const QDomNodeList nodeList = this->elementsByTagName(QStringLiteral("sex")); @@ -268,7 +268,7 @@ void VVITConverter::GenderV0_3_1() void VVITConverter::PM_SystemV0_3_2() { // TODO. Delete if minimal supported version is 0.3.2 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 2), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 2), "Time to refactor the code."); const QDomNodeList nodeList = this->elementsByTagName(QStringLiteral("personal")); @@ -282,7 +282,7 @@ void VVITConverter::PM_SystemV0_3_2() void VVITConverter::ConvertMeasurementsToV0_3_3() { // TODO. Delete if minimal supported version is 0.3.3 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 3), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 3), "Time to refactor the code."); const QMap names = OldNamesToNewNames_InV0_3_3(); @@ -365,7 +365,7 @@ void VVITConverter::ConverCustomerNameToV0_4_0() void VVITConverter::ToV0_3_0() { // TODO. Delete if minimal supported version is 0.3.0 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 0), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 0), "Time to refactor the code."); AddRootComment(); @@ -379,7 +379,7 @@ void VVITConverter::ToV0_3_0() void VVITConverter::ToV0_3_1() { // TODO. Delete if minimal supported version is 0.3.1 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 1), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.1")); @@ -391,7 +391,7 @@ void VVITConverter::ToV0_3_1() void VVITConverter::ToV0_3_2() { // TODO. Delete if minimal supported version is 0.3.2 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 2), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 2), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.2")); @@ -403,7 +403,7 @@ void VVITConverter::ToV0_3_2() void VVITConverter::ToV0_3_3() { // TODO. Delete if minimal supported version is 0.3.3 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 3, 3), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 3, 3), "Time to refactor the code."); SetVersion(QStringLiteral("0.3.3")); @@ -415,7 +415,7 @@ void VVITConverter::ToV0_3_3() void VVITConverter::ToV0_4_0() { // TODO. Delete if minimal supported version is 0.4.0 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 4, 0), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.0")); @@ -427,7 +427,7 @@ void VVITConverter::ToV0_4_0() void VVITConverter::ToV0_5_0() { // TODO. Delete if minimal supported version is 0.5.0 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 5, 0), "Time to refactor the code."); SetVersion(QStringLiteral("0.5.0")); @@ -438,7 +438,7 @@ void VVITConverter::ToV0_5_0() void VVITConverter::ToV0_5_1() { // TODO. Delete if minimal supported version is 0.5.1 - Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 1), + Q_STATIC_ASSERT_X(VVITConverter::MeasurementMinVer < FormatVersion(0, 5, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.5.1")); diff --git a/src/libs/ifc/xml/vvitconverter.h b/src/libs/ifc/xml/vvitconverter.h index aa7360f71..80430488e 100644 --- a/src/libs/ifc/xml/vvitconverter.h +++ b/src/libs/ifc/xml/vvitconverter.h @@ -48,8 +48,8 @@ public: static const QString MeasurementMaxVerStr; static const QString CurrentSchema; - static Q_DECL_CONSTEXPR const int MeasurementMinVer = FORMAT_VERSION(0, 2, 0); - static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FORMAT_VERSION(0, 5, 1); + static Q_DECL_CONSTEXPR const int MeasurementMinVer = FormatVersion(0, 2, 0); + static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FormatVersion(0, 5, 1); protected: virtual int MinVer() const override; diff --git a/src/libs/ifc/xml/vvstconverter.cpp b/src/libs/ifc/xml/vvstconverter.cpp index 34c2d9018..42fa41bec 100644 --- a/src/libs/ifc/xml/vvstconverter.cpp +++ b/src/libs/ifc/xml/vvstconverter.cpp @@ -77,14 +77,14 @@ QString VVSTConverter::XSDSchema(int ver) const { QHash schemas = { - std::make_pair(FORMAT_VERSION(0, 3, 0), QStringLiteral("://schema/multisize_measurements/v0.3.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 0), QStringLiteral("://schema/multisize_measurements/v0.4.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 1), QStringLiteral("://schema/multisize_measurements/v0.4.1.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 2), QStringLiteral("://schema/multisize_measurements/v0.4.2.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 3), QStringLiteral("://schema/multisize_measurements/v0.4.3.xsd")), - std::make_pair(FORMAT_VERSION(0, 4, 4), QStringLiteral("://schema/multisize_measurements/v0.4.4.xsd")), - std::make_pair(FORMAT_VERSION(0, 5, 0), QStringLiteral("://schema/multisize_measurements/v0.5.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 5, 1), CurrentSchema), + std::make_pair(FormatVersion(0, 3, 0), QStringLiteral("://schema/multisize_measurements/v0.3.0.xsd")), + std::make_pair(FormatVersion(0, 4, 0), QStringLiteral("://schema/multisize_measurements/v0.4.0.xsd")), + std::make_pair(FormatVersion(0, 4, 1), QStringLiteral("://schema/multisize_measurements/v0.4.1.xsd")), + std::make_pair(FormatVersion(0, 4, 2), QStringLiteral("://schema/multisize_measurements/v0.4.2.xsd")), + std::make_pair(FormatVersion(0, 4, 3), QStringLiteral("://schema/multisize_measurements/v0.4.3.xsd")), + std::make_pair(FormatVersion(0, 4, 4), QStringLiteral("://schema/multisize_measurements/v0.4.4.xsd")), + std::make_pair(FormatVersion(0, 5, 0), QStringLiteral("://schema/multisize_measurements/v0.5.0.xsd")), + std::make_pair(FormatVersion(0, 5, 1), CurrentSchema), }; if (schemas.contains(ver)) @@ -102,35 +102,35 @@ void VVSTConverter::ApplyPatches() { switch (m_ver) { - case (FORMAT_VERSION(0, 3, 0)): + case (FormatVersion(0, 3, 0)): ToV0_4_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 0)): + case (FormatVersion(0, 4, 0)): ToV0_4_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 1)): + case (FormatVersion(0, 4, 1)): ToV0_4_2(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 2))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 2))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 2)): + case (FormatVersion(0, 4, 2)): ToV0_4_3(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 3))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 3))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 3)): + case (FormatVersion(0, 4, 3)): ToV0_4_4(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 4, 4))); + ValidateXML(XSDSchema(FormatVersion(0, 4, 4))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 4, 4)): + case (FormatVersion(0, 4, 4)): ToV0_5_0(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 0))); + ValidateXML(XSDSchema(FormatVersion(0, 5, 0))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 5, 0)): + case (FormatVersion(0, 5, 0)): ToV0_5_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 5, 1))); + ValidateXML(XSDSchema(FormatVersion(0, 5, 1))); Q_FALLTHROUGH(); - case (FORMAT_VERSION(0, 5, 1)): + case (FormatVersion(0, 5, 1)): break; default: InvalidVersion(m_ver); @@ -149,7 +149,7 @@ void VVSTConverter::DowngradeToCurrentMaxVersion() bool VVSTConverter::IsReadOnly() const { // Check if attribute read-only was not changed in file format - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMaxVer == FORMAT_VERSION(0, 5, 1), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMaxVer == FormatVersion(0, 5, 1), "Check attribute read-only."); // Possibly in future attribute read-only will change position etc. @@ -163,7 +163,7 @@ bool VVSTConverter::IsReadOnly() const void VVSTConverter::AddNewTagsForV0_4_0() { // TODO. Delete if minimal supported version is 0.4.0 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 0), "Time to refactor the code."); QDomElement rootElement = this->documentElement(); @@ -179,7 +179,7 @@ void VVSTConverter::AddNewTagsForV0_4_0() void VVSTConverter::RemoveTagsForV0_4_0() { // TODO. Delete if minimal supported version is 0.4.0 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 0), "Time to refactor the code."); QDomElement rootElement = this->documentElement(); @@ -205,7 +205,7 @@ void VVSTConverter::RemoveTagsForV0_4_0() void VVSTConverter::ConvertMeasurementsToV0_4_0() { // TODO. Delete if minimal supported version is 0.4.0 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 0), "Time to refactor the code."); const QString tagBM = QStringLiteral("body-measurements"); @@ -255,7 +255,7 @@ void VVSTConverter::ConvertMeasurementsToV0_4_0() QDomElement VVSTConverter::AddMV0_4_0(const QString &name, qreal value, qreal sizeIncrease, qreal heightIncrease) { // TODO. Delete if minimal supported version is 0.4.0 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 0), "Time to refactor the code."); QDomElement element = createElement(QStringLiteral("m")); @@ -274,7 +274,7 @@ QDomElement VVSTConverter::AddMV0_4_0(const QString &name, qreal value, qreal si void VVSTConverter::PM_SystemV0_4_1() { // TODO. Delete if minimal supported version is 0.4.1 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 1), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 1), "Time to refactor the code."); const QDomNodeList nodeList = this->elementsByTagName(QStringLiteral("size")); @@ -288,7 +288,7 @@ void VVSTConverter::PM_SystemV0_4_1() void VVSTConverter::ConvertMeasurementsToV0_4_2() { // TODO. Delete if minimal supported version is 0.4.2 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 2), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 2), "Time to refactor the code."); const QMap names = OldNamesToNewNames_InV0_3_3(); @@ -321,7 +321,7 @@ void VVSTConverter::ConvertMeasurementsToV0_4_2() void VVSTConverter::AddNewTagsForV0_5_0() { // TODO. Delete if minimal supported version is 0.5.0 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 5, 0), "Time to refactor the code."); QDomElement root = documentElement(); @@ -385,7 +385,7 @@ void VVSTConverter::AddNewTagsForV0_5_0() void VVSTConverter::RemoveTagsForV0_5_0() { // TODO. Delete if minimal supported version is 0.5.0 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 5, 0), "Time to refactor the code."); QDomElement root = documentElement(); @@ -407,7 +407,7 @@ void VVSTConverter::RemoveTagsForV0_5_0() void VVSTConverter::ConvertMeasurementsToV0_5_0() { // TODO. Delete if minimal supported version is 0.5.0 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 5, 0), "Time to refactor the code."); const QDomNodeList measurements = elementsByTagName(QStringLiteral("m")); @@ -427,7 +427,7 @@ void VVSTConverter::ConvertMeasurementsToV0_5_0() void VVSTConverter::ToV0_4_0() { // TODO. Delete if minimal supported version is 0.4.0 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 0), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 0), "Time to refactor the code."); AddRootComment(); @@ -442,7 +442,7 @@ void VVSTConverter::ToV0_4_0() void VVSTConverter::ToV0_4_1() { // TODO. Delete if minimal supported version is 0.4.1 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 1), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.1")); @@ -454,7 +454,7 @@ void VVSTConverter::ToV0_4_1() void VVSTConverter::ToV0_4_2() { // TODO. Delete if minimal supported version is 0.4.2 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 2), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 2), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.2")); @@ -466,7 +466,7 @@ void VVSTConverter::ToV0_4_2() void VVSTConverter::ToV0_4_3() { // TODO. Delete if minimal supported version is 0.4.3 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 3), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 3), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.3")); @@ -477,7 +477,7 @@ void VVSTConverter::ToV0_4_3() void VVSTConverter::ToV0_4_4() { // TODO. Delete if minimal supported version is 0.4.4 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 4, 4), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 4, 4), "Time to refactor the code."); SetVersion(QStringLiteral("0.4.4")); @@ -488,7 +488,7 @@ void VVSTConverter::ToV0_4_4() void VVSTConverter::ToV0_5_0() { // TODO. Delete if minimal supported version is 0.5.0 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 0), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 5, 0), "Time to refactor the code."); SetVersion(QStringLiteral("0.5.0")); @@ -502,7 +502,7 @@ void VVSTConverter::ToV0_5_0() void VVSTConverter::ToV0_5_1() { // TODO. Delete if minimal supported version is 0.5.1 - Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FORMAT_VERSION(0, 5, 1), + Q_STATIC_ASSERT_X(VVSTConverter::MeasurementMinVer < FormatVersion(0, 5, 1), "Time to refactor the code."); SetVersion(QStringLiteral("0.5.1")); diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h index 5b50d9d52..176a51121 100644 --- a/src/libs/ifc/xml/vvstconverter.h +++ b/src/libs/ifc/xml/vvstconverter.h @@ -50,11 +50,11 @@ public: static const QString CurrentSchema; // GCC 4.6 doesn't allow constexpr and const together #if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) <= 406 - static Q_DECL_CONSTEXPR int MeasurementMinVer = FORMAT_VERSION(0, 3, 0); - static Q_DECL_CONSTEXPR int MeasurementMaxVer = FORMAT_VERSION(0, 5, 1); + static Q_DECL_CONSTEXPR int MeasurementMinVer = FormatVersion(0, 3, 0); + static Q_DECL_CONSTEXPR int MeasurementMaxVer = FormatVersion(0, 5, 1); #else - static Q_DECL_CONSTEXPR const int MeasurementMinVer = FORMAT_VERSION(0, 3, 0); - static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FORMAT_VERSION(0, 5, 1); + static Q_DECL_CONSTEXPR const int MeasurementMinVer = FormatVersion(0, 3, 0); + static Q_DECL_CONSTEXPR const int MeasurementMaxVer = FormatVersion(0, 5, 1); #endif protected: diff --git a/src/libs/ifc/xml/vwatermarkconverter.cpp b/src/libs/ifc/xml/vwatermarkconverter.cpp index 1a9561224..04bc4d983 100644 --- a/src/libs/ifc/xml/vwatermarkconverter.cpp +++ b/src/libs/ifc/xml/vwatermarkconverter.cpp @@ -37,7 +37,7 @@ const QString VWatermarkConverter::WatermarkMinVerStr = QStringLiteral("1.0.0"); const QString VWatermarkConverter::WatermarkMaxVerStr = QStringLiteral("1.0.0"); -const QString VWatermarkConverter::CurrentSchema = QStringLiteral("://schema/watermark/v1.0.0.xsd"); +const QString VWatermarkConverter::CurrentSchema = QStringLiteral("://schema/watermark/v1.0.0.xsd"); //VWatermarkConverter::WatermarkMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! //VWatermarkConverter::WatermarkMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! diff --git a/src/libs/ifc/xml/vwatermarkconverter.h b/src/libs/ifc/xml/vwatermarkconverter.h index 3254d2534..207e66cf2 100644 --- a/src/libs/ifc/xml/vwatermarkconverter.h +++ b/src/libs/ifc/xml/vwatermarkconverter.h @@ -38,8 +38,8 @@ public: static const QString WatermarkMaxVerStr; static const QString CurrentSchema; - static Q_DECL_CONSTEXPR const int WatermarkMinVer = FORMAT_VERSION(1, 0, 0); - static Q_DECL_CONSTEXPR const int WatermarkMaxVer = FORMAT_VERSION(1, 0, 0); + static Q_DECL_CONSTEXPR const int WatermarkMinVer = FormatVersion(1, 0, 0); + static Q_DECL_CONSTEXPR const int WatermarkMaxVer = FormatVersion(1, 0, 0); protected: virtual int MinVer() const override;