summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/ds9/effect.cpp
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-04-07 11:48:13 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-04-07 11:53:22 (GMT)
commit6253ced81bcd60c04803f1a52bc59a239022b9c4 (patch)
treec042d724a097fd1b25d3d0b6fdb3bbcc0f7c3074 /src/3rdparty/phonon/ds9/effect.cpp
parente56af88f159ceee5f9613ab57b2358601e79c081 (diff)
downloadQt-6253ced81bcd60c04803f1a52bc59a239022b9c4.zip
Qt-6253ced81bcd60c04803f1a52bc59a239022b9c4.tar.gz
Qt-6253ced81bcd60c04803f1a52bc59a239022b9c4.tar.bz2
Revert "Update Phonon ds9 backend to 4.4.0."
This reverts commit 19a3fc3bd817628070e5637caf158b0be79eee82. The phonon backend in 4.4.0 is outdated. Qt has the most recent one. Conflicts: src/3rdparty/phonon/ds9/iodevicereader.cpp
Diffstat (limited to 'src/3rdparty/phonon/ds9/effect.cpp')
-rw-r--r--src/3rdparty/phonon/ds9/effect.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/ds9/effect.cpp b/src/3rdparty/phonon/ds9/effect.cpp
index 104a3c1..ebe976b 100644
--- a/src/3rdparty/phonon/ds9/effect.cpp
+++ b/src/3rdparty/phonon/ds9/effect.cpp
@@ -82,7 +82,7 @@ namespace Phonon
current += wcslen(current) + 1; //skip the name
current += wcslen(current) + 1; //skip the unit
for(; *current; current += wcslen(current) + 1) {
- values.append( QString::fromUtf16((unsigned short*)current) );
+ values.append( QString::fromWCharArray(current) );
}
}
//FALLTHROUGH
@@ -107,7 +107,7 @@ namespace Phonon
Phonon::EffectParameter::Hints hint = info.mopCaps == MP_CAPS_CURVE_INVSQUARE ?
Phonon::EffectParameter::LogarithmicHint : Phonon::EffectParameter::Hints(0);
- const QString n = QString::fromUtf16((unsigned short*)name);
+ const QString n = QString::fromWCharArray(name);
ret.append(Phonon::EffectParameter(i, n, hint, def, min, max, values));
::CoTaskMemFree(name); //let's free the memory
}