summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistfileview.h4
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp20
2 files changed, 4 insertions, 20 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.h b/noncore/multimedia/opieplayer2/playlistfileview.h
index abe1bb8..6eea2fc 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.h
+++ b/noncore/multimedia/opieplayer2/playlistfileview.h
@@ -11,12 +11,8 @@ class PlayListFileView : public PlayListView
public:
PlayListFileView( const QString &mimeTypePattern, const QString &itemPixmapName, QWidget *parent, const char *name = 0 );
virtual ~PlayListFileView();
- // both temporarily accessible that way until the caller code has
- // been migrated into this class
- bool &scannedFiles() { return m_scannedFiles; }
-
public slots:
void scanFiles();
void populateView();
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index eb0606d..e754067 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -249,12 +249,9 @@ void PlayListWidget::addAllToList() {
// QTime t;
// t.start();
- if(!audioView->scannedFiles()) {
- if(audioView->childCount() < 1)
- audioView->populateView();
- }
+ audioView->populateView();
QListViewItemIterator audioIt( audioView );
DocLnk lnk;
QString filename;
@@ -265,12 +262,9 @@ void PlayListWidget::addAllToList() {
lnk.setFile( filename ); //sets file name
d->selectedFiles->addToSelection( lnk);
}
- if(!videoView->scannedFiles()) {
- if(videoView->childCount() < 1)
- videoView->populateView();
- }
+ videoView->populateView();
QListViewItemIterator videoIt( videoView );
for ( ; videoIt.current(); ++videoIt ) {
filename = videoIt.current()->text(3);
@@ -309,12 +303,9 @@ void PlayListWidget::addAllToList() {
void PlayListWidget::addAllMusicToList() {
- if(!audioView->scannedFiles()) {
- if(audioView->childCount() < 1)
- audioView->populateView();
- }
+ audioView->populateView();
QListViewItemIterator audioIt( audioView );
DocLnk lnk;
QString filename;
@@ -342,12 +333,9 @@ void PlayListWidget::addAllMusicToList() {
void PlayListWidget::addAllVideoToList() {
- if(!videoView->scannedFiles()) {
- if(videoView->childCount() < 1)
- videoView->populateView();
- }
+ videoView->populateView();
QListViewItemIterator videoIt( videoView );
DocLnk lnk;
QString filename;