diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-10-15 23:50:16 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-10-15 23:50:16 +0000 |
| commit | 0e4fa958b9cab8ab68147df204abe0e33ee5e405 (patch) | |
| tree | c8f413d36423f650bb3d4f52ad0409cf9e7dee75 | |
| parent | ca3ddb66fdd961d7da39b45747ff844bffc80dec (diff) | |
See ChangeLog
| -rw-r--r-- | muse/ChangeLog | 3 | ||||
| -rw-r--r-- | muse/muse/app.cpp | 3 | ||||
| -rw-r--r-- | muse/muse/mididev.cpp | 3 | ||||
| -rw-r--r-- | muse/muse/widgets/mtrackinfobase.ui | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog index 7ed5c5fa..c04a62e8 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,6 +1,9 @@ 15.10.2010 * Feature: Unified Jack midi devices in midi ports list. Can be both input and output, just like ALSA devices. (T356) - Marked as p3.3.55 + * Corrected: Three things which did not compile in conversion to new muse-2: (T356) + - <string>true</string> -> <bool>true</bool> in mtrackinfobase.ui, for recEchoButton toggleButton property. (T356) + - Surround with QString(): "strerror(errno)" in MusE::save(), and "incstr" in MidiDeviceList::add(). (T356) 09.10.2010 * Fixed: Gluing of midi track parts, over tempo changes, caused incorrect note times and lengths. (T356) - Fixed Song::cmdGluePart(). diff --git a/muse/muse/app.cpp b/muse/muse/app.cpp index 9edeb20d..f9ea88d6 100644 --- a/muse/muse/app.cpp +++ b/muse/muse/app.cpp @@ -1797,7 +1797,8 @@ bool MusE::save(const QString& name, bool overwriteWarn) write(xml); if (ferror(f)) { QString s = "Write File\n" + name + "\nfailed: " - + strerror(errno); + //+ strerror(errno); + + QString(strerror(errno)); // p4.0.0 QMessageBox::critical(this, tr("MusE: Write File failed"), s); popenFlag? pclose(f) : fclose(f); diff --git a/muse/muse/mididev.cpp b/muse/muse/mididev.cpp index 7f52fc2e..d8f91d6e 100644 --- a/muse/muse/mididev.cpp +++ b/muse/muse/mididev.cpp @@ -386,7 +386,8 @@ void MidiDeviceList::add(MidiDevice* dev) { char incstr[4]; sprintf(incstr,"_%d",++increment);; - dev->setName(origname + incstr); + //dev->setName(origname + incstr); + dev->setName(origname + QString(incstr)); // p4.0.0 gotUniqueName = false; } } diff --git a/muse/muse/widgets/mtrackinfobase.ui b/muse/muse/widgets/mtrackinfobase.ui index 3d2b274a..06e881d5 100644 --- a/muse/muse/widgets/mtrackinfobase.ui +++ b/muse/muse/widgets/mtrackinfobase.ui @@ -446,7 +446,7 @@ </sizepolicy> </property> <property name="toggleButton"> - <string>true</string> + <bool>true</bool> </property> <property name="whatsThis" stdset="0"> <string>Echo recording events to output.</string> |