summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-10-16 14:31:27 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-16 15:17:09 (GMT)
commit6018d7a21a1ba336a59e3cda161b7cfeb144b4b5 (patch)
tree706f5e76b000209233c3b30cb517723a669443b3
parent4f48e43dc4f8237875d7d4a61bf4e55ab92e3941 (diff)
downloadQt-6018d7a21a1ba336a59e3cda161b7cfeb144b4b5.zip
Qt-6018d7a21a1ba336a59e3cda161b7cfeb144b4b5.tar.gz
Qt-6018d7a21a1ba336a59e3cda161b7cfeb144b4b5.tar.bz2
Kill warning, simplify code.
Reviewed-by: TrustMe
-rw-r--r--src/3rdparty/phonon/mmf/audiooutput.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/audiooutput.cpp b/src/3rdparty/phonon/mmf/audiooutput.cpp
index 5a00f60..bb0e5bc 100644
--- a/src/3rdparty/phonon/mmf/audiooutput.cpp
+++ b/src/3rdparty/phonon/mmf/audiooutput.cpp
@@ -102,15 +102,17 @@ bool MMF::AudioOutput::activateOnMediaObject(MediaObject *mo)
QHash<QByteArray, QVariant> MMF::AudioOutput::audioOutputDescription(int index)
{
+ QHash<QByteArray, QVariant> retval;
+
if (index == AudioOutputDeviceID) {
QHash<QByteArray, QVariant> retval;
retval.insert("name", QCoreApplication::translate("Phonon::MMF", "Audio Output"));
retval.insert("description", QCoreApplication::translate("Phonon::MMF", "The audio output device"));
retval.insert("available", true);
-
- return retval;
}
+
+ return retval;
}
QT_END_NAMESPACE