Fixed compilation error and one warning, when building with RVCT

3 files changed, 12 insertions, 11 deletions

diff --git a/src/3rdparty/phonon/mmf/abstractplayer.cpp b/src/3rdparty/phonon/mmf/abstractplayer.cpp
index 62fccef..24ef20a 100644
--- a/src/3rdparty/phonon/mmf/abstractplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractplayer.cpp
@@ -32,9 +32,9 @@ using namespace Phonon::MMF;
 
 MMF::AbstractPlayer::AbstractPlayer()
         :   m_videoOutput(0)
+        ,   m_volume(InitialVolume)
         ,   m_state(GroundState)
         ,   m_error(NoError)
-        ,   m_volume(InitialVolume)
         ,   m_tickInterval(DefaultTickInterval)
         ,   m_transitionTime(0)
         ,   m_prefinishMark(0)
@@ -44,9 +44,9 @@ MMF::AbstractPlayer::AbstractPlayer()
 
 MMF::AbstractPlayer::AbstractPlayer(const AbstractPlayer& player)
         :   m_videoOutput(player.m_videoOutput)
+        ,   m_volume(player.m_volume)
         ,   m_state(GroundState)
         ,   m_error(NoError)
-        ,   m_volume(player.m_volume)
         ,   m_tickInterval(player.tickInterval())
         ,   m_transitionTime(player.transitionTime())
         ,   m_prefinishMark(player.prefinishMark())
diff --git a/src/3rdparty/phonon/mmf/abstractplayer.h b/src/3rdparty/phonon/mmf/abstractplayer.h
index 276a47d..ec39ab1 100644
--- a/src/3rdparty/phonon/mmf/abstractplayer.h
+++ b/src/3rdparty/phonon/mmf/abstractplayer.h
@@ -147,7 +147,7 @@ protected:
     // Not owned
     VideoOutput*                m_videoOutput;
     
-    qreal						m_volume;
+    qreal                       m_volume;
     
 private:
     PrivateState                m_state;
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp
index f9bbb15..0591e05 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.cpp
+++ b/src/3rdparty/phonon/mmf/mediaobject.cpp
@@ -243,14 +243,15 @@ void MMF::MediaObject::createPlayer(const MediaSource &source)
         break;
 
     case MediaSource::Url:
-        const QUrl url(source.url());
-
-        if (url.scheme() == QLatin1String("file")) {
-            mediaType = fileMediaType(url.toLocalFile());
-        }
-        else {
-            TRACE_0("Network streaming not supported yet");
-            error = NormalError;
+        {
+            const QUrl url(source.url());
+            if (url.scheme() == QLatin1String("file")) {
+                mediaType = fileMediaType(url.toLocalFile());
+            }
+            else {
+                TRACE_0("Network streaming not supported yet");
+                error = NormalError;
+            }
         }
         break;