From a02312344eb9d951b73c493144435e3bf891e670 Mon Sep 17 00:00:00 2001 From: ubbo Date: Sat, 31 Mar 2012 16:57:07 +0000 Subject: fix some issues with utf8 strings in keys git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@873 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- keydetailsdialog.cpp | 2 +- keymgmt.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keydetailsdialog.cpp b/keydetailsdialog.cpp index dd0723f..5a66122 100644 --- a/keydetailsdialog.cpp +++ b/keydetailsdialog.cpp @@ -195,7 +195,7 @@ void KeyDetailsDialog::exportPrivateKey() QByteArray *keyArray = new QByteArray(); mCtx->exportSecretKey(*keyid, keyArray); gpgme_key_t key = mCtx->getKeyDetails(*keyid); - QString fileString = QString(key->uids->name) + " " + QString(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub_sec.asc"; + QString fileString = QString::fromUtf8(key->uids->name) + " " + QString::fromUtf8(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub_sec.asc"; QString fileName = QFileDialog::getSaveFileName(this, tr("Export Key To File"), fileString, tr("Key Files") + " (*.asc *.txt);;All Files (*)"); QFile file(fileName); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { diff --git a/keymgmt.cpp b/keymgmt.cpp index 2469e0e..e8b7d94 100755 --- a/keymgmt.cpp +++ b/keymgmt.cpp @@ -212,9 +212,9 @@ void KeyMgmt::deleteKeysWithWarning(QStringList *uidList) } QString keynames; foreach (QString uid, *uidList) { - keynames.append(mCtx->getKeyDetails(uid)->uids->name); + keynames.append(QString::fromUtf8(mCtx->getKeyDetails(uid)->uids->name)); keynames.append(" <"); - keynames.append(mCtx->getKeyDetails(uid)->uids->email); + keynames.append(QString::fromUtf8(mCtx->getKeyDetails(uid)->uids->email)); keynames.append(">
"); } @@ -247,7 +247,7 @@ void KeyMgmt::exportKeyToFile() return; } gpgme_key_t key = mCtx->getKeyDetails(mKeyList->getChecked()->first()); - QString fileString = QString(key->uids->name) + " " + QString(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub.asc"; + QString fileString = QString::fromUtf8(key->uids->name) + " " + QString::fromUtf8(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub.asc"; QString fileName = QFileDialog::getSaveFileName(this, tr("Export Key To File"), fileString, tr("Key Files") + " (*.asc *.txt);;All Files (*)"); QFile file(fileName); -- cgit v1.2.3