remove unneeded code

1 files changed, 55 insertions, 78 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 15c70c3..2b58402 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -226,13 +226,13 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , in
     switch (mouse) {
     case 1:
         break;
     case 2:
     {
         QPopupMenu  m;
-        m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
+        m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
         m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
         m.exec( QCursor::pos() );
     }
         break;
     }
 }
@@ -242,13 +242,13 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi
     switch (mouse) {
     case 1:
         break;
     case 2:
     {
         QPopupMenu  m;
-        m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
+        m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
         m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
         m.exec( QCursor::pos() );
     }
     break;
     }
 }
@@ -319,48 +319,24 @@ void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 const DocLnk *PlayListWidget::current() { // this is fugly
     switch ( whichList() ) {
-    case 0: //playlist
-    {
+      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();
-        }
-    }
-    break;
-    case 1://audio
-    {
-//      qDebug("audioView");
-        QListIterator<DocLnk> dit( files.children() );
-        for ( ; dit.current(); ++dit ) {
-            if( dit.current()->name() == audioView->currentItem()->text( 0 ) && !insanityBool ) {
-                insanityBool = TRUE;
-                return dit;
-            }
-        }
-    }
-    break;
-    case 2: // video
-    {
-//      qDebug("videoView");
-        QListIterator<DocLnk> Vdit( vFiles.children() );
-        for ( ; Vdit.current(); ++Vdit ) {
-            if( Vdit.current()->name() == videoView->currentItem()->text( 0 ) && !insanityBool) {
-                insanityBool = TRUE;
-                return Vdit;
-            }
-        }
-    }
-    break;
+          if ( mediaPlayerState->playlist() ) {
+              return d->selectedFiles->current();
+          } else if ( d->setDocumentUsed && d->current ) {
+              return d->current;
+          } else {
+              return d->files->selected();
+          }
+      }
+      break;
     };
     return 0;
 }
 
 
 bool PlayListWidget::prev() {
@@ -493,53 +469,53 @@ void PlayListWidget::setPlaylist( bool shown ) {
 
 void PlayListWidget::addSelected() {
 
     Config cfg( "OpiePlayer" );
     cfg.setGroup("PlayList");
     QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
-    //    int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
+      //    int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
 
     switch (whichList()) {
-    case 0: //playlist
-        break;
-    case 1: { //audio
-        QListViewItemIterator it(  audioView  );
-        // iterate through all items of the listview
-        for ( ; it.current(); ++it ) {
-            if ( it.current()->isSelected() ) {
-                QListIterator<DocLnk> dit( files.children() );
-                for ( ; dit.current(); ++dit ) {
-                    if( dit.current()->name() == it.current()->text(0) ) {
-                        if(QFileInfo( dit.current()->file()).exists())
-                            d->selectedFiles->addToSelection(  **dit );
-                    }
-                }
-                audioView->setSelected( it.current(),FALSE);
-            }
-        }
-        tabWidget->setCurrentPage(0);
-    }
-        break;
-    case 2: { // video
-        QListViewItemIterator it(  videoView  );
-    // iterate through all items of the listview
-        for ( ; it.current(); ++it ) {
-            if ( it.current()->isSelected() ) {
-                QListIterator<DocLnk> dit( vFiles.children() );
-                for ( ; dit.current(); ++dit ) {
-                    if( dit.current()->name() == it.current()->text(0) ) {
-                        if(QFileInfo( dit.current()->file()).exists())
-                            d->selectedFiles->addToSelection(  **dit );
-                    }
-                }
-        videoView->setSelected( it.current(),FALSE);
-            }
-        }
-        tabWidget->setCurrentPage(0);
-    }
-    break;
+      case 0: //playlist
+          break;
+      case 1: { //audio
+          QListViewItemIterator it(  audioView  );
+            // iterate through all items of the listview
+          for ( ; it.current(); ++it ) {
+              if ( it.current()->isSelected() ) {
+                  QListIterator<DocLnk> dit( files.children() );
+                  for ( ; dit.current(); ++dit ) {
+                      if( dit.current()->name() == it.current()->text(0) ) {
+                          if(QFileInfo( dit.current()->file()).exists())
+                              d->selectedFiles->addToSelection(  **dit );
+                      }
+                  }
+                  audioView->setSelected( it.current(),FALSE);
+              }
+          }
+          tabWidget->setCurrentPage(0);
+      }
+          break;
+      case 2: { // video
+          QListViewItemIterator it(  videoView  );
+            // iterate through all items of the listview
+          for ( ; it.current(); ++it ) {
+              if ( it.current()->isSelected() ) {
+                  QListIterator<DocLnk> dit( vFiles.children() );
+                  for ( ; dit.current(); ++dit ) {
+                      if( dit.current()->name() == it.current()->text(0) ) {
+                          if(QFileInfo( dit.current()->file()).exists())
+                              d->selectedFiles->addToSelection(  **dit );
+                      }
+                  }
+                  videoView->setSelected( it.current(),FALSE);
+              }
+          }
+          tabWidget->setCurrentPage(0);
+      }
+          break;
     };
 }
 
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
@@ -632,12 +608,13 @@ void PlayListWidget::tabChanged(QWidget *) {
     break;
     };
 }
 
 
 void PlayListWidget::btnPlay(bool b) {
+//    mediaPlayerState->setPlaying(false);
     mediaPlayerState->setPlaying(b);
     qApp->processEvents();
     insanityBool=FALSE;
 //   switch ( whichList()) {
 //   case 0:
 //     {
@@ -1037,13 +1014,13 @@ void PlayListWidget::populateSkinsMenu() {
     skinsDir.setSorting(QDir::Name );
     const QFileInfoList *skinslist = skinsDir.entryInfoList();
     QFileInfoListIterator it( *skinslist );
     QFileInfo *fi;
     while ( ( fi = it.current() ) ) {
         skinName =  fi->fileName();
-        qDebug(  fi->fileName() );
+//        qDebug(  fi->fileName() );
         if( skinName != "." &&  skinName != ".." && skinName !="CVS" )  {
             item = skinsMenu->insertItem( fi->fileName() ) ;
         }
         if( skinName == "default" ) {
             defaultSkinIndex = item;
         }
@@ -1052,13 +1029,13 @@ void PlayListWidget::populateSkinsMenu() {
         }
         ++it;
     }
 }
 
 void PlayListWidget::skinsMenuActivated( int item ) {
-    for( uint i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
+    for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
         skinsMenu->setItemChecked( i, FALSE );
     }
     skinsMenu->setItemChecked( item, TRUE );
 
     Config cfg( "OpiePlayer" );
     cfg.setGroup("Options");