1 files changed, 5 insertions, 5 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 2b58402..20adf17 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -301,65 +301,65 @@ void PlayListWidget::setDocument( const QString& fileref ) {
     } else if( fileref.find( "playlist", 0, TRUE) != -1 ) {//is playlist
         clearList();
         loadList( DocLnk( fileref ) );
         d->selectedFiles->first();
     } else {
         clearList();
         addToSelection( DocLnk( fileref ) );
         d->setDocumentUsed = TRUE;
         mediaPlayerState->setPlaying( FALSE );
         qApp->processEvents();
         mediaPlayerState->setPlaying( TRUE );
         qApp->processEvents();
         setCaption( tr("OpiePlayer") );
     }
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 const DocLnk *PlayListWidget::current() { // this is fugly
     switch ( whichList() ) {
       case 0: //playlist
       {
 //      qDebug("playlist");
           if ( mediaPlayerState->playlist() ) {
               return d->selectedFiles->current();
           } else if ( d->setDocumentUsed && d->current ) {
               return d->current;
           } else {
-              return d->files->selected();
+              return &(d->files->selectedDocument());
           }
       }
       break;
     };
     return 0;
 }
 
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState->playlist() ) {
         if ( mediaPlayerState->shuffled() ) {
             const DocLnk *cur = current();
             int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
             for ( int i = 0; i < j; i++ ) {
                 if ( !d->selectedFiles->next() )
                     d->selectedFiles->first();
             }
             if ( cur == current() )
                 if ( !d->selectedFiles->next() ) {
                     d->selectedFiles->first();
                 }
             return TRUE;
         } else {
             if ( !d->selectedFiles->prev() ) {
                 if ( mediaPlayerState->looping() ) {
                     return d->selectedFiles->last();
                 } else {
                     return FALSE;
                 }
             }
             return TRUE;
         }
@@ -619,66 +619,66 @@ void PlayListWidget::btnPlay(bool b) {
 //   case 0:
 //     {
 //       mediaPlayerState->setPlaying(b);
 //     }
 //     break;
 //   case 1:
 //     {
 //       mediaPlayerState->setPlaying(b);
 //       qApp->processEvents();
 //       insanityBool=FALSE;
 //     }//          audioView->clearSelection();
 //     break;
 //   case 2:
 //     {
 //   //     addToSelection( videoView->currentItem() );
 //       mediaPlayerState->setPlaying(b);
 //       qApp->processEvents();
 //   //     d->selectedFiles->removeSelected( );
 // //       tabWidget->setCurrentPage(2);
 // //       d->selectedFiles->unSelect();
 //       insanityBool=FALSE;
 //     }//          videoView->clearSelection();
 //     break;
 //   };
 
 }
 
 void PlayListWidget::deletePlaylist() {
   switch( QMessageBox::information( this, (tr("Remove Playlist?")),
                                     (tr("You really want to delete\nthis playlist?")),
                                     (tr("Yes")), (tr("No")), 0 )){
   case 0: // Yes clicked,
-    QFile().remove(playLists->selected()->file());
-    QFile().remove(playLists->selected()->linkFile());
+    QFile().remove(playLists->selectedDocument().file());
+    QFile().remove(playLists->selectedDocument().linkFile());
     playLists->reread();
     break;
   case 1: // Cancel
     break;
   };
 }
 
 
 void PlayListWidget::playSelected() {
     btnPlay( TRUE);
 }
 
 
 void PlayListWidget::scanForAudio() {
 //  qDebug("scan for audio");
   files.detachChildren();
   QListIterator<DocLnk> sdit( files.children() );
   for ( ; sdit.current(); ++sdit ) {
     delete sdit.current();
   }
   Global::findDocuments(&files, "audio/*");
   audioScan = TRUE;
 }
 
 void PlayListWidget::scanForVideo() {
 //  qDebug("scan for video");
   vFiles.detachChildren();
   QListIterator<DocLnk> sdit( vFiles.children() );
   for ( ; sdit.current(); ++sdit ) {
     delete sdit.current();
   }
   Global::findDocuments(&vFiles, "video/*");
@@ -1019,41 +1019,41 @@ void PlayListWidget::populateSkinsMenu() {
         skinName =  fi->fileName();
 //        qDebug(  fi->fileName() );
         if( skinName != "." &&  skinName != ".." && skinName !="CVS" )  {
             item = skinsMenu->insertItem( fi->fileName() ) ;
         }
         if( skinName == "default" ) {
             defaultSkinIndex = item;
         }
         if( skinName == skin ) {
             skinsMenu->setItemChecked( item, TRUE );
         }
         ++it;
     }
 }
 
 void PlayListWidget::skinsMenuActivated( int item ) {
     for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
         skinsMenu->setItemChecked( i, FALSE );
     }
     skinsMenu->setItemChecked( item, TRUE );
 
     Config cfg( "OpiePlayer" );
     cfg.setGroup("Options");
     cfg.writeEntry("Skin", skinsMenu->text( item ) );
 }
 
 int PlayListWidget::whichList() {
     return tabWidget->currentPageIndex();
 }
 
 QString PlayListWidget::currentFileListPathName() {
     switch (whichList()) {
-      case 1: 
+      case 1:
           return audioView->currentItem()->text(3);
           break;
-      case 2: 
+      case 2:
           return videoView->currentItem()->text(3);
           break;
     };
     return "";
 }