- more whichList usage removed

1 files changed, 7 insertions, 13 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 11a7b5c..a708cf6 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -412,48 +412,43 @@ void PlayListWidget::setDocument( const QString& fileref ) {
         addToSelection( DocLnk( fileref ) );
         writeCurrentM3u();          
         
         d->setDocumentUsed = TRUE;
         mediaPlayerState->setPlaying( FALSE );
         mediaPlayerState->setPlaying( TRUE );
     }
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 const DocLnk *PlayListWidget::current() { // this is fugly
-    switch ( whichList() ) {
-      case 0: //playlist
-      {
+    assert( currentTab() == CurrentPlayList );
+
 //      qDebug("playlist");
           if ( mediaPlayerState->isUsingPlaylist() ) {
               return d->selectedFiles->current();
           } else if ( d->setDocumentUsed && d->current ) {
               return d->current;
           } else {
               return &(d->files->selectedDocument());
           }
       }
-      break;
-    };
-    return 0;
-}
 
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState->isUsingPlaylist() ) {
         if ( mediaPlayerState->isShuffled() ) {
             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;
@@ -1145,26 +1140,25 @@ void PlayListWidget::skinsMenuActivated( int item ) {
 int PlayListWidget::whichList() const {
     return tabWidget->currentPageIndex();
 }
 
 PlayListWidget::TabType PlayListWidget::currentTab() const
 {
     static const TabType indexToTabType[ NumTabTypes ] =
     { CurrentPlayList, AudioFiles, VideoFiles, PlayLists };
 
     int index = tabWidget->currentPageIndex();
     assert( index < NumTabTypes && index >= 0 );
 
     return indexToTabType[ index ];
 }
 
 QString PlayListWidget::currentFileListPathName() const {
-    switch (whichList()) {
-      case 1:
+    switch (currentTab()) {
+      case AudioFiles:
           return audioView->currentItem()->text(3);
-          break;
-      case 2:
+      case VideoFiles:
           return videoView->currentItem()->text(3);
-          break;
+      default: assert( false );
     };
-    return "";
+    return QString::null;
 }