From 62b64758960649877541f5ee836ba3fe018a410d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 26 Jul 2018 21:44:37 +0300 Subject: [PATCH] Removed all pattern format versions those were present in version 0.3.x. --HG-- branch : develop --- src/libs/ifc/schema.qrc | 4 - src/libs/ifc/schema/pattern/v0.1.0.xsd | 290 ----------------------- src/libs/ifc/schema/pattern/v0.1.1.xsd | 291 ----------------------- src/libs/ifc/schema/pattern/v0.1.2.xsd | 292 ----------------------- src/libs/ifc/schema/pattern/v0.1.3.xsd | 309 ------------------------- src/libs/ifc/xml/vpatternconverter.cpp | 78 +------ src/libs/ifc/xml/vpatternconverter.h | 6 +- 7 files changed, 8 insertions(+), 1262 deletions(-) delete mode 100644 src/libs/ifc/schema/pattern/v0.1.0.xsd delete mode 100644 src/libs/ifc/schema/pattern/v0.1.1.xsd delete mode 100644 src/libs/ifc/schema/pattern/v0.1.2.xsd delete mode 100644 src/libs/ifc/schema/pattern/v0.1.3.xsd diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc index d326aa2dc..db816dc5a 100644 --- a/src/libs/ifc/schema.qrc +++ b/src/libs/ifc/schema.qrc @@ -1,9 +1,5 @@ - schema/pattern/v0.1.0.xsd - schema/pattern/v0.1.1.xsd - schema/pattern/v0.1.2.xsd - schema/pattern/v0.1.3.xsd schema/pattern/v0.1.4.xsd schema/pattern/v0.2.0.xsd schema/pattern/v0.2.1.xsd diff --git a/src/libs/ifc/schema/pattern/v0.1.0.xsd b/src/libs/ifc/schema/pattern/v0.1.0.xsd deleted file mode 100644 index c8cfeb68f..000000000 --- a/src/libs/ifc/schema/pattern/v0.1.0.xsd +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libs/ifc/schema/pattern/v0.1.1.xsd b/src/libs/ifc/schema/pattern/v0.1.1.xsd deleted file mode 100644 index 29453840a..000000000 --- a/src/libs/ifc/schema/pattern/v0.1.1.xsd +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libs/ifc/schema/pattern/v0.1.2.xsd b/src/libs/ifc/schema/pattern/v0.1.2.xsd deleted file mode 100644 index 5da7e47aa..000000000 --- a/src/libs/ifc/schema/pattern/v0.1.2.xsd +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libs/ifc/schema/pattern/v0.1.3.xsd b/src/libs/ifc/schema/pattern/v0.1.3.xsd deleted file mode 100644 index 2bd441616..000000000 --- a/src/libs/ifc/schema/pattern/v0.1.3.xsd +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 4ad1e550e..cd27d8f68 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -58,7 +58,7 @@ class QDomElement; * 4. patch - little change. */ -const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.0"); +const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.4"); const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.7.10"); const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.7.10.xsd"); @@ -179,10 +179,6 @@ QString VPatternConverter::XSDSchema(int ver) const { QHash schemas = { - std::make_pair(FORMAT_VERSION(0, 1, 0), QStringLiteral("://schema/pattern/v0.1.0.xsd")), - std::make_pair(FORMAT_VERSION(0, 1, 1), QStringLiteral("://schema/pattern/v0.1.1.xsd")), - std::make_pair(FORMAT_VERSION(0, 1, 2), QStringLiteral("://schema/pattern/v0.1.2.xsd")), - std::make_pair(FORMAT_VERSION(0, 1, 3), QStringLiteral("://schema/pattern/v0.1.3.xsd")), 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")), @@ -248,22 +244,6 @@ void VPatternConverter::ApplyPatches() { switch (m_ver) { - case (FORMAT_VERSION(0, 1, 0)): - ToV0_1_1(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 1, 1)), m_convertedFileName); - V_FALLTHROUGH - case (FORMAT_VERSION(0, 1, 1)): - ToV0_1_2(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 1, 2)), m_convertedFileName); - V_FALLTHROUGH - case (FORMAT_VERSION(0, 1, 2)): - ToV0_1_3(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 1, 3)), m_convertedFileName); - V_FALLTHROUGH - case (FORMAT_VERSION(0, 1, 3)): - ToV0_1_4(); - ValidateXML(XSDSchema(FORMAT_VERSION(0, 1, 4)), m_convertedFileName); - V_FALLTHROUGH case (FORMAT_VERSION(0, 1, 4)): ToV0_2_0(); ValidateXML(XSDSchema(FORMAT_VERSION(0, 2, 0)), m_convertedFileName); @@ -487,50 +467,6 @@ bool VPatternConverter::IsReadOnly() const return GetParametrBool(pattern, *strReadOnly, falseStr); } -//--------------------------------------------------------------------------------------------------------------------- -void VPatternConverter::ToV0_1_1() -{ - // TODO. Delete if minimal supported version is 0.1.1 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 1, 1), - "Time to refactor the code."); - - SetVersion(QStringLiteral("0.1.1")); - Save(); -} - -//--------------------------------------------------------------------------------------------------------------------- -void VPatternConverter::ToV0_1_2() -{ - // TODO. Delete if minimal supported version is 0.1.2 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 1, 2), - "Time to refactor the code."); - - SetVersion(QStringLiteral("0.1.2")); - Save(); -} - -//--------------------------------------------------------------------------------------------------------------------- -void VPatternConverter::ToV0_1_3() -{ - // TODO. Delete if minimal supported version is 0.1.3 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 1, 3), - "Time to refactor the code."); - - SetVersion(QStringLiteral("0.1.3")); - Save(); -} - -//--------------------------------------------------------------------------------------------------------------------- -void VPatternConverter::ToV0_1_4() -{ - // TODO. Delete if minimal supported version is 0.1.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 1, 4), - "Time to refactor the code."); - - SetVersion(QStringLiteral("0.1.4")); - Save(); -} - //--------------------------------------------------------------------------------------------------------------------- void VPatternConverter::ToV0_2_0() { @@ -1586,8 +1522,8 @@ void VPatternConverter::RemoveColorToolCutV0_3_1() //--------------------------------------------------------------------------------------------------------------------- QString VPatternConverter::MUnitV0_1_4() const { - // TODO. Delete if minimal supported version is 0.1.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 1, 4), + // TODO. Delete if minimal supported version is 0.2.0 + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), "Time to refactor the code."); const QDomElement element = TagMeasurementsV0_1_4(); @@ -1606,8 +1542,8 @@ QString VPatternConverter::MUnitV0_1_4() const //--------------------------------------------------------------------------------------------------------------------- QDomElement VPatternConverter::TagMeasurementsV0_1_4() const { - // TODO. Delete if minimal supported version is 0.1.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 1, 4), + // TODO. Delete if minimal supported version is 0.2.0 + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strMeasurements); @@ -1623,8 +1559,8 @@ QDomElement VPatternConverter::TagMeasurementsV0_1_4() const //--------------------------------------------------------------------------------------------------------------------- QDomElement VPatternConverter::TagIncrementsV0_1_4() const { - // TODO. Delete if minimal supported version is 0.1.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 1, 4), + // TODO. Delete if minimal supported version is 0.2.0 + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 2, 0), "Time to refactor the code."); const QDomNodeList list = elementsByTagName(*strIncrements); diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index e999b119e..42dc51e5a 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -52,7 +52,7 @@ public: static const QString PatternMaxVerStr; static const QString CurrentSchema; - static Q_DECL_CONSTEXPR const int PatternMinVer = FORMAT_VERSION(0, 1, 0); + static Q_DECL_CONSTEXPR const int PatternMinVer = FORMAT_VERSION(0, 1, 4); static Q_DECL_CONSTEXPR const int PatternMaxVer = FORMAT_VERSION(0, 7, 10); protected: @@ -72,10 +72,6 @@ private: Q_DISABLE_COPY(VPatternConverter) static const QString PatternMinVerStr; - void ToV0_1_1(); - void ToV0_1_2(); - void ToV0_1_3(); - void ToV0_1_4(); void ToV0_2_0(); void ToV0_2_1(); void ToV0_2_2();