projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
QSslCertificate::subjectInfo() returns a QStringList in Qt5
[quassel.git]
/
src
/
qtui
/
settingspages
/
identityeditwidget.cpp
diff --git
a/src/qtui/settingspages/identityeditwidget.cpp
b/src/qtui/settingspages/identityeditwidget.cpp
index
f670753
..
25d5abc
100644
(file)
--- a/
src/qtui/settingspages/identityeditwidget.cpp
+++ b/
src/qtui/settingspages/identityeditwidget.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-25,6
+25,7
@@
#include <QDropEvent>
#include <QFileDialog>
#include <QUrl>
#include <QDropEvent>
#include <QFileDialog>
#include <QUrl>
+#include <QMessageBox>
#include "client.h"
#include "iconloader.h"
#include "client.h"
#include "iconloader.h"
@@
-299,7
+300,7
@@
void IdentityEditWidget::sslDropEvent(QDropEvent *event, bool isCert)
if (isCert) {
QSslCertificate cert = certByFilename(filename);
if (isCert) {
QSslCertificate cert = certByFilename(filename);
- if (
cert.isValid
())
+ if (
!cert.isNull
())
showCertState(cert);
}
else {
showCertState(cert);
}
else {
@@
-340,6
+341,7
@@
QSslKey IdentityEditWidget::keyByFilename(const QString &filename)
goto returnKey;
}
}
goto returnKey;
}
}
+ QMessageBox::information(this, tr("Failed to read key"), tr("Failed to read the key file. It is either incompatible or invalid. Note that the key file must not have a passphrase."));
returnKey:
return key;
}
returnKey:
return key;
}
@@
-391,7
+393,7
@@
QSslCertificate IdentityEditWidget::certByFilename(const QString &filename)
for (int i = 0; i < 2; i++) {
cert = QSslCertificate(certRaw, (QSsl::EncodingFormat)i);
for (int i = 0; i < 2; i++) {
cert = QSslCertificate(certRaw, (QSsl::EncodingFormat)i);
- if (
cert.isValid
())
+ if (
!cert.isNull
())
break;
}
return cert;
break;
}
return cert;
@@
-400,14
+402,19
@@
QSslCertificate IdentityEditWidget::certByFilename(const QString &filename)
void IdentityEditWidget::showCertState(const QSslCertificate &cert)
{
void IdentityEditWidget::showCertState(const QSslCertificate &cert)
{
- if (
!cert.isValid
()) {
+ if (
cert.isNull
()) {
ui.certOrgLabel->setText(tr("No Certificate loaded"));
ui.certCNameLabel->setText(tr("No Certificate loaded"));
ui.clearOrLoadCertButton->setText(tr("Load"));
}
else {
ui.certOrgLabel->setText(tr("No Certificate loaded"));
ui.certCNameLabel->setText(tr("No Certificate loaded"));
ui.clearOrLoadCertButton->setText(tr("Load"));
}
else {
+#if QT_VERSION < 0x050000
ui.certOrgLabel->setText(cert.subjectInfo(QSslCertificate::Organization));
ui.certCNameLabel->setText(cert.subjectInfo(QSslCertificate::CommonName));
ui.certOrgLabel->setText(cert.subjectInfo(QSslCertificate::Organization));
ui.certCNameLabel->setText(cert.subjectInfo(QSslCertificate::CommonName));
+#else
+ ui.certOrgLabel->setText(cert.subjectInfo(QSslCertificate::Organization).join(", "));
+ ui.certCNameLabel->setText(cert.subjectInfo(QSslCertificate::CommonName).join(", "));
+#endif
ui.clearOrLoadCertButton->setText(tr("Clear"));
}
ui.certOrgLabel->setProperty("sslCert", cert.toPem());
ui.clearOrLoadCertButton->setText(tr("Clear"));
}
ui.certOrgLabel->setProperty("sslCert", cert.toPem());