Reformatted code to comply with Qt style

1 files changed, 196 insertions, 211 deletions

diff --git a/src/3rdparty/phonon/mmf/videoplayer.cpp b/src/3rdparty/phonon/mmf/videoplayer.cpp
index ba06379..f008edd 100644
--- a/src/3rdparty/phonon/mmf/videoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/videoplayer.cpp
@@ -20,7 +20,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTimer>
 #include <QWidget>
 
-#include <coemain.h>	// For CCoeEnv
+#include <coemain.h>    // For CCoeEnv
 #include <coecntrl.h>
 
 #include "videoplayer.h"
@@ -36,70 +36,68 @@ using namespace Phonon::MMF;
 //-----------------------------------------------------------------------------
 
 MMF::VideoPlayer::VideoPlayer()
-								:	m_wsSession(NULL)
-								,	m_screenDevice(NULL)
-								,	m_window(NULL)
-								,   m_totalTime(0)
+        :   m_wsSession(NULL)
+        ,   m_screenDevice(NULL)
+        ,   m_window(NULL)
+        ,   m_totalTime(0)
 {
-	construct();
+    construct();
 }
 
 MMF::VideoPlayer::VideoPlayer(const AbstractPlayer& player)
-								:	AbstractMediaPlayer(player)
-								,	m_wsSession(NULL)
-								,	m_screenDevice(NULL)
-								,	m_window(NULL)
-                                ,   m_totalTime(0)
+        :   AbstractMediaPlayer(player)
+        ,   m_wsSession(NULL)
+        ,   m_screenDevice(NULL)
+        ,   m_window(NULL)
+        ,   m_totalTime(0)
 {
-	construct();
+    construct();
 }
 
 void MMF::VideoPlayer::construct()
 {
-	TRACE_CONTEXT(VideoPlayer::VideoPlayer, EVideoApi);
-	TRACE_ENTRY_0();
-	
-	if(!m_videoOutput)
-	{
-		m_dummyVideoOutput.reset(new VideoOutput(NULL));
-	}
-	
-	videoOutput().setObserver(this);
-	
-	const TInt priority = 0;
-	const TMdaPriorityPreference preference = EMdaPriorityPreferenceNone;
-	
-	getNativeWindowSystemHandles();
-	
-	// TODO: is this the correct way to handle errors which occur when
-	// creating a Symbian object in the constructor of a Qt object?
-	TRAPD(err,
-		m_player = CVideoPlayerUtility::NewL
-			(
-			*this, 
-			priority, preference,
-			*m_wsSession, *m_screenDevice,
-			*m_window,
-			m_windowRect, m_clipRect
-			)
-		);
-	
-	if(KErrNone != err)
-	{
-		changeState(ErrorState);
-	}
-	
-	TRACE_EXIT_0();
+    TRACE_CONTEXT(VideoPlayer::VideoPlayer, EVideoApi);
+    TRACE_ENTRY_0();
+
+    if (!m_videoOutput) {
+        m_dummyVideoOutput.reset(new VideoOutput(NULL));
+    }
+
+    videoOutput().setObserver(this);
+
+    const TInt priority = 0;
+    const TMdaPriorityPreference preference = EMdaPriorityPreferenceNone;
+
+    getNativeWindowSystemHandles();
+
+    // TODO: is this the correct way to handle errors which occur when
+    // creating a Symbian object in the constructor of a Qt object?
+    TRAPD(err,
+          m_player = CVideoPlayerUtility::NewL
+                     (
+                         *this,
+                         priority, preference,
+                         *m_wsSession, *m_screenDevice,
+                         *m_window,
+                         m_windowRect, m_clipRect
+                     )
+         );
+
+    if (KErrNone != err) {
+        changeState(ErrorState);
+    }
+
+    TRACE_EXIT_0();
 }
 
 MMF::VideoPlayer::~VideoPlayer()
 {
-	TRACE_CONTEXT(VideoPlayer::~VideoPlayer, EVideoApi);
+    TRACE_CONTEXT(VideoPlayer::~VideoPlayer, EVideoApi);
     TRACE_ENTRY_0();
-		
-	delete m_player;
-	
-	TRACE_EXIT_0();
+
+    delete m_player;
+
+    TRACE_EXIT_0();
 }
 
 //-----------------------------------------------------------------------------
@@ -107,35 +105,33 @@ MMF::VideoPlayer::~VideoPlayer()
 //-----------------------------------------------------------------------------
 
 void MMF::VideoPlayer::doPlay()
-{    
-	m_player->Play();
+{
+    m_player->Play();
 }
 
 void MMF::VideoPlayer::doPause()
 {
-	TRACE_CONTEXT(VideoPlayer::doPause, EVideoApi);
-
-	TRAPD(err, m_player->PauseL());
-	if(KErrNone != err)
-	{
-		TRACE("PauseL error %d", err);
-		setError(NormalError);
-	}
+    TRACE_CONTEXT(VideoPlayer::doPause, EVideoApi);
+
+    TRAPD(err, m_player->PauseL());
+    if (KErrNone != err) {
+        TRACE("PauseL error %d", err);
+        setError(NormalError);
+    }
 }
 
 void MMF::VideoPlayer::doStop()
 {
-	m_player->Stop();
+    m_player->Stop();
 }
 
 void MMF::VideoPlayer::doSeek(qint64 ms)
 {
     TRACE_CONTEXT(VideoPlayer::doSeek, EVideoApi);
-    
+
     TRAPD(err, m_player->SetPositionL(TTimeIntervalMicroSeconds(ms * 1000)));
 
-    if(KErrNone != err)
-    {
+    if (KErrNone != err) {
         TRACE("SetPositionL error %d", err);
         setError(NormalError);
     }
@@ -143,48 +139,45 @@ void MMF::VideoPlayer::doSeek(qint64 ms)
 
 int MMF::VideoPlayer::setDeviceVolume(int mmfVolume)
 {
-	TRAPD(err, m_player->SetVolumeL(mmfVolume));
-	return err;
+    TRAPD(err, m_player->SetVolumeL(mmfVolume));
+    return err;
 }
 
 int MMF::VideoPlayer::openFile(RFile& file)
 {
-	TRAPD(err, m_player->OpenFileL(file));
-	return err;
+    TRAPD(err, m_player->OpenFileL(file));
+    return err;
 }
 
 void MMF::VideoPlayer::close()
 {
-	m_player->Close();
+    m_player->Close();
 }
 
 bool MMF::VideoPlayer::hasVideo() const
 {
-	return true;
+    return true;
 }
 
 qint64 MMF::VideoPlayer::currentTime() const
 {
-	TRACE_CONTEXT(VideoPlayer::currentTime, EVideoApi);
+    TRACE_CONTEXT(VideoPlayer::currentTime, EVideoApi);
 
-	TTimeIntervalMicroSeconds us;
+    TTimeIntervalMicroSeconds us;
     TRAPD(err, us = m_player->PositionL())
 
     qint64 result = 0;
 
-    if(KErrNone == err)
-    {
+    if (KErrNone == err) {
         result = toMilliSeconds(us);
+    } else {
+        TRACE("PositionL error %d", err);
+
+        // If we don't cast away constness here, we simply have to ignore
+        // the error.
+        const_cast<VideoPlayer*>(this)->setError(NormalError);
     }
-    else
-    {
-		TRACE("PositionL error %d", err);
-		
-		// If we don't cast away constness here, we simply have to ignore 
-		// the error.
-    	const_cast<VideoPlayer*>(this)->setError(NormalError);
-    }
-    
+
     return result;
 }
 
@@ -200,60 +193,54 @@ qint64 MMF::VideoPlayer::totalTime() const
 
 void MMF::VideoPlayer::MvpuoOpenComplete(TInt aError)
 {
-	TRACE_CONTEXT(VideoPlayer::MvpuoOpenComplete, EVideoApi);
+    TRACE_CONTEXT(VideoPlayer::MvpuoOpenComplete, EVideoApi);
     TRACE_ENTRY("state %d error %d", state(), aError);
 
     __ASSERT_ALWAYS(LoadingState == state(), Utils::panic(InvalidStatePanic));
 
-	if(KErrNone == aError)
-	{
-		m_player->Prepare();
-	}
-	else
-	{	
-		// TODO: set different error states according to value of aError?
-		setError(NormalError);
-	}
-    
+    if (KErrNone == aError) {
+        m_player->Prepare();
+    } else {
+        // TODO: set different error states according to value of aError?
+        setError(NormalError);
+    }
+
     TRACE_EXIT_0();
 }
 
 void MMF::VideoPlayer::MvpuoPrepareComplete(TInt aError)
 {
-	TRACE_CONTEXT(VideoPlayer::MvpuoPrepareComplete, EVideoApi);
-	TRACE_ENTRY("state %d error %d", state(), aError);
+    TRACE_CONTEXT(VideoPlayer::MvpuoPrepareComplete, EVideoApi);
+    TRACE_ENTRY("state %d error %d", state(), aError);
 
     __ASSERT_ALWAYS(LoadingState == state(), Utils::panic(InvalidStatePanic));
-    
+
     TRAPD(err, doPrepareCompleteL(aError));
-    
-	if(KErrNone == err)
-	{
-		maxVolumeChanged(m_player->MaxVolume());
-		
-		videoOutput().setFrameSize(m_frameSize);	    
+
+    if (KErrNone == err) {
+        maxVolumeChanged(m_player->MaxVolume());
+
+        videoOutput().setFrameSize(m_frameSize);
 
         emit totalTimeChanged(totalTime());
         changeState(StoppedState);
-	}
-    else
-	{
-	    // TODO: set different error states according to value of aError?
-	    setError(NormalError);   
-	}
-	
-	TRACE_EXIT_0();
+    } else {
+        // TODO: set different error states according to value of aError?
+        setError(NormalError);
+    }
+
+    TRACE_EXIT_0();
 }
 
 void MMF::VideoPlayer::doPrepareCompleteL(TInt aError)
 {
     User::LeaveIfError(aError);
-    
+
     // Get frame size
     TSize size;
     m_player->VideoFrameSizeL(size);
     m_frameSize = QSize(size.iWidth, size.iHeight);
-    
+
     // Get duration
     m_totalTime = toMilliSeconds(m_player->DurationL());
 }
@@ -261,36 +248,36 @@ void MMF::VideoPlayer::doPrepareCompleteL(TInt aError)
 
 void MMF::VideoPlayer::MvpuoFrameReady(CFbsBitmap &aFrame, TInt aError)
 {
-	TRACE_CONTEXT(VideoPlayer::MvpuoFrameReady, EVideoApi);
-	TRACE_ENTRY("state %d error %d", state(), aError);
-
-	// TODO
-	Q_UNUSED(aFrame);
-	Q_UNUSED(aError);	// suppress warnings in release builds
-	
-	TRACE_EXIT_0();
+    TRACE_CONTEXT(VideoPlayer::MvpuoFrameReady, EVideoApi);
+    TRACE_ENTRY("state %d error %d", state(), aError);
+
+    // TODO
+    Q_UNUSED(aFrame);
+    Q_UNUSED(aError);   // suppress warnings in release builds
+
+    TRACE_EXIT_0();
 }
 
 void MMF::VideoPlayer::MvpuoPlayComplete(TInt aError)
 {
-	TRACE_CONTEXT(VideoPlayer::MvpuoPlayComplete, EVideoApi)
-	TRACE_ENTRY("state %d error %d", state(), aError);
+    TRACE_CONTEXT(VideoPlayer::MvpuoPlayComplete, EVideoApi)
+    TRACE_ENTRY("state %d error %d", state(), aError);
 
-	// TODO
-	Q_UNUSED(aError);	// suppress warnings in release builds
-	
-	TRACE_EXIT_0();
+    // TODO
+    Q_UNUSED(aError);   // suppress warnings in release builds
+
+    TRACE_EXIT_0();
 }
 
 void MMF::VideoPlayer::MvpuoEvent(const TMMFEvent &aEvent)
 {
-	TRACE_CONTEXT(VideoPlayer::MvpuoEvent, EVideoApi);
-	TRACE_ENTRY("state %d", state());
+    TRACE_CONTEXT(VideoPlayer::MvpuoEvent, EVideoApi);
+    TRACE_ENTRY("state %d", state());
 
-	// TODO
-	Q_UNUSED(aEvent);
-	
-	TRACE_EXIT_0();
+    // TODO
+    Q_UNUSED(aEvent);
+
+    TRACE_EXIT_0();
 }
 
 
@@ -302,28 +289,27 @@ void MMF::VideoPlayer::videoOutputRegionChanged()
 {
     TRACE_CONTEXT(VideoPlayer::videoOutputRegionChanged, EVideoInternal);
     TRACE_ENTRY_0();
-    
+
 #ifdef PHONON_MMF_DEBUG_VIDEO_OUTPUT
     videoOutput().dump();
 #endif
-    
+
     getNativeWindowSystemHandles();
-        
+
     TRAPD(err,
-        m_player->SetDisplayWindowL
-            (
-            *m_wsSession, *m_screenDevice,
-            *m_window,
-            m_windowRect, m_clipRect
-            )
-        );
-    
-    if(KErrNone != err)
-    {
+          m_player->SetDisplayWindowL
+          (
+              *m_wsSession, *m_screenDevice,
+              *m_window,
+              m_windowRect, m_clipRect
+          )
+         );
+
+    if (KErrNone != err) {
         TRACE("SetDisplayWindowL error %d", err);
         setError(NormalError);
     }
-    
+
     TRACE_EXIT_0();
 }
 
@@ -334,81 +320,80 @@ void MMF::VideoPlayer::videoOutputRegionChanged()
 
 VideoOutput& MMF::VideoPlayer::videoOutput()
 {
-	TRACE_CONTEXT(VideoPlayer::videoOutput, EVideoInternal);
-	TRACE("videoOutput 0x%08x dummy 0x%08x", m_videoOutput, m_dummyVideoOutput.data());
+    TRACE_CONTEXT(VideoPlayer::videoOutput, EVideoInternal);
+    TRACE("videoOutput 0x%08x dummy 0x%08x", m_videoOutput, m_dummyVideoOutput.data());
 
-	return m_videoOutput ? *m_videoOutput : *m_dummyVideoOutput;
+    return m_videoOutput ? *m_videoOutput : *m_dummyVideoOutput;
 }
 
 void MMF::VideoPlayer::videoOutputChanged()
 {
-	TRACE_CONTEXT(VideoPlayer::videoOutputChanged, EVideoInternal);
-	TRACE_ENTRY_0();
-	
-	// Lazily construct a dummy output if needed here
-	if(!m_videoOutput and m_dummyVideoOutput.isNull())
-	{
-		m_dummyVideoOutput.reset(new VideoOutput(NULL));
-	}
-	
-	videoOutput().setObserver(this);
-	
-	videoOutput().setFrameSize(m_frameSize);
-	
-	videoOutputRegionChanged();
-	
-	TRACE_EXIT_0();
+    TRACE_CONTEXT(VideoPlayer::videoOutputChanged, EVideoInternal);
+    TRACE_ENTRY_0();
+
+    // Lazily construct a dummy output if needed here
+    if (!m_videoOutput and m_dummyVideoOutput.isNull()) {
+        m_dummyVideoOutput.reset(new VideoOutput(NULL));
+    }
+
+    videoOutput().setObserver(this);
+
+    videoOutput().setFrameSize(m_frameSize);
+
+    videoOutputRegionChanged();
+
+    TRACE_EXIT_0();
 }
 
 void MMF::VideoPlayer::getNativeWindowSystemHandles()
 {
-	TRACE_CONTEXT(VideoPlayer::getNativeWindowSystemHandles, EVideoInternal);
-
-	VideoOutput& output = videoOutput();
-	CCoeControl* const control = output.winId();
-	
-	TRACE("control               0x%08x", control);
-	TRACE("control IsVisible     %d", control->IsVisible());
-	TRACE("control IsDimmed      %d", control->IsDimmed());
-	TRACE("control HasBorder     %d", control->HasBorder());
-	TRACE("control Position      %d %d",
-		control->Position().iX, control->Position().iY);
-	TRACE("control Rect          %d %d - %d %d",
-		control->Rect().iTl.iX, control->Rect().iTl.iY,
-		control->Rect().iBr.iX, control->Rect().iBr.iY);
-	TRACE("control OwnsWindow    %d", control->OwnsWindow());
-	
-	CCoeEnv* const coeEnv = control->ControlEnv();
-	
-	m_wsSession = &(coeEnv->WsSession());
-	
-	TRACE("session Handle        0x%08x", m_wsSession->Handle());
-	
-	m_screenDevice = coeEnv->ScreenDevice();
-	
-	TRACE("device WsHandle       0x%08x", m_screenDevice->WsHandle());
-	
-	m_window = control->DrawableWindow();
-	
-	TRACE("window ClientHandle   0x%08x", m_window->ClientHandle());
-	TRACE("window WsHandle       0x%08x", m_window->WsHandle());
-	TRACE("window WindowGroupId  %d", m_window->WindowGroupId());
-	TRACE("window Position       %d %d",
-		m_window->Position().iX, m_window->Position().iY);
-	TRACE("window AbsPosition    %d %d",
-	    m_window->AbsPosition().iX, m_window->AbsPosition().iY);
-	TRACE("window Size           %d %d",
-        m_window->Size().iWidth, m_window->Size().iHeight);
-	
+    TRACE_CONTEXT(VideoPlayer::getNativeWindowSystemHandles, EVideoInternal);
+
+    VideoOutput& output = videoOutput();
+    CCoeControl* const control = output.winId();
+
+    TRACE("control               0x%08x", control);
+    TRACE("control IsVisible     %d", control->IsVisible());
+    TRACE("control IsDimmed      %d", control->IsDimmed());
+    TRACE("control HasBorder     %d", control->HasBorder());
+    TRACE("control Position      %d %d",
+          control->Position().iX, control->Position().iY);
+    TRACE("control Rect          %d %d - %d %d",
+          control->Rect().iTl.iX, control->Rect().iTl.iY,
+          control->Rect().iBr.iX, control->Rect().iBr.iY);
+    TRACE("control OwnsWindow    %d", control->OwnsWindow());
+
+    CCoeEnv* const coeEnv = control->ControlEnv();
+
+    m_wsSession = &(coeEnv->WsSession());
+
+    TRACE("session Handle        0x%08x", m_wsSession->Handle());
+
+    m_screenDevice = coeEnv->ScreenDevice();
+
+    TRACE("device WsHandle       0x%08x", m_screenDevice->WsHandle());
+
+    m_window = control->DrawableWindow();
+
+    TRACE("window ClientHandle   0x%08x", m_window->ClientHandle());
+    TRACE("window WsHandle       0x%08x", m_window->WsHandle());
+    TRACE("window WindowGroupId  %d", m_window->WindowGroupId());
+    TRACE("window Position       %d %d",
+          m_window->Position().iX, m_window->Position().iY);
+    TRACE("window AbsPosition    %d %d",
+          m_window->AbsPosition().iX, m_window->AbsPosition().iY);
+    TRACE("window Size           %d %d",
+          m_window->Size().iWidth, m_window->Size().iHeight);
+
 #ifdef PHONON_MMF_HARD_CODE_VIDEO_RECT
-	// HACK: why isn't control->Rect updated following a call to 
-	// updateGeometry on the parent widget?
-	m_windowRect = TRect(0,100,320,250);
+    // HACK: why isn't control->Rect updated following a call to
+    // updateGeometry on the parent widget?
+    m_windowRect = TRect(0, 100, 320, 250);
 #else
-	m_windowRect = control->Rect();
+    m_windowRect = control->Rect();
 #endif
-	
-	m_clipRect = m_windowRect;
+
+    m_clipRect = m_windowRect;
 }