From 5845fbde568786f16b75035e7fcc87f2c88cae33 Mon Sep 17 00:00:00 2001
From: ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>
Date: Mon, 5 Nov 2012 20:17:58 +0000
Subject: reinclude convert

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@999 34ebc366-c3a9-4b3c-9f84-69acf7962910
---
 gpg4usb.pro          | 2 --
 keydetailsdialog.cpp | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gpg4usb.pro b/gpg4usb.pro
index dfaeda5..bf53903 100644
--- a/gpg4usb.pro
+++ b/gpg4usb.pro
@@ -46,7 +46,6 @@ HEADERS += attachments.h \
     kgpg/kprocess.h \
     kgpg/kprocess_p.h \
     kgpg/kgpginterface.h \
-#    kgpg/core/convert.h \
     kgpg/core/kgpgkey.h \
     kgpg/core/KGpgSignableNode.h \
     kgpg/core/KGpgExpandableNode.h \
@@ -106,7 +105,6 @@ SOURCES += attachments.cpp \
     kgpg/klinebufferedprocess.cpp \
     kgpg/kprocess.cpp \
     kgpg/kgpginterface.cpp \
-#    kgpg/core/convert.cpp \
     kgpg/core/kgpgkey.cpp \
     kgpg/core/KGpgSignableNode.cpp \
     kgpg/core/KGpgExpandableNode.cpp \
diff --git a/keydetailsdialog.cpp b/keydetailsdialog.cpp
index 75c49e1..bf6cb5f 100644
--- a/keydetailsdialog.cpp
+++ b/keydetailsdialog.cpp
@@ -21,7 +21,7 @@
 
 #include "keydetailsdialog.h"
 #include "kgpg/transactions/kgpgexport.h"
-//#include "kgpg/core/convert.h"
+#include "kgpg/core/convert.h"
 
 KeyDetailsDialog::KeyDetailsDialog(GpgME::GpgContext* ctx, KgpgCore::KgpgKey key, QWidget *parent)
     : QDialog(parent)
@@ -54,9 +54,9 @@ KeyDetailsDialog::KeyDetailsDialog(GpgME::GpgContext* ctx, KgpgCore::KgpgKey key
         keyExpireVal = key.expirationDate().toString("dd. MMM. yyyy");
     }
 
-    keyAlgoVal = key.algorithm();
+    //keyAlgoVal = key.algorithm();
     // TODO: algorithm
-    //keyAlgoVal = KgpgCore::Convert::toString(key.algorithm()) + QLatin1String( " / " ) + KgpgCore::Convert::toString(key.encryptionAlgorithm());
+    keyAlgoVal = KgpgCore::Convert::toString(key.algorithm()) + QLatin1String( " / " ) + KgpgCore::Convert::toString(key.encryptionAlgorithm());
 
     qDebug() << key.algorithm();
     keyCreatedVal = key.creationDate().toString("dd. MMM. yyyy");
-- 
cgit v1.2.3