diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
commit | 458efa7b0c935cbaafa2791021a5f8f7241aa876 (patch) | |
tree | 624583f2873febe23770bee3fa94b5c24bd59f4f /src/sound/MappedDevice.cpp | |
parent | 747037b72944ae2c02962b7c5c96e0a7f8852e38 (diff) | |
download | rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.tar.gz rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.zip |
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
Diffstat (limited to 'src/sound/MappedDevice.cpp')
-rw-r--r-- | src/sound/MappedDevice.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sound/MappedDevice.cpp b/src/sound/MappedDevice.cpp index e5a9dd8..bc7fd39 100644 --- a/src/sound/MappedDevice.cpp +++ b/src/sound/MappedDevice.cpp @@ -137,8 +137,8 @@ operator>>(TQDataStream &dS, MappedDevice *mD) dS >> recording; mD->setId(id); mD->setType(Device::DeviceType(dType)); - mD->setName(std::string(name.data())); - mD->setConnection(connection.data()); + mD->setName(std::string(name.ascii())); + mD->setConnection(connection.ascii()); mD->setDirection(MidiDevice::DeviceDirection(direction)); mD->setRecording((bool)recording); @@ -182,8 +182,8 @@ operator>>(TQDataStream &dS, MappedDevice &mD) dS >> recording; mD.setId(id); mD.setType(Device::DeviceType(dType)); - mD.setName(std::string(name.data())); - mD.setConnection(connection.data()); + mD.setName(std::string(name.ascii())); + mD.setConnection(connection.ascii()); mD.setDirection(MidiDevice::DeviceDirection(direction)); mD.setRecording((bool)recording); |