From 6018d7a21a1ba336a59e3cda161b7cfeb144b4b5 Mon Sep 17 00:00:00 2001
From: Frans Englich <frans.englich@nokia.com>
Date: Fri, 16 Oct 2009 16:31:27 +0200
Subject: Kill warning, simplify code.

Reviewed-by: TrustMe
---
 src/3rdparty/phonon/mmf/audiooutput.cpp | 6 ++++--
 1 file 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
-- 
cgit v0.12