Merge from BRANCH_1_0

1 files changed, 7 insertions, 16 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 5f750ba..a1a1016 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -33,9 +33,3 @@
 
-#include <qpe/qpetoolbar.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/storage.h>
-#include <qpe/mimetype.h>
-#include <qpe/global.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
+#include <qtoolbar.h>
 
@@ -43,7 +37,3 @@
 
-#include <qdatetime.h>
-#include <qdir.h>
 #include <qmessagebox.h>
-#include <qregexp.h>
-#include <qtextstream.h>
 
@@ -57,3 +47,2 @@
 //only needed for the random play
-#include <stdlib.h>
 #include <assert.h>
@@ -669,2 +658,3 @@ void PlayListWidget::openFile() {
     audio << "playlist/plain";
+    audio << "application/ogg";
     audio << "audio/x-mpegurl";
@@ -683,7 +673,10 @@ void PlayListWidget::openFile() {
                   types, 0 );
-    if(str.left(2) == "//") str=str.right(str.length()-1);
-    cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath());
 
+    if(str.left(2) == "//")  {
+        str=str.right(str.length()-1);
+    }
+    cfg.writeEntry( "LastDirectory" ,QFileInfo( str ).dirPath() );
 
     if( !str.isEmpty() ) {
+
         qDebug( "Selected filename is " + str );
@@ -691,4 +684,2 @@ void PlayListWidget::openFile() {
         DocLnk lnk;
-        Config cfg( "OpiePlayer" );
-        cfg.setGroup("PlayList");