From 1c9360ff1c04a89fdaf436fed98036d84d6f6153 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 19 Dec 2016 15:14:13 +0200 Subject: [PATCH] Complete conversion to v0.3.9. --HG-- branch : feature --- src/libs/ifc/xml/vpatternconverter.cpp | 13 +++++++++++++ src/libs/ifc/xml/vpatternconverter.h | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 96ea1b8ea..6fff85b5a 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -175,6 +175,8 @@ QString VPatternConverter::XSDSchema(int ver) const case (0x000307): return QStringLiteral("://schema/pattern/v0.3.7.xsd"); case (0x000308): + return QStringLiteral("://schema/pattern/v0.3.8.xsd"); + case (0x000309): return CurrentSchema; default: InvalidVersion(ver); @@ -274,6 +276,10 @@ void VPatternConverter::ApplyPatches() ValidateXML(XSDSchema(0x000308), fileName); V_FALLTHROUGH case (0x000308): + ToV0_3_9(); + ValidateXML(XSDSchema(0x000309), fileName); + V_FALLTHROUGH + case (0x000309): break; default: break; @@ -462,6 +468,13 @@ void VPatternConverter::ToV0_3_8() Save(); } +//--------------------------------------------------------------------------------------------------------------------- +void VPatternConverter::ToV0_3_9() +{ + SetVersion(QStringLiteral("0.3.9")); + Save(); +} + //--------------------------------------------------------------------------------------------------------------------- void VPatternConverter::TagUnitToV0_2_0() { diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 267bbbfd5..2a3676c25 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -55,10 +55,10 @@ public: // 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 PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); - static Q_DECL_CONSTEXPR int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 8); + static Q_DECL_CONSTEXPR int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 9); #else static Q_DECL_CONSTEXPR const int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); - static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 8); + static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 9); #endif protected: @@ -97,6 +97,7 @@ private: void ToV0_3_6(); void ToV0_3_7(); void ToV0_3_8(); + void ToV0_3_9(); void TagUnitToV0_2_0(); void TagIncrementToV0_2_0();