Mercurial > hg > svgui
comparison 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 |
comparison
equal
deleted
inserted
replaced
1413:0930a27ebea2 | 1414:fa986b91d77f |
---|---|
22 ProgressDialog::ProgressDialog(QString message, | 22 ProgressDialog::ProgressDialog(QString message, |
23 bool cancellable, | 23 bool cancellable, |
24 int timeBeforeShow, | 24 int timeBeforeShow, |
25 QWidget *parent, | 25 QWidget *parent, |
26 Qt::WindowModality modality) : | 26 Qt::WindowModality modality) : |
27 m_showTimer(0), | 27 m_showTimer(nullptr), |
28 m_timerElapsed(false), | 28 m_timerElapsed(false), |
29 m_cancelled(false) | 29 m_cancelled(false) |
30 { | 30 { |
31 m_dialog = new QProgressDialog(message, cancellable ? tr("Cancel") : 0, | 31 m_dialog = new QProgressDialog(message, cancellable ? tr("Cancel") : nullptr, |
32 0, 100, parent); | 32 0, 100, parent); |
33 m_dialog->setWindowModality(modality); | 33 m_dialog->setWindowModality(modality); |
34 | 34 |
35 if (timeBeforeShow > 0) { | 35 if (timeBeforeShow > 0) { |
36 m_dialog->hide(); | 36 m_dialog->hide(); |