diff widgets/ProgressDialog.cpp @ 1414:fa986b91d77f

Merge from branch fix-static-analysis
author Chris Cannam
date Wed, 09 Jan 2019 15:24:51 +0000
parents c8a6fd3f9dff
children
line wrap: on
line diff
--- a/widgets/ProgressDialog.cpp	Wed Jan 09 14:41:52 2019 +0000
+++ b/widgets/ProgressDialog.cpp	Wed Jan 09 15:24:51 2019 +0000
@@ -24,11 +24,11 @@
                                int timeBeforeShow,
                                QWidget *parent,
                                Qt::WindowModality modality) : 
-    m_showTimer(0),
+    m_showTimer(nullptr),
     m_timerElapsed(false),
     m_cancelled(false)
 {
-    m_dialog = new QProgressDialog(message, cancellable ? tr("Cancel") : 0,
+    m_dialog = new QProgressDialog(message, cancellable ? tr("Cancel") : nullptr,
                                    0, 100, parent);
     m_dialog->setWindowModality(modality);