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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim/libkleo
From:       Marc Mutz <mutz () kde ! org>
Date:       2009-06-23 7:36:43
Message-ID: 1245742603.780947.2146.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 985575 by mutz:

AbstractImportJob: injected common base class for ImportJob, ImportFromServerJob.

 M  +1 -0      CMakeLists.txt  
 A             kleo/abstractimportjob.h   kleo/importjob.h#985232 [License: GPL (v2+) \
(+Qt exception)]  M  +2 -5      kleo/importfromkeyserverjob.h  
 M  +2 -5      kleo/importjob.h  
 M  +8 -4      kleo/job.cpp  


--- branches/kdepim/enterprise4/kdepim/libkleo/CMakeLists.txt #985574:985575
@@ -129,6 +129,7 @@
 	kleo/job.h
 	kleo/keylistjob.h
 	kleo/keygenerationjob.h
+        kleo/abstractimportjob.h
 	kleo/importjob.h
 	kleo/importfromkeyserverjob.h
 	kleo/exportjob.h
--- branches/kdepim/enterprise4/kdepim/libkleo/kleo/importfromkeyserverjob.h \
#985574:985575 @@ -33,7 +33,7 @@
 #ifndef __KLEO_IMPORTFROMKEYSERVERJOB_H__
 #define __KLEO_IMPORTFROMKEYSERVERJOB_H__
 
-#include "job.h"
+#include "abstractimportjob.h"
 
 namespace GpgME {
   class Key;
@@ -58,7 +58,7 @@
      After result() is emitted, the ImportJob will schedule it's own
      destruction by calling QObject::deleteLater().
   */
-  class ImportFromKeyserverJob : public Job {
+  class ImportFromKeyserverJob : public AbstractImportJob {
     Q_OBJECT
   protected:
     explicit ImportFromKeyserverJob( QObject * parent );
@@ -72,9 +72,6 @@
     virtual GpgME::Error start( const std::vector<GpgME::Key> & keys ) = 0;
 
     virtual GpgME::ImportResult exec( const std::vector<GpgME::Key> & keys ) = 0;
-
-  Q_SIGNALS:
-    void result( const GpgME::ImportResult & result, const QString & \
auditLogAsHtml=QString(), const GpgME::Error & auditLogError=GpgME::Error() );  };
 
 }
--- branches/kdepim/enterprise4/kdepim/libkleo/kleo/importjob.h #985574:985575
@@ -33,7 +33,7 @@
 #ifndef __KLEO_IMPORTJOB_H__
 #define __KLEO_IMPORTJOB_H__
 
-#include "job.h"
+#include "abstractimportjob.h"
 
 #include <QtCore/QByteArray>
 
@@ -58,7 +58,7 @@
      After result() is emitted, the ImportJob will schedule it's own
      destruction by calling QObject::deleteLater().
   */
-  class ImportJob : public Job {
+  class ImportJob : public AbstractImportJob {
     Q_OBJECT
   protected:
     explicit ImportJob( QObject * parent );
@@ -72,9 +72,6 @@
     virtual GpgME::Error start( const QByteArray & keyData ) = 0;
 
     virtual GpgME::ImportResult exec( const QByteArray & keyData ) = 0;
-
-  Q_SIGNALS:
-    void result( const GpgME::ImportResult & result, const QString & \
auditLogAsHtml=QString(), const GpgME::Error & auditLogError=GpgME::Error() );  };
 
 }
--- branches/kdepim/enterprise4/kdepim/libkleo/kleo/job.cpp #985574:985575
@@ -90,10 +90,12 @@
     return auditLogError().code() != GPG_ERR_NOT_IMPLEMENTED ;
 }
 
-#define make_job_subclass(x) \
-  Kleo::x::x( QObject * parent ) : Job( parent ) {} \
+#define make_job_subclass_ext(x,y)                \
+  Kleo::x::x( QObject * parent ) : y( parent ) {} \
   Kleo::x::~x() {}
 
+#define make_job_subclass(x) make_job_subclass_ext(x,Job)
+
 make_job_subclass(KeyListJob)
 make_job_subclass(EncryptJob)
 make_job_subclass(DecryptJob)
@@ -104,8 +106,9 @@
 make_job_subclass(VerifyDetachedJob)
 make_job_subclass(VerifyOpaqueJob)
 make_job_subclass(KeyGenerationJob)
-make_job_subclass(ImportJob)
-make_job_subclass(ImportFromKeyserverJob)
+make_job_subclass(AbstractImportJob)
+make_job_subclass_ext(ImportJob,AbstractImportJob)
+make_job_subclass_ext(ImportFromKeyserverJob,AbstractImportJob)
 make_job_subclass(ExportJob)
 make_job_subclass(ChangeExpiryJob)
 make_job_subclass(ChangeOwnerTrustJob)
@@ -129,6 +132,7 @@
 #include "verifydetachedjob.moc"
 #include "verifyopaquejob.moc"
 #include "keygenerationjob.moc"
+#include "abstractimportjob.moc"
 #include "importjob.moc"
 #include "importfromkeyserverjob.moc"
 #include "exportjob.moc"


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