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

List:       kde-commits
Subject:    KDE/kdepim/libkleo/backends/qgpgme
From:       Till Adam <adam () kde ! org>
Date:       2007-07-23 14:13:55
Message-ID: 1185200035.283120.27420.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 691371 by tilladam:

Follow API changes.Marc owes me Sushi. :)


 M  +1 -1      qgpgmejob.cpp  
 M  +1 -1      qgpgmekeylistjob.cpp  
 M  +6 -6      qgpgmerefreshkeysjob.cpp  
 M  +2 -5      qgpgmerefreshkeysjob.h  
 M  +6 -6      qgpgmesecretkeyexportjob.cpp  
 M  +2 -2      qgpgmesecretkeyexportjob.h  


--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmejob.cpp #691370:691371
@@ -217,7 +217,7 @@
     if ( const GpgME::Error err = mCtx->addSigningKey( *it ) )
       return err;
   }
-  return 0;
+  return GpgME::Error();
 }
 
 void Kleo::QGpgMEJob::createInData( const QByteArray & in ) {
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp #691370:691371
@@ -99,7 +99,7 @@
     return err;
   }
   mResult = GpgME::KeyListResult( 0, 0 );
-  return 0;
+  return GpgME::Error();
 }
 
 GpgME::KeyListResult Kleo::QGpgMEKeyListJob::exec( const QStringList & pats, bool \
                secretOnly, std::vector<GpgME::Key> & keys ) {
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.cpp #691370:691371
@@ -80,7 +80,7 @@
 
 GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
   if ( mPatternsToDo.empty() )
-    return 0;
+    return GpgME::Error();
   // create and start gpgsm process:
   mProcess = new GnuPGProcessBase( this );
   mProcess->setObjectName( "gpgsm -k --with-validation --force-crl-refresh \
--enable-crl-checks" ); @@ -115,18 +115,18 @@
 	   SLOT(slotStatus(Kleo::GnuPGProcessBase*,const QString&,const QStringList&)) );
 
   if ( !mProcess->start( K3Process::NotifyOnExit, K3Process::Stderr ) ) {
-    mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
+    mError = GpgME::Error( gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ) ); \
// what else?  deleteLater();
     return mError;
   } else
-    return 0;
+    return GpgME::Error();
 }
 
 void Kleo::QGpgMERefreshKeysJob::slotCancel() {
   if ( mProcess )
     mProcess->kill();
   mProcess = 0;
-  mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
+  mError = GpgME::Error( gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED ) );
 }
 
 void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const QString \
& type, const QStringList & args ) { @@ -153,7 +153,7 @@
       kDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number \
for second ERROR arg, got something else" << endl;  return;
     }
-    mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
+    mError = GpgME::Error( gpg_err_make( (gpg_err_source_t)source, \
(gpg_err_code_t)code ) );  
 
   } else if ( type == "PROGRESS" ) {
@@ -199,7 +199,7 @@
   emit done();
   if ( !mError &&
        ( !mProcess->normalExit() || mProcess->exitStatus() != 0 ) )
-    mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_GENERAL );
+    mError = GpgME::Error( gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_GENERAL ) );
   emit result( mError );
   deleteLater();
 }
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.h #691370:691371
@@ -34,6 +34,7 @@
 #define __KLEO_QGPGMEREFRESHKEYSJOB_H__
 
 #include "libkleo/kleo/refreshkeysjob.h"
+#include "gpgmepp/context.h"
 
 #include <QStringList>
 
@@ -41,10 +42,6 @@
   class GnuPGProcessBase;
 }
 
-namespace GpgME {
-  class Error;
-}
-
 class K3Process;
 
 namespace Kleo {
@@ -71,7 +68,7 @@
 
   private:
     GnuPGProcessBase * mProcess;
-    int mError;
+    GpgME::Error mError;
     QStringList mPatternsToDo;
   };
 
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.cpp \
#691370:691371 @@ -68,7 +68,7 @@
 
   if ( patterns.size() != 1 || patterns.front().isEmpty() ) {
     deleteLater();
-    return mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_INV_VALUE );
+    return mError = GpgME::Error( gpg_err_make( GPG_ERR_SOURCE_GPGSM, \
GPG_ERR_INV_VALUE ) );  }
 
   // create and start gpgsm process:
@@ -95,18 +95,18 @@
 	   SLOT(slotStatus(Kleo::GnuPGProcessBase*,const QString&,const QStringList&)) );
 
   if ( !mProcess->start( K3Process::NotifyOnExit, K3Process::AllOutput ) ) {
-    mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
+    mError = GpgME::Error( gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ) ); \
// what else?  deleteLater();
     return mError;
   } else
-    return 0;
+    return GpgME::Error();
 }
 
 void Kleo::QGpgMESecretKeyExportJob::slotCancel() {
   if ( mProcess )
     mProcess->kill();
   mProcess = 0;
-  mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
+  mError = GpgME::Error( gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED ) );
 }
 
 void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const \
QString & type, const QStringList & args ) { @@ -133,7 +133,7 @@
       kDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected \
number for second ERROR arg, got something else" << endl;  return;
     }
-    mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
+    mError = GpgME::Error( gpg_err_make( (gpg_err_source_t)source, \
(gpg_err_code_t)code ) );  
 
   } else if ( type == "PROGRESS" ) {
@@ -185,7 +185,7 @@
   emit done();
   if ( !mError &&
        ( !mProcess->normalExit() || mProcess->exitStatus() != 0 ) )
-    mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_GENERAL );
+    mError = GpgME::Error( gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_GENERAL ) );
   emit result( mError, mKeyData );
   deleteLater();
 }
--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.h \
#691370:691371 @@ -34,6 +34,7 @@
 #define __KLEO_QGPGMESECRETKEYEXPORTJOB_H__
 
 #include "libkleo/kleo/exportjob.h"
+#include "gpgmepp/context.h"
 
 #include <q3cstring.h>
 
@@ -42,7 +43,6 @@
 }
 
 namespace GpgME {
-  class Error;
   class Data;
 }
 
@@ -71,7 +71,7 @@
   private:
     GnuPGProcessBase * mProcess;
     QByteArray mKeyData;
-    int mError;
+    GpgME::Error mError;
     bool mArmour;
     QString mCharset;
   };


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