summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 16:47:13 (UTC)
committer simon <simon>2002-12-02 16:47:13 (UTC)
commit0b30001a6e9aef6de72577ba3a4957eeb0febf54 (patch) (side-by-side diff)
treefaa9f4c0970c64520507ed48e8eb25008927e05a
parentcb03905d1be2f8b98f770201bc4cb98f75c80c1d (diff)
downloadopie-0b30001a6e9aef6de72577ba3a4957eeb0febf54.zip
opie-0b30001a6e9aef6de72577ba3a4957eeb0febf54.tar.gz
opie-0b30001a6e9aef6de72577ba3a4957eeb0febf54.tar.bz2
- removed unused (and uninitialized) FileSelector *PlayListWidgetPrivate::files
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.h1
2 files changed, 3 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index b04fe8d..55b66ab 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -425,21 +425,20 @@ void PlayListWidget::useSelectedDocument() {
const DocLnk *PlayListWidget::current() const { // this is fugly
assert( currentTab() == CurrentPlayList );
// qDebug("playlist");
if ( mediaPlayerState->isUsingPlaylist() ) {
return d->selectedFiles->current();
- } else if ( d->setDocumentUsed && d->current ) {
+ } else if ( d->setDocumentUsed && d->current )
return d->current;
- } else {
- return &(d->files->selectedDocument());
- }
+
+ assert( false );
}
bool PlayListWidget::prev() {
if ( mediaPlayerState->isUsingPlaylist() ) {
if ( mediaPlayerState->isShuffled() ) {
const DocLnk *cur = current();
int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
index 61fd40d..6c35771 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
@@ -57,17 +57,16 @@ class QListView;
class QPoint;
class QAction;
class QLabel;
class PlayListWidgetPrivate {
public:
QToolButton *tbPlay, *tbFull, *tbLoop, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
QFrame *playListFrame;
- FileSelector *files;
PlayListSelection *selectedFiles;
bool setDocumentUsed;
DocLnk *current;
};
class ToolButton : public QToolButton {
public: