ProjectDocument: rnm

GUI/Model/Job/JobItem.cpp

@@ -447,7 +447,7 @@ void JobItem::writeTo(QXmlStreamWriter* writer) const
     // NOTE: The ordering of the XML elements are important in initialization
 
     // simulation options
-    writer->writeStartElement(Tags::SimulationOptions);
+    writer->writeStartElement(Tag::SimulationOptions);
     m_simulationOptionsItem->writeContentTo(writer);
     writer->writeEndElement();
 
@@ -455,12 +455,12 @@ void JobItem::writeTo(QXmlStreamWriter* writer) const
     Streamer(writer).write<InstrumentItemCatalog>(Tag::Instrument, m_instrument.get());
 
     // sample
-    writer->writeStartElement(Tags::Sample);
+    writer->writeStartElement(Tag::Sample);
     m_sampleItem->writeContentTo(writer);
     writer->writeEndElement();
 
     // parameters
-    writer->writeStartElement(Tags::ParameterContainer);
+    writer->writeStartElement(Tag::ParameterContainer);
     m_parameterContainer->writeContentTo(writer);
     writer->writeEndElement();
 
@@ -552,9 +552,9 @@ void JobItem::readFrom(QXmlStreamReader* reader)
     while (reader->readNextStartElement()) {
 
         // simulation options
-        if (reader->name() == Tags::SimulationOptions) {
+        if (reader->name() == Tag::SimulationOptions) {
             m_simulationOptionsItem->readContentFrom(reader);
-            GUI::Session::XML::gotoEndElementOfTag(reader, Tags::SimulationOptions);
+            GUI::Session::XML::gotoEndElementOfTag(reader, Tag::SimulationOptions);
 
             // instrument
         } else if (reader->name() == Tag::Instrument) {
@@ -563,14 +563,14 @@ void JobItem::readFrom(QXmlStreamReader* reader)
             m_instrument.reset(p);
 
             // parameters
-        } else if (reader->name() == Tags::ParameterContainer) {
+        } else if (reader->name() == Tag::ParameterContainer) {
             m_parameterContainer->readContentFrom(reader);
-            GUI::Session::XML::gotoEndElementOfTag(reader, Tags::ParameterContainer);
+            GUI::Session::XML::gotoEndElementOfTag(reader, Tag::ParameterContainer);
 
             // sample
-        } else if (reader->name() == Tags::Sample) {
+        } else if (reader->name() == Tag::Sample) {
             m_sampleItem->readContentFrom(reader);
-            GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Sample);
+            GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Sample);
 
             // activity
         } else if (reader->name() == Tag::Activity) {

GUI/Model/Project/ProjectDocument.cpp

@@ -35,6 +35,7 @@
 #include <memory>
 
 namespace {
+
 const QString minimal_supported_version = "1.6.0";
 
 namespace Tag {
@@ -49,10 +50,11 @@ const QString Instruments("Instruments");
 
 namespace Attrib {
 
-const QString BornAgainVersionAttribute("Version");
-const QString ProjectName("ProjectName");
+const QString version("version");
+const QString projectName("projectName");
 
 } // namespace Attrib
+
 } // namespace
 
 
@@ -317,8 +319,7 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
             if (reader.isStartElement()) {
                 if (reader.name() == Tag::BornAgain) {
                     Streamer(&reader).assertVersion(2);
-                    m_currentVersion =
-                        reader.attributes().value(Attrib::BornAgainVersionAttribute).toString();
+                    m_currentVersion = reader.attributes().value(Attrib::version).toString();
 
                     if (!GUI::Util::Path::isVersionMatchMinimal(m_currentVersion,
                                                                 minimal_supported_version)) {
@@ -391,11 +392,11 @@ void ProjectDocument::writeTo(QIODevice* device)
     writer.writeStartDocument();
     writer.writeStartElement(Tag::BornAgain);
     QString version_string = GUI::Util::Path::getBornAgainVersionString();
-    writer.writeAttribute(Attrib::BornAgainVersionAttribute, version_string);
+    writer.writeAttribute(Attrib::version, version_string);
     Streamer(&writer).writeVersion(2);
 
     writer.writeStartElement(Tag::DocumentInfo);
-    writer.writeAttribute(Attrib::ProjectName, projectName());
+    writer.writeAttribute(Attrib::projectName, projectName());
     writer.writeEndElement(); // InfoTag
 
     writer.writeStartElement(Tag::SimulationOptions);