From 80eb2649b9db8fa5b3ee5878e2028c83c4eab34b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 13 May 2016 20:40:55 +0300 Subject: [PATCH] Refactoring. --HG-- branch : feature --- src/libs/ifc/xml/vpatternconverter.cpp | 70 ++++++-------------------- src/libs/ifc/xml/vvitconverter.cpp | 20 ++------ src/libs/ifc/xml/vvstconverter.cpp | 15 ++---- 3 files changed, 21 insertions(+), 84 deletions(-) diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index c0e2914b8..961d1251c 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -130,103 +130,61 @@ void VPatternConverter::ApplyPatches() switch (ver) { case (0x000100): - { ToV0_1_1(); - const QString schema = XSDSchema(0x000101); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000101), fileName); V_FALLTHROUGH - } case (0x000101): - { ToV0_1_2(); - const QString schema = XSDSchema(0x000102); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000102), fileName); V_FALLTHROUGH - } case (0x000102): - { ToV0_1_3(); - const QString schema = XSDSchema(0x000103); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000103), fileName); V_FALLTHROUGH - } case (0x000103): - { ToV0_1_4(); - const QString schema = XSDSchema(0x000104); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000104), fileName); V_FALLTHROUGH - } case (0x000104): - { ToV0_2_0(); - const QString schema = XSDSchema(0x000200); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000200), fileName); V_FALLTHROUGH - } case (0x000200): - { ToV0_2_1(); - const QString schema = XSDSchema(0x000201); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000201), fileName); V_FALLTHROUGH - } case (0x000201): - { ToV0_2_2(); - const QString schema = XSDSchema(0x000202); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000202), fileName); V_FALLTHROUGH - } case (0x000202): - { ToV0_2_3(); - const QString schema = XSDSchema(0x000203); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000203), fileName); V_FALLTHROUGH - } case (0x000203): - { ToV0_2_4(); - const QString schema = XSDSchema(0x000204); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000204), fileName); V_FALLTHROUGH - } case (0x000204): - { ToV0_2_5(); - const QString schema = XSDSchema(0x000205); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000205), fileName); V_FALLTHROUGH - } case (0x000205): - { ToV0_2_6(); - const QString schema = XSDSchema(0x000206); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000206), fileName); V_FALLTHROUGH - } case (0x000206): - { ToV0_2_7(); - const QString schema = XSDSchema(0x000207); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000207), fileName); V_FALLTHROUGH - } case (0x000207): - { ToV0_3_0(); - const QString schema = XSDSchema(0x000300); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000300), fileName); V_FALLTHROUGH - } case (0x000300): - { ToV0_3_1(); - const QString schema = XSDSchema(0x000301); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000301), fileName); V_FALLTHROUGH - } case (0x000301): break; default: diff --git a/src/libs/ifc/xml/vvitconverter.cpp b/src/libs/ifc/xml/vvitconverter.cpp index 75d9cdb57..0cf65d017 100644 --- a/src/libs/ifc/xml/vvitconverter.cpp +++ b/src/libs/ifc/xml/vvitconverter.cpp @@ -107,33 +107,21 @@ void VVITConverter::ApplyPatches() switch (ver) { case (0x000200): - { ToV0_3_0(); - const QString schema = XSDSchema(0x000300); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000300), fileName); V_FALLTHROUGH - } case (0x000300): - { ToV0_3_1(); - const QString schema = XSDSchema(0x000301); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000301), fileName); V_FALLTHROUGH - } case (0x000301): - { ToV0_3_2(); - const QString schema = XSDSchema(0x000302); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000302), fileName); V_FALLTHROUGH - } case (0x000302): - { ToV0_3_3(); - const QString schema = XSDSchema(0x000303); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000303), fileName); V_FALLTHROUGH - } case (0x000303): break; default: diff --git a/src/libs/ifc/xml/vvstconverter.cpp b/src/libs/ifc/xml/vvstconverter.cpp index b65c80f94..e1385205c 100644 --- a/src/libs/ifc/xml/vvstconverter.cpp +++ b/src/libs/ifc/xml/vvstconverter.cpp @@ -105,26 +105,17 @@ void VVSTConverter::ApplyPatches() switch (ver) { case (0x000300): - { ToV0_4_0(); - const QString schema = XSDSchema(0x000400); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000400), fileName); V_FALLTHROUGH - } case (0x000400): - { ToV0_4_1(); - const QString schema = XSDSchema(0x000401); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000401), fileName); V_FALLTHROUGH - } case (0x000401): - { ToV0_4_2(); - const QString schema = XSDSchema(0x000402); - ValidateXML(schema, fileName); + ValidateXML(XSDSchema(0x000402), fileName); V_FALLTHROUGH - } case (0x000402): break; default: