- added currentFileListView() method that returns the current file list

  qlistview object and simplified currentFileListPathName with that

1 files changed, 10 insertions, 8 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index a708cf6..92da73b 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -780,24 +780,33 @@ void PlayListWidget::populateVideoView() {
 
         QListViewItem * newItem;
         if ( QFile( Vdit.current()->file() ).exists() ) {
             newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
                    QString::number( QFile( Vdit.current()->file() ).size() ),
                                                    ""/*storage*/, Vdit.current()->file());
             newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ) );
         }
     }
     videoPopulated=true;
 }
 
+QListView *PlayListWidget::currentFileListView() const
+{
+    switch ( currentTab() ) {
+        case AudioFiles: return audioView;
+        case VideoFiles: return videoView;
+        default: assert( false );
+    }
+    return 0;
+}
 
 void PlayListWidget::openFile() {
                 // http://66.28.164.33:2080
                 // http://somafm.com/star0242.m3u
     QString filename, name;
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         filename = fileDlg->text();
         qDebug( "Selected filename is " + filename );
         //            Om3u *m3uList;
@@ -1144,21 +1153,14 @@ int PlayListWidget::whichList() const {
 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 (currentTab()) {
-      case AudioFiles:
-          return audioView->currentItem()->text(3);
-      case VideoFiles:
-          return videoView->currentItem()->text(3);
-      default: assert( false );
-    };
-    return QString::null;
+    return currentFileListView()->currentItem()->text( 3 );
 }