Mercurial > hg > svapp

diff framework/Align.cpp @ 644:6fd0ebfd2bbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch fix-static-analysis
author Chris Cannam
date Wed, 09 Jan 2019 15:25:09 +0000
parents e2715204feaa
children 284cb118368e e19c609a7bec
line wrap: on
line diff
--- a/framework/Align.cpp	Wed Jan 09 14:42:25 2019 +0000
+++ b/framework/Align.cpp	Wed Jan 09 15:25:09 2019 +0000
@@ -178,7 +178,7 @@
         return false; // but this should have been tested already
     }
 
-    while (!reference->isReady(0) || !rm->isReady(0)) {
+    while (!reference->isReady(nullptr) || !rm->isReady(nullptr)) {
         qApp->processEvents();
     }
     
@@ -203,7 +203,7 @@
 
     m_error = "";
     
-    AlignmentModel *alignmentModel = new AlignmentModel(reference, other, 0, 0);
+    AlignmentModel *alignmentModel = new AlignmentModel(reference, other, nullptr, nullptr);
     rm->setAlignment(alignmentModel);
 
     QProcess *process = new QProcess;
@@ -223,7 +223,7 @@
              << endl;
         m_error = "Alignment program could not be started";
         m_processModels.erase(process);
-        rm->setAlignment(0); // deletes alignmentModel as well
+        rm->setAlignment(nullptr); // deletes alignmentModel as well
         delete process;
     }