remove keylist-include from keyimportdetaildialog

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

4 files changed, 6 insertions, 8 deletions

diff --git a/keyimportdetaildialog.cpp b/keyimportdetaildialog.cpp
index fb457ad..23c3d7a 100644
--- a/keyimportdetaildialog.cpp
+++ b/keyimportdetaildialog.cpp
@@ -21,11 +21,10 @@
 
 #include "keyimportdetaildialog.h"
 
-KeyImportDetailDialog::KeyImportDetailDialog(GpgME::GpgContext* ctx, KeyList* keyList, GpgImportInformation result, QWidget *parent)
+KeyImportDetailDialog::KeyImportDetailDialog(GpgME::GpgContext* ctx, GpgImportInformation result, QWidget *parent)
     : QDialog(parent)
 {
     mCtx = ctx;
-    mKeyList = keyList;
     mResult = result;
     // If no key for import found, just ahow a message
     if (mResult.considered == 0) {
@@ -106,7 +105,7 @@ void KeyImportDetailDialog::createKeysTable()
     int row = 0;
     foreach (GpgImportedKey impKey, mResult.importedKeys) {
         keysTable->setRowCount(row+1);
-        GpgKey key = mKeyList->getKeyByFpr(impKey.fpr);
+        GpgKey key = mCtx->getKeyByFpr(impKey.fpr);
         keysTable->setItem(row, 0, new QTableWidgetItem(key.name));
         keysTable->setItem(row, 1, new QTableWidgetItem(key.email));
         keysTable->setItem(row, 2, new QTableWidgetItem(key.id));
diff --git a/keyimportdetaildialog.h b/keyimportdetaildialog.h
index fce813e..849f36b 100644
--- a/keyimportdetaildialog.h
+++ b/keyimportdetaildialog.h
@@ -22,7 +22,7 @@
 #ifndef __KEYIMPORTDETAILSDIALOG_H__
 #define __KEYIMPORTDETAILSDIALOG_H__
 
-#include "keylist.h"
+#include "gpgcontext.h"
 #include <gpgme.h>
 
 QT_BEGIN_NAMESPACE
@@ -35,7 +35,7 @@ class KeyImportDetailDialog : public QDialog
     Q_OBJECT
 
 public:
-    KeyImportDetailDialog(GpgME::GpgContext* ctx, KeyList* keyList, GpgImportInformation result, QWidget *parent = 0);
+    KeyImportDetailDialog(GpgME::GpgContext* ctx, GpgImportInformation result, QWidget *parent = 0);
 
 private:
     void createGeneralInfoBox();
@@ -46,7 +46,6 @@ private:
 
     QTableWidget *keysTable;
     GpgME::GpgContext *mCtx;
-    KeyList *mKeyList;
     QGroupBox *generalInfoBox;
     QGroupBox *keyInfoBox;
     QDialogButtonBox *buttonBox;
diff --git a/keymgmt.cpp b/keymgmt.cpp
index f59ee27..0ec7f30 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -158,7 +158,7 @@ void KeyMgmt::createToolBars()
 void KeyMgmt::importKeys(QByteArray inBuffer)
 {
     GpgImportInformation result = mCtx->importKey(inBuffer);
-    new KeyImportDetailDialog(mCtx, mKeyList, result, this);
+    new KeyImportDetailDialog(mCtx, result, this);
 }
 
 void KeyMgmt::importKeyFromFile()
diff --git a/keyserverimportdialog.cpp b/keyserverimportdialog.cpp
index 4803b39..c7d34a8 100644
--- a/keyserverimportdialog.cpp
+++ b/keyserverimportdialog.cpp
@@ -306,5 +306,5 @@ void KeyServerImportDialog::importFinished()
 void KeyServerImportDialog::importKeys(QByteArray inBuffer)
 {
     GpgImportInformation result = mCtx->importKey(inBuffer);
-    new KeyImportDetailDialog(mCtx, mKeyList, result, this);
+    new KeyImportDetailDialog(mCtx, result, this);
 }