194 files changed, 23378 insertions, 24295 deletions

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp
index f2148d0..f3ded7e 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp
@@ -103,6 +103,11 @@
 #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1
 #endif
 
+#if defined(__HP_aCC)
+// HP'a aCC compiler has broken for scoping
+# define for if(0){}else for
+#endif
+
 #ifndef NDEBUG
 namespace WTF {
 
@@ -2902,7 +2907,7 @@ TCMalloc_ThreadCache* TCMalloc_ThreadCache::CreateCacheIfNecessary() {
   // Initialize per-thread data if necessary
   TCMalloc_ThreadCache* heap = NULL;
   {
-    SpinLockHolder h(&pageheap_lock);
+    SpinLockHolder lockholder(&pageheap_lock);
 
 #if COMPILER(MSVC)
     DWORD me;
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
index 2fdb092..af2c31e 100644
--- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
@@ -376,20 +376,20 @@ void MMF::AbstractMediaPlayer::changeState(PrivateState newState)
     setState(newState);
 
     if (
-		LoadingState == oldPhononState
-		and StoppedState == newPhononState
-	) {
-		// Ensure initial volume is set on MMF API before starting playback
-		doVolumeChanged();
-	
-		// Check whether play() was called while clip was being loaded.  If so,
-	    // playback should be started now
-	    if (m_playPending) {
-	        TRACE_0("play was called while loading; starting playback now");
-	        m_playPending = false;
-	        play();
-	    }
-	}
+        LoadingState == oldPhononState
+        and StoppedState == newPhononState
+    ) {
+        // Ensure initial volume is set on MMF API before starting playback
+        doVolumeChanged();
+
+        // Check whether play() was called while clip was being loaded.  If so,
+        // playback should be started now
+        if (m_playPending) {
+            TRACE_0("play was called while loading; starting playback now");
+            m_playPending = false;
+            play();
+        }
+    }
 
     TRACE_EXIT_0();
 }
@@ -400,7 +400,7 @@ void MMF::AbstractMediaPlayer::changeState(PrivateState newState)
 
 void MMF::AbstractMediaPlayer::tick()
 {
-	// For the MWC compiler, we need to qualify the base class.
+    // For the MWC compiler, we need to qualify the base class.
     emit MMF::AbstractPlayer::tick(currentTime());
 }
 
diff --git a/src/3rdparty/phonon/mmf/abstractplayer.h b/src/3rdparty/phonon/mmf/abstractplayer.h
index ec39ab1..08558cf 100644
--- a/src/3rdparty/phonon/mmf/abstractplayer.h
+++ b/src/3rdparty/phonon/mmf/abstractplayer.h
@@ -87,7 +87,7 @@ public:
 
     // VolumeObserver
     virtual void volumeChanged(qreal volume);
-    
+
     void setVideoOutput(VideoOutput* videoOutput);
 
     /**
@@ -146,9 +146,9 @@ private:
 protected:
     // Not owned
     VideoOutput*                m_videoOutput;
-    
+
     qreal                       m_volume;
-    
+
 private:
     PrivateState                m_state;
     Phonon::ErrorType           m_error;
diff --git a/src/3rdparty/phonon/mmf/audioplayer.cpp b/src/3rdparty/phonon/mmf/audioplayer.cpp
index ceaf305..1d259a8 100644
--- a/src/3rdparty/phonon/mmf/audioplayer.cpp
+++ b/src/3rdparty/phonon/mmf/audioplayer.cpp
@@ -213,8 +213,8 @@ void MMF::AudioPlayer::MapcPlayComplete(TInt aError)
     }
 
     /*
-        if(aError == KErrNone) {
-            if(m_nextSource.type() == MediaSource::Empty) {
+        if (aError == KErrNone) {
+            if (m_nextSource.type() == MediaSource::Empty) {
                 emit finished();
             } else {
                 setSource(m_nextSource);
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp
index 76db5cb..29ac2df 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.cpp
+++ b/src/3rdparty/phonon/mmf/mediaobject.cpp
@@ -112,7 +112,7 @@ MMF::MediaType MMF::MediaObject::fileMediaType
     MediaType result = MediaTypeUnknown;
 
     if (openRecognizer()) {
-        
+
         const QHBufC fileNameSymbian(QDir::toNativeSeparators(fileName));
 
         m_file.Close();
diff --git a/src/3rdparty/phonon/mmf/mmf_medianode.cpp b/src/3rdparty/phonon/mmf/mmf_medianode.cpp