summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 09:47:04 (UTC)
committer simon <simon>2002-12-09 09:47:04 (UTC)
commit7ccd9b65ab621dbf8bf79c053141af81fb39ca4b (patch) (side-by-side diff)
treef0f06b67b5f041cf51eb4eb9e3e407e543f3d556
parent88882051547c9c62f47fb83d87f1341ebccf99a7 (diff)
downloadopie-7ccd9b65ab621dbf8bf79c053141af81fb39ca4b.zip
opie-7ccd9b65ab621dbf8bf79c053141af81fb39ca4b.tar.gz
opie-7ccd9b65ab621dbf8bf79c053141af81fb39ca4b.tar.bz2
- replaced currentFileListView method with a variable
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp26
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.h3
2 files changed, 12 insertions, 17 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index b78ce24..889667c 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -56,7 +56,8 @@
#include <assert.h>
PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
- : PlayListWidgetGui( mediaPlayerState, parent, name ) {
+ : PlayListWidgetGui( mediaPlayerState, parent, name ) , currentFileListView( 0 )
+{
d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ),
"opieplayer2/add_to_playlist",
@@ -477,8 +478,7 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
void PlayListWidget::addSelected() {
assert( inFileListMode() );
- QListView *fileListView = currentFileListView();
- QListViewItemIterator it( fileListView );
+ QListViewItemIterator it( currentFileListView );
for ( ; it.current(); ++it )
if ( it.current()->isSelected() ) {
QString filename = it.current()->text(3);
@@ -490,7 +490,7 @@ void PlayListWidget::addSelected() {
d->selectedFiles->addToSelection( lnk );
}
- fileListView->clearSelection();
+ currentFileListView->clearSelection();
tabWidget->setCurrentPage( 0 );
writeCurrentM3u();
@@ -542,6 +542,8 @@ void PlayListWidget::tabChanged(QWidget *) {
disconnect( videoView, SIGNAL( itemsSelected( bool ) ),
d->tbPlay, SLOT( setEnabled( bool ) ) );
+ currentFileListView = 0;
+
switch ( currentTab() ) {
case CurrentPlayList:
{
@@ -568,6 +570,8 @@ void PlayListWidget::tabChanged(QWidget *) {
d->tbPlay, SLOT( setEnabled( bool ) ) );
d->tbPlay->setEnabled( audioView->hasSelection() );
+
+ currentFileListView = audioView;
}
break;
case VideoFiles:
@@ -583,6 +587,8 @@ void PlayListWidget::tabChanged(QWidget *) {
d->tbPlay, SLOT( setEnabled( bool ) ) );
d->tbPlay->setEnabled( videoView->hasSelection() );
+
+ currentFileListView = videoView;
}
break;
case PlayLists:
@@ -625,16 +631,6 @@ void PlayListWidget::playSelected() {
btnPlay( TRUE);
}
-QListView *PlayListWidget::currentFileListView() const
-{
- switch ( currentTab() ) {
- case AudioFiles: return audioView;
- case VideoFiles: return videoView;
- default: assert( false );
- }
- return 0;
-}
-
bool PlayListWidget::inFileListMode() const
{
TabType tab = currentTab();
@@ -1009,5 +1005,5 @@ PlayListWidget::Entry PlayListWidget::currentEntry() const
}
QString PlayListWidget::currentFileListPathName() const {
- return currentFileListView()->currentItem()->text( 3 );
+ return currentFileListView->currentItem()->text( 3 );
}
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 5c8f30c..e8bf211 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -98,8 +98,6 @@ private:
void readPls(const QString &);
void initializeStates();
- QListView *currentFileListView() const;
-
bool inFileListMode() const;
private slots:
@@ -133,6 +131,7 @@ private:
bool insanityBool;
QString setDocFileRef, currentPlayList;
int selected;
+ QListView *currentFileListView;
};
#endif // PLAY_LIST_WIDGET_H