Mercurial > hg > svgui
diff widgets/MIDIFileImportDialog.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/MIDIFileImportDialog.cpp Wed Jan 09 14:41:52 2019 +0000 +++ b/widgets/MIDIFileImportDialog.cpp Wed Jan 09 15:24:51 2019 +0000 @@ -47,7 +47,7 @@ bool ok = false; QString selected = QInputDialog::getItem - (0, tr("Select track or tracks to import"), + (nullptr, tr("Select track or tracks to import"), tr("<b>Select track to import</b><p>You can only import this file as a single annotation layer, but the file contains more than one track, or notes on more than one channel.<p>Please select the track or merged tracks you wish to import:"), available, 0, false, &ok); @@ -67,6 +67,6 @@ void MIDIFileImportDialog::showError(QString error) { - QMessageBox::critical(0, tr("Error in MIDI file import"), error); + QMessageBox::critical(nullptr, tr("Error in MIDI file import"), error); }