summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistselection.cpp3
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp16
2 files changed, 8 insertions, 11 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistselection.cpp b/noncore/multimedia/opieplayer2/playlistselection.cpp
index 975dec3..2019b3a 100644
--- a/noncore/multimedia/opieplayer2/playlistselection.cpp
+++ b/noncore/multimedia/opieplayer2/playlistselection.cpp
@@ -115,6 +115,5 @@ void PlayListSelection::addToSelection( const DocLnk &lnk ) {
void PlayListSelection::removeSelected() {
QListViewItem *item = selectedItem();
- if ( item )
- delete item;
+ delete item;
setSelected( currentItem(), TRUE );
ensureItemVisible( selectedItem() );
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 86b3424..ac52b07 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -192,5 +192,5 @@ void PlayListWidget::writeDefaultPlaylist() {
m3uList->write();
m3uList->close();
- if(m3uList) delete m3uList;
+ delete m3uList;
}
@@ -685,7 +685,5 @@ void PlayListWidget::openFile() {
}
- if( fileDlg ) {
- delete fileDlg;
- }
+ delete fileDlg;
}
@@ -735,5 +733,5 @@ void PlayListWidget::readm3u( const QString &filename ) {
// m3uList->write();
m3uList->close();
- if(m3uList) delete m3uList;
+ delete m3uList;
d->selectedFiles->setSelectedItem( s);
@@ -783,5 +781,5 @@ void PlayListWidget::readPls( const QString &filename ) {
m3uList->close();
- if(m3uList) delete m3uList;
+ delete m3uList;
}
@@ -807,5 +805,5 @@ void PlayListWidget::writeCurrentM3u() {
m3uList->close();
- if(m3uList) delete m3uList;
+ delete m3uList;
}
@@ -843,7 +841,7 @@ void PlayListWidget::writem3u() {
m3uList->write();
m3uList->close();
- if(m3uList) delete m3uList;
+ delete m3uList;
- if(fileDlg) delete fileDlg;
+ delete fileDlg;
DocLnk lnk;