FCL/sf/app/musicplayer: comparison mpviewplugins/mpdetailsviewplugin/src/mpdetailsview.cpp

equal deleted inserted replaced

-:ecf06a08d4d9
+:2c5162224003
 MpDetailsView::MpDetailsView()
 : mSongData( 0 ),
 mFrameworkWrapper( 0 ),
 mActivated( false ),
 mWindow( 0 ),
-mSoftKeyBack( 0 ),
+mNavigationBack( 0 ),
 mSongText( NULL ),
 mAlbumText( NULL ),
 mArtistText( NULL ),
 mAlbumArt( NULL ),
 mDocumentLoader( NULL ),
 {
 TX_ENTRY
 if ( mFrameworkWrapper ) {
 delete mFrameworkWrapper;
 }
-if ( mSoftKeyBack ) {
+if ( mNavigationBack ) {
-delete mSoftKeyBack;
+delete mNavigationBack;
 }
 if ( mDocumentLoader ) {
 delete mDocumentLoader;
 }
 if ( mManager ) {
 if ( translatorLoaded ) {
 qApp->installTranslator( mCommonTranslator );
 }
 mWindow = mainWindow();
-mSoftKeyBack = new HbAction( Hb::BackAction, this );
+mNavigationBack = new HbAction( Hb::BackNaviAction, this );
 mFrameworkWrapper = new MpMpxDetailsFrameworkWrapper( );
 mSongData = mFrameworkWrapper->songData();
 mCompositePixmap = QPixmap( 150, 150 );
 mDefaultRecommendationAlbumArt = QPixmap( ":/detailsviewicons/defaultalbumart.png" );
 // TODO: might need later
 setupMenu();
-connect( mSoftKeyBack, SIGNAL( triggered() ), this, SLOT( back() ) );
+connect( mNavigationBack, SIGNAL( triggered() ), this, SLOT( back() ) );
 connect( mShareButton, SIGNAL( clicked() ), this, SLOT( share() ) );
 connect( mSongData, SIGNAL( albumArtReady() ), this, SLOT( albumArtChanged() ) );
 connect( mSongData, SIGNAL( playbackInfoChanged() ), this, SLOT( playbackInfoChanged() ) );
 connect( mSongData, SIGNAL( songDetailInfoChanged() ), this, SLOT( songDetailInfoChanged() ) );
 connect( mSongDetailsGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( toggleInspireMeGroupBox( bool ) ) );
 Activates the details view.
 */
 void MpDetailsView::activateView()
 {
 TX_ENTRY
-setNavigationAction( mSoftKeyBack );
+setNavigationAction( mNavigationBack );
 mFrameworkWrapper->retrieveSong();
 mActivated = true;
 TX_EXIT
 }

changeset 34	2c5162224003
parent 22	ecf06a08d4d9
child 29	8192e5b5c935