rm DoubleProperty::readFrom1

GUI/Model/Descriptor/DoubleProperty.cpp

@@ -53,18 +53,13 @@ void DoubleProperty::writeTo2(QXmlStreamWriter* w, const QString& tag) const
     w->writeEndElement();
 }
 
-void DoubleProperty::readFrom1(QXmlStreamReader* r)
+void DoubleProperty::readFrom2(QXmlStreamReader* r, const QString& tag)
 {
     const uint version = XML::readUInt(r, XML::Attrib::version);
     Q_UNUSED(version)
 
     m_value = XML::readDouble(r, XML::Attrib::value);
     m_uid = XML::readString(r, XML::Attrib::id);
-}
-
-void DoubleProperty::readFrom2(QXmlStreamReader* r, const QString& tag)
-{
-    readFrom1(r);
     XML::gotoEndElementOfTag(r, tag);
 }
 

GUI/Model/Descriptor/DoubleProperty.h

@@ -60,7 +60,6 @@ public:
     void setLimits(const RealLimits& limits) { m_limits = limits; }
 
     void writeTo2(QXmlStreamWriter* w, const QString& tag) const;
-    void readFrom1(QXmlStreamReader* r);
     void readFrom2(QXmlStreamReader* r, const QString& tag);
 
 signals:

GUI/Model/Sim/InstrumentItems.cpp

@@ -248,9 +248,8 @@ void InstrumentItem::readFrom(QXmlStreamReader* r)
             // analyzer efficiency OBSOLETE since v21 (version == 2)
         } else if (version == 1 && tag == Tag::AnalyzerEfficiency) {
             DoubleProperty analyzerEfficiency;
-            analyzerEfficiency.readFrom1(r);
+            analyzerEfficiency.readFrom2(r, tag);
             m_analyzer_bloch_vector.setR3(m_analyzer_bloch_vector.r3() * analyzerEfficiency.dVal());
-            XML::gotoEndElementOfTag(r, tag);
 
             // background
         } else if (tag == Tag::Background) {