summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-04 11:51:16 (UTC)
committer simon <simon>2002-12-04 11:51:16 (UTC)
commitd75c4d9a27fcfc38ac3f9fd58f6b398809ec6a94 (patch) (side-by-side diff)
tree48ef914d460feaaec1a29860067a5b84fb862ae6
parentdf599e48ffde0e5272e511bba57363ac28a67b2d (diff)
downloadopie-d75c4d9a27fcfc38ac3f9fd58f6b398809ec6a94.zip
opie-d75c4d9a27fcfc38ac3f9fd58f6b398809ec6a94.tar.gz
opie-d75c4d9a27fcfc38ac3f9fd58f6b398809ec6a94.tar.bz2
- scannedFiles is no more public
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
@@ -7,20 +7,16 @@
class PlayListFileView : public PlayListView
{
Q_OBJECT
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();
private:
QString m_mimeTypePattern;
QString m_itemPixmapName;
DocLnkSet m_files;
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
@@ -245,36 +245,30 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi
}
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;
// iterate through all items of the listview
for ( ; audioIt.current(); ++audioIt ) {
filename = audioIt.current()->text(3);
lnk.setName( QFileInfo(filename).baseName() ); //sets name
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);
lnk.setName( QFileInfo(filename).baseName() ); //sets name
lnk.setFile( filename ); //sets file name
d->selectedFiles->addToSelection( lnk);
}
@@ -305,20 +299,17 @@ void PlayListWidget::addAllToList() {
writeCurrentM3u();
d->selectedFiles->first();
}
void PlayListWidget::addAllMusicToList() {
- if(!audioView->scannedFiles()) {
- if(audioView->childCount() < 1)
- audioView->populateView();
- }
+ audioView->populateView();
QListViewItemIterator audioIt( audioView );
DocLnk lnk;
QString filename;
// iterate through all items of the listview
for ( ; audioIt.current(); ++audioIt ) {
filename = audioIt.current()->text(3);
lnk.setName( QFileInfo(filename).baseName() ); //sets name
@@ -338,20 +329,17 @@ void PlayListWidget::addAllMusicToList() {
tabWidget->setCurrentPage(0);
writeCurrentM3u();
d->selectedFiles->first();
}
void PlayListWidget::addAllVideoToList() {
- if(!videoView->scannedFiles()) {
- if(videoView->childCount() < 1)
- videoView->populateView();
- }
+ videoView->populateView();
QListViewItemIterator videoIt( videoView );
DocLnk lnk;
QString filename;
for ( ; videoIt.current(); ++videoIt ) {
filename = videoIt.current()->text(3);
lnk.setName( QFileInfo(filename).baseName() ); //sets name
lnk.setFile( filename ); //sets file name