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

List:       kde-commits
Subject:    kdemultimedia/kioslave/audiocd
From:       André Wöbbeking <Woebbeking () web ! de>
Date:       2004-12-24 14:10:32
Message-ID: 20041224141032.B69801BAAE () office ! kde ! org
[Download RAW message or body]

CVS commit by woebbe: 

Do it the dfaure way (i.e. kio_trash):
- don't use deprecated KApplication ctor
- use KCmdLineArgs::arg(0) as protocol name


  M +18 -10    audiocd.cpp   1.135
  M +1 -1      audiocd.h   1.32


--- kdemultimedia/kioslave/audiocd/audiocd.cpp  #1.134:1.135
@@ -83,4 +83,5 @@ KDE_EXPORT int kdemain(int argc, char **
 #include <qfile.h>
 #include <qfileinfo.h>
+#include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <kprotocolmanager.h>
@@ -197,4 +198,12 @@ long my_first_sector(cdrom_drive *drive)
 using namespace AudioCD;
 
+static const KCmdLineOptions options[] =
+{
+    { "+protocol", I18N_NOOP("Protocol name"), 0 },
+    { "+pool", I18N_NOOP("Socket name"), 0 },
+    { "+app", I18N_NOOP("Socket name"), 0 },
+    KCmdLineLastOption
+};
+
 int
 kdemain(int argc, char ** argv)
@@ -202,15 +211,14 @@ kdemain(int argc, char ** argv)
         // KApplication is used as libkcddb uses ioslaves which need a valid
         // kapp pointer
-        KApplication app(argc, argv, "kio_audiocd", false, true);
+        putenv(strdup("SESSION_MANAGER="));
+        KApplication::disableAutoDcopRegistration();
+        KCmdLineArgs::init(argc, argv, "kio_audiocd", 0, 0, 0, 0);
+        KCmdLineArgs::addCmdLineOptions(options);
+        KApplication app(false, false);
 
         kdDebug(7117) << "Starting " << getpid() << endl;
 
-        if (argc != 4)
-        {
-                 kdError(7117) << "Usage: kio_audiocd protocol domain-socket1 domain-socket2" << endl;
-                 exit(-1);
-        }
-
-        AudioCDProtocol slave(argv[2], argv[3]);
+        KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+        AudioCDProtocol slave(args->arg(0), args->arg(1), args->arg(2));
         slave.dispatchLoop();
 
@@ -290,6 +298,6 @@ int paranoia_read_limited_error;
 
 
-AudioCDProtocol::AudioCDProtocol (const QCString & pool, const QCString & app)
-        : SlaveBase("audiocd", pool, app)
+AudioCDProtocol::AudioCDProtocol(const QCString & protocol, const QCString & pool, const QCString & app)
+        : SlaveBase(protocol, pool, app)
 {
         d = new Private;

--- kdemultimedia/kioslave/audiocd/audiocd.h  #1.31:1.32
@@ -43,5 +43,5 @@ class AudioCDProtocol : public KIO::Slav
         public:
 
-        AudioCDProtocol(const QCString & pool, const QCString & app);
+        AudioCDProtocol(const QCString & protocol, const QCString & pool, const QCString & app);
         virtual ~AudioCDProtocol();
 


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