Mercurial > hg > svgui
comparison 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 |
comparison
equal
deleted
inserted
replaced
1413:0930a27ebea2 | 1414:fa986b91d77f |
---|---|
45 | 45 |
46 available << displayNames; | 46 available << displayNames; |
47 | 47 |
48 bool ok = false; | 48 bool ok = false; |
49 QString selected = QInputDialog::getItem | 49 QString selected = QInputDialog::getItem |
50 (0, tr("Select track or tracks to import"), | 50 (nullptr, tr("Select track or tracks to import"), |
51 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:"), | 51 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:"), |
52 available, 0, false, &ok); | 52 available, 0, false, &ok); |
53 | 53 |
54 if (!ok || selected.isEmpty()) return ImportNothing; | 54 if (!ok || selected.isEmpty()) return ImportNothing; |
55 | 55 |
65 } | 65 } |
66 | 66 |
67 void | 67 void |
68 MIDIFileImportDialog::showError(QString error) | 68 MIDIFileImportDialog::showError(QString error) |
69 { | 69 { |
70 QMessageBox::critical(0, tr("Error in MIDI file import"), error); | 70 QMessageBox::critical(nullptr, tr("Error in MIDI file import"), error); |
71 } | 71 } |
72 | 72 |