aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2011-10-06 18:45:56 +0000
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2011-10-06 18:45:56 +0000
commit8b7a30cf99974fef86e1170a185f8b53dbf8dbb9 (patch)
tree07ac1046b3d2fed85e984deacd829b42715c3583
parentadded list for signinginformation and minor bugfix (diff)
downloadgpg4usb-8b7a30cf99974fef86e1170a185f8b53dbf8dbb9.tar.gz
gpg4usb-8b7a30cf99974fef86e1170a185f8b53dbf8dbb9.zip
removed beautifyfingerprint-method from gpgwin
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@541 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--gpgwin.cpp12
-rw-r--r--gpgwin.h7
-rw-r--r--keydetailsdialog.h4
3 files changed, 3 insertions, 20 deletions
diff --git a/gpgwin.cpp b/gpgwin.cpp
index 1ee8b7f..7ed6072 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -694,7 +694,7 @@ void GpgWin::verify()
case GPG_ERR_NO_PUBKEY:
{
verifyStatus=VERIFY_ERROR_WARN;
- verifyLabelText.append(tr("Key not present with Fingerprint: ")+beautifyFingerprint(QString(sign->fpr)));
+ verifyLabelText.append(tr("Key not present with Fingerprint: ")+KeyDetailsDialog::beautifyFingerprint(QString(sign->fpr)));
*vn->keysNotInList << sign->fpr;
unknownKeyFound=true;
break;
@@ -712,7 +712,7 @@ void GpgWin::verify()
default:
{
verifyStatus=VERIFY_ERROR_WARN;
- verifyLabelText.append(tr("Error for key with fingerprint ")+beautifyFingerprint(QString(sign->fpr)));
+ verifyLabelText.append(tr("Error for key with fingerprint ")+KeyDetailsDialog::beautifyFingerprint(QString(sign->fpr)));
break;
}
}
@@ -834,11 +834,3 @@ void GpgWin::cleanDoubleLinebreaks() {
content.replace("\n\n", "\n");
edit->fillTextEditWithText(content);
}
-
-QString GpgWin::beautifyFingerprint(QString fingerprint){
- uint len = fingerprint.length();
- if ((len > 0) && (len % 4 == 0))
- for (uint n = 0; 4 *(n + 1) < len; ++n)
- fingerprint.insert(5 * n + 4, ' ');
- return fingerprint;
-}
diff --git a/gpgwin.h b/gpgwin.h
index 8d77936..6f98882 100644
--- a/gpgwin.h
+++ b/gpgwin.h
@@ -226,13 +226,6 @@ private:
*/
int isSigned(const QByteArray &text);
- /**
- * @details Put a space after every four chars of fingerprint.
- *
- * @param fingerprint
- */
- QString beautifyFingerprint(QString fingerprint);
-
TextEdit *edit; /** TODO */
QMenu *fileMenu; /** Submenu for file-operations*/
QMenu *editMenu; /** Submenu for text-operations*/
diff --git a/keydetailsdialog.h b/keydetailsdialog.h
index 241689b..855d91b 100644
--- a/keydetailsdialog.h
+++ b/keydetailsdialog.h
@@ -42,6 +42,7 @@ class KeyDetailsDialog : public QDialog
public:
KeyDetailsDialog(GpgME::Context* ctx, gpgme_key_t key, QWidget *parent = 0);
+ static QString beautifyFingerprint(QString fingerprint);
private slots:
void exportPrivateKey();
@@ -76,9 +77,6 @@ private:
QLabel *expireVarLabel;
QLabel *createdVarLabel;
QLabel *algorithmVarLabel;
-
-
- QString beautifyFingerprint(QString fingerprint);
};
#endif // __KEYDETAILSDIALOG_H__