ProjectDocument: shorten var names

GUI/Model/Project/ProjectDocument.cpp

@@ -302,37 +302,37 @@ void ProjectDocument::onModelChanged()
 
 void ProjectDocument::writeProject(QIODevice* device)
 {
-    QXmlStreamWriter writer(device);
-    writer.setAutoFormatting(true);
-    writer.writeStartDocument();
-    writer.writeStartElement(Tag::BornAgain);
+    QXmlStreamWriter w(device);
+    w.setAutoFormatting(true);
+    w.writeStartDocument();
+    w.writeStartElement(Tag::BornAgain);
     QString version_string = GUI::Util::Path::getBornAgainVersionString();
-    writer.writeAttribute(XML::Attrib::BA_Version, version_string);
-    Streamer(&writer).writeVersion(2);
+    w.writeAttribute(XML::Attrib::BA_Version, version_string);
+    Streamer(&w).writeVersion(2);
 
-    writer.writeStartElement(Tag::DocumentInfo);
-    writer.writeAttribute(XML::Attrib::projectName, projectName());
-    writer.writeEndElement();
+    w.writeStartElement(Tag::DocumentInfo);
+    w.writeAttribute(XML::Attrib::projectName, projectName());
+    w.writeEndElement();
 
     // simulation options
-    writer.writeStartElement(Tag::SimulationOptions);
-    m_simulationOptionsItem.writeTo(&writer);
-    writer.writeEndElement();
+    w.writeStartElement(Tag::SimulationOptions);
+    m_simulationOptionsItem.writeTo(&w);
+    w.writeEndElement();
 
     // samples
-    writer.writeStartElement(Tag::SampleModel);
-    m_sampleItems.writeTo(&writer);
-    writer.writeEndElement();
+    w.writeStartElement(Tag::SampleModel);
+    m_sampleItems.writeTo(&w);
+    w.writeEndElement();
 
-    writer.writeStartElement(Tag::Instruments);
-    Streamer sInstruments(&writer);
+    w.writeStartElement(Tag::Instruments);
+    Streamer sInstruments(&w);
     m_instruments.serialize(sInstruments);
-    writer.writeEndElement();
+    w.writeEndElement();
 
-    m_applicationModels.writeTo(&writer);
+    m_applicationModels.writeTo(&w);
 
-    writer.writeEndElement(); // BornAgain tag
-    writer.writeEndDocument();
+    w.writeEndElement(); // BornAgain tag
+    w.writeEndDocument();
 }
 
 ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
@@ -340,15 +340,15 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
 {
     const int warningsBefore = messageService.warnings().size();
 
-    QXmlStreamReader reader(device);
+    QXmlStreamReader r(device);
     try {
-        while (!reader.atEnd()) {
-            reader.readNext();
-            if (reader.isStartElement()) {
-                if (reader.name() == Tag::BornAgain) {
-                    Streamer(&reader).assertVersion(2);
+        while (!r.atEnd()) {
+            r.readNext();
+            if (r.isStartElement()) {
+                if (r.name() == Tag::BornAgain) {
+                    Streamer(&r).assertVersion(2);
                     m_currentVersion =
-                        reader.attributes().value(XML::Attrib::BA_Version).toString();
+                        r.attributes().value(XML::Attrib::BA_Version).toString();
 
                     if (!GUI::Util::Path::isVersionMatchMinimal(m_currentVersion,
                                                                 minimal_supported_version)) {
@@ -360,48 +360,48 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
                         return ReadResult::error;
                     }
 
-                    while (reader.readNextStartElement()) {
-                        QString tag = reader.name().toString();
+                    while (r.readNextStartElement()) {
+                        QString tag = r.name().toString();
 
                         if (tag == Tag::DocumentInfo) {
-                            reader.skipCurrentElement();
+                            r.skipCurrentElement();
 
                             // simulation options
                         } else if (tag == Tag::SimulationOptions) {
-                            m_simulationOptionsItem.readFrom(&reader);
-                            XML::gotoEndElementOfTag(&reader, tag);
+                            m_simulationOptionsItem.readFrom(&r);
+                            XML::gotoEndElementOfTag(&r, tag);
 
                             // samples
-                        } else if (name == Tag::SampleModel) {
-                            m_sampleItems.readFrom(&reader);
-                            XML::gotoEndElementOfTag(&reader, tag);
+                        } else if (tag == Tag::SampleModel) {
+                            m_sampleItems.readFrom(&r);
+                            XML::gotoEndElementOfTag(&r, tag);
 
-                        } else if (reader.name() == Tag::Instruments) {
-                            Streamer s(&reader);
+                        } else if (r.name() == Tag::Instruments) {
+                            Streamer s(&r);
                             m_instruments.serialize(s);
                             // cleanup
-                            if (reader.name() != Tag::Instruments) {
-                                if (!reader.isEndElement())
-                                    reader.skipCurrentElement();
-                                reader.skipCurrentElement();
+                            if (r.name() != Tag::Instruments) {
+                                if (!r.isEndElement())
+                                    r.skipCurrentElement();
+                                r.skipCurrentElement();
                             }
-                            XML::assertExpectedTag(&reader, Tag::Instruments);
-                            ASSERT(reader.isEndElement());
+                            XML::assertExpectedTag(&r, Tag::Instruments);
+                            ASSERT(r.isEndElement());
 
-                            XML::assertExpectedTag(&reader, Tag::Instruments);
+                            XML::assertExpectedTag(&r, Tag::Instruments);
                         } else
-                            m_applicationModels.readFrom(&reader, &messageService);
+                            m_applicationModels.readFrom(&r, &messageService);
                     }
                 }
             }
         }
 
     } catch (DeserializationException& ex) {
-        reader.raiseError(ex.text());
+        r.raiseError(ex.text());
     }
 
-    if (reader.hasError()) {
-        QString message = QString("Format error '%1'").arg(reader.errorString());
+    if (r.hasError()) {
+        QString message = QString("Format error '%1'").arg(r.errorString());
         messageService.addError(this, message);
         return ReadResult::error;
     }