- removed whichList() alltogether

2 files changed, 11 insertions, 18 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index a8429e3..fd256b7 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -573,13 +573,10 @@ void PlayListWidget::playIt( QListViewItem *it) {
 void PlayListWidget::addToSelection( QListViewItem *it) {
   d->setDocumentUsed = FALSE;
 
   if(it) {
-    switch ( whichList()) {
-    case 0: //playlist
-      return;
-      break;
-    };
+    if ( currentTab() == CurrentPlayList )
+        return;
     //      case 1: {
     DocLnk lnk;
     QString filename;
 
@@ -596,19 +593,19 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
 
 
 void PlayListWidget::tabChanged(QWidget *) {
 
-    switch ( whichList()) {
-    case 0:
+    switch ( currentTab() ) {
+    case CurrentPlayList:
     {
         if( !tbDeletePlaylist->isHidden() )  {
             tbDeletePlaylist->hide();
         }
         d->tbRemoveFromList->setEnabled(TRUE);
         d->tbAddToList->setEnabled(FALSE);
     }
     break;
-    case 1:
+    case AudioFiles:
     {
       //        audioView->clear();
         if(!audioPopulated) populateAudioView();
 
@@ -618,9 +615,9 @@ void PlayListWidget::tabChanged(QWidget *) {
         d->tbRemoveFromList->setEnabled(FALSE);
         d->tbAddToList->setEnabled(TRUE);
     }
     break;
-    case 2:
+    case VideoFiles:
     {
       //        videoView->clear();
         if(!videoPopulated) populateVideoView();
         if( !tbDeletePlaylist->isHidden() ) {
@@ -629,9 +626,9 @@ void PlayListWidget::tabChanged(QWidget *) {
         d->tbRemoveFromList->setEnabled(FALSE);
         d->tbAddToList->setEnabled(TRUE);
     }
     break;
-    case 3:
+    case PlayLists:
     {
         if( tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->show();
         }
@@ -1132,19 +1129,15 @@ void PlayListWidget::skinsMenuActivated( int item ) {
     QMessageBox::warning( this, tr( "OpiePlayer" ),
                                tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) );
 } 
 
-int PlayListWidget::whichList() const {
-    return tabWidget->currentPageIndex();
-}
-
 PlayListWidget::TabType PlayListWidget::currentTab() const
 {
-    static const TabType indexToTabType[ NumTabTypes ] =
+    static const TabType indexToTabType[ TabTypeCount ] =
     { CurrentPlayList, AudioFiles, VideoFiles, PlayLists };
 
     int index = tabWidget->currentPageIndex();
-    assert( index < NumTabTypes && index >= 0 );
+    assert( index < TabTypeCount && index >= 0 );
 
     return indexToTabType[ index ];
 }
 
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 238a75c..2e2ff89 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -54,9 +54,10 @@ class QLabel;
 
 class PlayListWidget : public PlayListWidgetGui {
     Q_OBJECT
 public:
-    enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists, NumTabTypes = 4 };
+    enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists };
+    enum { TabTypeCount = 4 };
 
     PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~PlayListWidget();
     DocLnkSet files;
@@ -67,9 +68,8 @@ public:
     // retrieve the current playlist entry (media file link)
     const DocLnk *current();
     void useSelectedDocument();
     int selected;
-    int whichList() const;
     TabType currentTab() const;
 
 public slots:
     bool first();