From 458efa7b0c935cbaafa2791021a5f8f7241aa876 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 2 May 2011 22:38:52 +0000 Subject: Initial TQt4 port of Rosegarden This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/sound/MappedInstrument.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sound/MappedInstrument.cpp') diff --git a/src/sound/MappedInstrument.cpp b/src/sound/MappedInstrument.cpp index a3c366f..626fd35 100644 --- a/src/sound/MappedInstrument.cpp +++ b/src/sound/MappedInstrument.cpp @@ -90,7 +90,7 @@ operator>>(TQDataStream &dS, MappedInstrument *mI) mI->setType(Instrument::InstrumentType(type)); mI->setChannel(MidiByte(channel)); mI->setId(InstrumentId(id)); - mI->setName(std::string(name.data())); + mI->setName(std::string(name.ascii())); mI->setDevice(DeviceId(device)); mI->setAudioChannels(audioChannels); @@ -113,7 +113,7 @@ operator>>(TQDataStream &dS, MappedInstrument &mI) mI.setType(Instrument::InstrumentType(type)); mI.setChannel(MidiByte(channel)); mI.setId(InstrumentId(id)); - mI.setName(std::string(name.data())); + mI.setName(std::string(name.ascii())); mI.setDevice(DeviceId(device)); mI.setAudioChannels(audioChannels); -- cgit v1.2.1