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

List:       kde-commits
Subject:    KDE/kdepim/libkleo/backends/qgpgme
From:       Laurent Montel <montel () kde ! org>
Date:       2007-07-27 10:13:27
Message-ID: 1185531207.372394.2955.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 693166 by mlaurent:

Create kprocess on stack


 M  +12 -12    qgpgmecryptoconfig.cpp  
 M  +0 -2      qgpgmecryptoconfig.h  


--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmecryptoconfig.cpp #693165:693166
@@ -74,23 +74,22 @@
 void QGpgMECryptoConfig::runGpgConf( bool showErrors )
 {
   // Run gpgconf --list-components to make the list of components
+  KProcess process;
+  process << "gpgconf"; // must be in the PATH
+  process << "--list-components";
 
-  mProcess =new KProcess;
-  *mProcess << "gpgconf"; // must be in the PATH
-  *mProcess << "--list-components";
 
-
-  QObject::connect( mProcess, SIGNAL(readyReadStandardOutput()),
+  QObject::connect( &process, SIGNAL(readyReadStandardOutput()),
                     this, SLOT( slotCollectStdOut() ) );
 
   // run the process:
   int rc = 0;
-  mProcess->setOutputChannelMode(KProcess::MergedChannels);
-  mProcess->start();
-  if ( !mProcess->waitForFinished() )
+  process.setOutputChannelMode(KProcess::MergedChannels);
+  process.start();
+  if ( !process.waitForFinished() )
     rc = -2;
   else
-    rc = ( mProcess->exitStatus () == QProcess::NormalExit ) ? mProcess->exitCode() : -1 ;
+    rc = ( process.exitStatus () == QProcess::NormalExit ) ? process.exitCode() : -1 ;
 
   // handle errors, if any (and if requested)
   if ( showErrors && rc != 0 ) {
@@ -112,9 +111,10 @@
 {
   QString line;
   int result;
-  while( mProcess->canReadLine() ) {
-     line = QString::fromLocal8Bit(mProcess->readLine());
-    kDebug(5150) << "GOT LINE:" << line << endl;
+  KProcess * proc = static_cast<KProcess*>(QObject::sender());
+  while( proc->canReadLine() ) {
+     line = QString::fromUtf8(proc->readLine());
+    //kDebug(5150) << "GOT LINE:" << line << endl;
     // Format: NAME:DESCRIPTION
     QStringList lst = line.split( ':' );
     if ( lst.count() >= 2 ) {
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmecryptoconfig.h #693165:693166
@@ -40,7 +40,6 @@
 #include <QStringList>
 #include <QObject>
 #include <QVariant>
-class KProcess;
 class K3ProcIO;
 
 class QGpgMECryptoConfigComponent;
@@ -75,7 +74,6 @@
 private:
   QHash<QString, QGpgMECryptoConfigComponent*> mComponents;
   bool mParsed;
-  KProcess *mProcess;
 };
 
 class QGpgMECryptoConfigGroup;
[prev in list] [next in list] [prev in thread] [next in thread]