[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    [PATCH] character encoding konq-plugins/sidebar/mediaplayer
From:       Marcus Camen <mcamen () physik2 ! uni-goettingen ! de>
Date:       2002-03-09 19:48:47
[Download RAW message or body]

Hi all,

currently kdeaddons/konq-plugins/sidebar/mediaplayer
does not work with filenames containing non-standard characters
like german umlauts.
The attached patch fixes this by essentially replacing QUriDrag with
KURLDrag and QStrList with KURL::List.

Ok? As I am not a core developer I will not check in without any
feedback (despite the no reply == ready to go rule).

-- 
Marcus Camen
http://mcamen.de
["mediaplayer.diff" (text/x-diff)]

Index: mediawidget.cpp
===================================================================
RCS file: /home/kde/kdeaddons/konq-plugins/sidebar/mediaplayer/mediawidget.cpp,v
retrieving revision 1.5
diff -u -3 -p -b -r1.5 mediawidget.cpp
--- mediawidget.cpp	2002/01/22 21:57:24	1.5
+++ mediawidget.cpp	2002/03/09 19:33:27
@@ -20,11 +20,11 @@
 #include "player.h"
 
 #include <kurl.h>
+#include <kurldrag.h>
 #include <klocale.h>
 
 #include <qwidget.h>
 #include <qpushbutton.h>
-#include <qdragobject.h>
 #include <qlcdnumber.h>
 #include <qpopupmenu.h>
 #include <qslider.h>
@@ -64,12 +64,12 @@ void KSB_MediaWidget::skipToWrapper(int 
 
 void KSB_MediaWidget::dragEnterEvent ( QDragEnterEvent * e)
 {
-	e->accept(QUriDrag::canDecode(e));
+	e->accept(KURLDrag::canDecode(e));
 } 
 
 void KSB_MediaWidget::dropEvent ( QDropEvent * e) 
 {
-	if (QUriDrag::decode(e, m_uri_list))
+	if (KURLDrag::decode(e, m_kuri_list))
 	{
 		playerFinished();
 	}
@@ -113,11 +113,11 @@ void KSB_MediaWidget::playerTimeout()
 
 void KSB_MediaWidget::playerFinished()
 {
-	if( m_uri_list.count() > 0 )
+	if( m_kuri_list.count() > 0 )
 	{
-		char* next_uri = m_uri_list.take( 0 );
-		KURL kurl( next_uri );
-		player->openFile( KURL(next_uri) );
+		KURL kurl = m_kuri_list.first();
+		m_kuri_list.remove( kurl );
+		player->openFile( kurl );
 		player->play();
 		needLengthUpdate=true;
 		pretty=kurl.prettyURL();
Index: mediawidget.h
===================================================================
RCS file: /home/kde/kdeaddons/konq-plugins/sidebar/mediaplayer/mediawidget.h,v
retrieving revision 1.3
diff -u -3 -p -b -r1.3 mediawidget.h
--- mediawidget.h	2002/01/22 21:56:51	1.3
+++ mediawidget.h	2002/03/09 19:33:27
@@ -18,6 +18,7 @@
 #ifndef _MEDIAWIDGET_H_
 #define _MEDIAWIDGET_H_
 
+#include <kurl.h>
 #include "mediawidget_skel.h"
 
 class KSB_MediaWidget: public KSB_MediaWidget_skel
@@ -31,7 +32,7 @@ private:
 	class Player *player;
 	QString pretty;
 	bool needLengthUpdate;
-	QStrList m_uri_list;
+	KURL::List m_kuri_list;
 
 protected:
 	virtual void dragEnterEvent ( QDragEnterEvent * );


[prev in list] [next in list] [prev in thread] [next in thread]