source should be free of gpgme references now

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@971 34ebc366-c3a9-4b3c-9f84-69acf7962910

7 files changed, 7 insertions, 12 deletions

diff --git a/keydetailsdialog.h b/keydetailsdialog.h
index 8863553..08b5d58 100644
--- a/keydetailsdialog.h
+++ b/keydetailsdialog.h
@@ -24,7 +24,6 @@
 
 #include "gpgcontext.h"
 #include "kgpg/core/kgpgkey.h"
-#include <gpgme.h>
 
 QT_BEGIN_NAMESPACE
 class QDateTime;
diff --git a/keygendialog.h b/keygendialog.h
index fb661c3..72b5c2b 100644
--- a/keygendialog.h
+++ b/keygendialog.h
@@ -22,7 +22,6 @@
 #ifndef __KEYGENDIALOG_H__
 #define __KEYGENDIALOG_H__
 
-#include "keygenthread.h"
 #include "gpgcontext.h"
 #include "kgpg/transactions/kgpggeneratekey.h"
 #include <QtGui>
@@ -52,7 +51,6 @@ private:
     int checkPassWordStrength();
 
     GpgME::GpgContext *mCtx; /** The current gpg context */
-    KeyGenThread *keyGenThread; /** Thread for key generation */
     QStringList errorMessages; /** List of errors occuring when checking entries of lineedits */
     QDialogButtonBox *buttonBox; /** Box for standardbuttons */
     QLabel *errorLabel; /** Label containing error message */
diff --git a/keyimportdetaildialog.h b/keyimportdetaildialog.h
index dde1f54..0d8b287 100644
--- a/keyimportdetaildialog.h
+++ b/keyimportdetaildialog.h
@@ -23,7 +23,6 @@
 #define __KEYIMPORTDETAILSDIALOG_H__
 
 #include "gpgcontext.h"
-#include <gpgme.h>
 
 QT_BEGIN_NAMESPACE
 class QGridLayout;
diff --git a/keymgmt.h b/keymgmt.h
index 723fd9b..4a130fe 100755
--- a/keymgmt.h
+++ b/keymgmt.h
@@ -23,7 +23,6 @@
 #define __KEYMGMT_H__
 
 #include "keylist.h"
-#include "keygenthread.h"
 #include "keydetailsdialog.h"
 #include "keyimportdetaildialog.h"
 #include "keyserverimportdialog.h"
diff --git a/verifykeydetailbox.cpp b/verifykeydetailbox.cpp
index 968d1f1..8070ed9 100644
--- a/verifykeydetailbox.cpp
+++ b/verifykeydetailbox.cpp
@@ -21,16 +21,16 @@
 
 #include "verifykeydetailbox.h"
 
-VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget *parent, GpgME::GpgContext* ctx, KeyList* keyList, gpgme_signature_t signature) :
+VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget *parent, GpgME::GpgContext* ctx, KeyList* keyList, KGpgVerify signature) :
     QGroupBox(parent)
 {
     this->mCtx = ctx;
     this->mKeyList = keyList;
-    this->fpr=signature->fpr;
+    //this->fpr=signature->fpr;
 
     QGridLayout *grid = new QGridLayout();
-
-    switch (gpg_err_code(signature->status))
+// TODO
+/*    switch (gpg_err_code(signature->status))
     {
         case GPG_ERR_NO_PUBKEY:
         {
@@ -80,7 +80,7 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget *parent, GpgME::GpgContext* ctx,
 
             break;
         }
-    }
+    }*/
     this->setLayout(grid);
 }
 
diff --git a/verifykeydetailbox.h b/verifykeydetailbox.h
index 1c31ae0..07bb247 100644
--- a/verifykeydetailbox.h
+++ b/verifykeydetailbox.h
@@ -24,6 +24,7 @@
 
 #include "keylist.h"
 #include "keyserverimportdialog.h"
+#include "kgpg/transactions/kgpgverify.h"
 #include <QDialog>
 #include <QGroupBox>
 
@@ -31,7 +32,7 @@ class VerifyKeyDetailBox: public QGroupBox
 {
     Q_OBJECT
 public:
-    explicit VerifyKeyDetailBox(QWidget *parent, GpgME::GpgContext* ctx, KeyList* mKeyList,  gpgme_signature_t signature);
+    explicit VerifyKeyDetailBox(QWidget *parent, GpgME::GpgContext* ctx, KeyList* mKeyList,  KGpgVerify signature);
 
 private slots:
     void importFormKeyserver();
diff --git a/verifynotification.h b/verifynotification.h
index 9aad46d..8b5e54e 100644
--- a/verifynotification.h
+++ b/verifynotification.h
@@ -25,7 +25,6 @@
 #include "editorpage.h"
 #include "verifydetailsdialog.h"
 #include "kgpg/transactions/kgpgverify.h"
-#include <gpgme.h>
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE