diff -r 69946d1824c4 -r b9e04db066d4 videoplayback/hbvideoplaybackview/tsrc/testmpxvideoplaybackcontrolbar/src/testmpxvideoplaybackcontrolbar.cpp --- a/videoplayback/hbvideoplaybackview/tsrc/testmpxvideoplaybackcontrolbar/src/testmpxvideoplaybackcontrolbar.cpp Mon May 03 12:32:50 2010 +0300 +++ b/videoplayback/hbvideoplaybackview/tsrc/testmpxvideoplaybackcontrolbar/src/testmpxvideoplaybackcontrolbar.cpp Fri May 14 15:53:50 2010 +0300 @@ -15,14 +15,14 @@ * */ -// Version : %version: 1 % +// Version : %version: 2 % #include #include #include -#include "mpxvideoplaybackbuttonbar.h" +#include "mpxvideoplaybacktoolbar.h" #include "mpxvideoplaybackprogressbar.h" #include "testmpxvideoplaybackcontrolbar.h" #include "mpxvideoplaybackviewfiledetails.h" @@ -103,11 +103,11 @@ TMPXPlaybackState state = EPbStatePlaying; mControlBar->updateState( state ); - QVERIFY( mControlBar->mButtonBar->mState == EPbStatePlaying ); + QVERIFY( mControlBar->mToolBar->mState == EPbStatePlaying ); state = EPbStatePaused; mControlBar->updateState( state ); - QVERIFY( mControlBar->mButtonBar->mState == EPbStatePaused ); + QVERIFY( mControlBar->mToolBar->mState == EPbStatePaused ); cleanup(); } @@ -124,7 +124,7 @@ int aspectRatio = 1; mControlBar->aspectRatioChanged( aspectRatio ); - QVERIFY( mControlBar->mButtonBar->mAspectRatio == aspectRatio ); + QVERIFY( mControlBar->mToolBar->mAspectRatio == aspectRatio ); cleanup(); } @@ -145,7 +145,7 @@ mControlBar->updateWithFileDetails( details ); - QVERIFY( mControlBar->mButtonBar->mFileDetails->mSeekable == details->mSeekable ); + QVERIFY( mControlBar->mToolBar->mFileDetails->mSeekable == details->mSeekable ); QVERIFY( mControlBar->mProgressBar->mFileDetails->mVideoEnabled == details->mVideoEnabled ); cleanup();