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

List:       kde-core-devel
Subject:    [PATCH] kdemultimedia/kioslave/audiocd
From:       André_Wöbbeking <Woebbeking () onlinehome ! de>
Date:       2003-12-14 13:44:04
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

the audiocd ioslave must use KApplication and not KInstance, as libkcddb 
uses ioslaves to lookup cd contents which need a valid kapp pointer 
(i.e. in ctor of Job).

I know that the used KApplication ctor is deprecated but it is used by 
other ioslaves too and I don't know if I have to use KCmdLineArgs with 
another KApplication ctor.


Cheers,
André
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQE/3GknGcp/AjG8ndYRAgzRAJ4gD4By+FDbATNi5pdABsmZ5zBPsQCeOyQo
rP/RMIAZMYPQt0QB0oiPK/E=
=UE1Z
-----END PGP SIGNATURE-----

["audiocd.patch" (text/x-diff)]

Index: kioslave/audiocd/audiocd.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/kioslave/audiocd/audiocd.cpp,v
retrieving revision 1.82
diff -u -r1.82 audiocd.cpp
--- kioslave/audiocd/audiocd.cpp	8 Dec 2003 15:50:20 -0000	1.82
+++ kioslave/audiocd/audiocd.cpp	13 Dec 2003 22:21:02 -0000
@@ -85,11 +85,11 @@
 
 void paranoiaCallback(long, int);
 }
+#include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kprotocolmanager.h>
-#include <kinstance.h>
 #include <klocale.h>
 
 #include "audiocd.h"
@@ -265,7 +265,7 @@
 int
 kdemain(int argc, char ** argv)
 {
-  KInstance instance("kio_audiocd");
+  KApplication app(argc, argv, "kio_audiocd", false, true);
 
   kdDebug(7117) << "Starting " << getpid() << endl;
 
@@ -985,8 +985,8 @@
 
   UDSAtom atom;
   atom.m_uds = KIO::UDS_NAME;
-  atom.m_str = url.filename().replace('/', QFL1("%2F"));
-  kdDebug() << k_funcinfo << atom.m_str << endl;
+  atom.m_str = url.fileName().replace('/', QFL1("%2F"));
+  kdDebug(7117) << k_funcinfo << atom.m_str << endl;
   entry.append(atom);
 
   atom.m_uds = KIO::UDS_FILE_TYPE;


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