diff framework/SVFileReader.cpp @ 686:610fa108fbcc by-id

Update for changes to PlayParameters

--- a/framework/SVFileReader.cpp	Thu Jul 04 14:31:22 2019 +0100
+++ b/framework/SVFileReader.cpp	Thu Jul 04 18:04:59 2019 +0100
@@ -61,7 +61,6 @@
     m_currentDataset(XmlExportable::NO_ID),
     m_currentLayer(nullptr),
     m_pendingDerivedModel(XmlExportable::NO_ID),
-    m_currentPlayParameters(nullptr),
     m_currentTransformChannel(0),
     m_currentTransformIsNewStyle(true),
     m_datasetSeparator(" "),
@@ -358,7 +357,7 @@
     } else if (name == "selections") {
         m_inSelections = false;
     } else if (name == "playparameters") {
-        m_currentPlayParameters = nullptr;
+        m_currentPlayParameters = {};
     }
 
     return true;
@@ -1373,7 +1372,7 @@
 bool
 SVFileReader::readPlayParameters(const QXmlAttributes &attributes)
 {
-    m_currentPlayParameters = nullptr;
+    m_currentPlayParameters = {};
 
     int modelExportId = 0;
     bool modelOk = false;
@@ -1388,7 +1387,7 @@
 
         bool ok = false;
 
-        PlayParameters *parameters = PlayParameterRepository::getInstance()->
+        auto parameters = PlayParameterRepository::getInstance()->
             getPlayParameters(m_models[modelExportId].untyped);
 
         if (!parameters) {