X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsslinfodlg.cpp;h=d97ddb6514e8b9b9eda4c7a8b6939c35371edd82;hp=7db4c3e404d1eab024ab4460432be9bd6c25581b;hb=9188f1a4880dc7f4c26612a265c1d874f6df5a8c;hpb=6eefdfc697067d184a589fc8a231b16316c09106 diff --git a/src/qtui/sslinfodlg.cpp b/src/qtui/sslinfodlg.cpp index 7db4c3e4..d97ddb65 100644 --- a/src/qtui/sslinfodlg.cpp +++ b/src/qtui/sslinfodlg.cpp @@ -18,21 +18,22 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include "sslinfodlg.h" + #include #include #include #include -#include "sslinfodlg.h" #include "util.h" // ======================================== // SslInfoDlg // ======================================== -SslInfoDlg::SslInfoDlg(const QSslSocket *socket, QWidget *parent) - : QDialog(parent), - _socket(socket) +SslInfoDlg::SslInfoDlg(const QSslSocket* socket, QWidget* parent) + : QDialog(parent) + , _socket(socket) { ui.setupUi(this); @@ -44,12 +45,11 @@ SslInfoDlg::SslInfoDlg(const QSslSocket *socket, QWidget *parent) ui.protocol->setText(cipher.protocolString()); connect(ui.certificateChain, selectOverload(&QComboBox::currentIndexChanged), this, &SslInfoDlg::setCurrentCert); - foreach(const QSslCertificate &cert, socket->peerCertificateChain()) { + foreach (const QSslCertificate& cert, socket->peerCertificateChain()) { ui.certificateChain->addItem(subjectInfo(cert, QSslCertificate::CommonName)); } } - void SslInfoDlg::setCurrentCert(int index) { QSslCertificate cert = socket()->peerCertificateChain().at(index); @@ -71,27 +71,27 @@ void SslInfoDlg::setCurrentCert(int index) ui.trusted->setText(tr("Yes")); else { QString errorString = tr("No, for the following reasons:
    "); - foreach(const QSslError &error, socket()->sslErrors()) - errorString += "
  • " + error.errorString() + "
  • "; + foreach (const QSslError& error, socket()->sslErrors()) + errorString += "
  • " + error.errorString() + "
  • "; errorString += "
"; ui.trusted->setText(errorString); } - ui.validity->setText(tr("%1 to %2").arg(cert.effectiveDate().date().toString(Qt::ISODate), cert.expiryDate().date().toString(Qt::ISODate))); + ui.validity->setText( + tr("%1 to %2").arg(cert.effectiveDate().date().toString(Qt::ISODate), cert.expiryDate().date().toString(Qt::ISODate))); ui.md5Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Md5))); ui.sha1Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Sha1))); ui.sha256Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Sha256))); } // in Qt5, subjectInfo returns a QStringList(); turn this into a comma-separated string instead -QString SslInfoDlg::subjectInfo(const QSslCertificate &cert, QSslCertificate::SubjectInfo subjectInfo) const +QString SslInfoDlg::subjectInfo(const QSslCertificate& cert, QSslCertificate::SubjectInfo subjectInfo) const { return cert.subjectInfo(subjectInfo).join(", "); } - // same here -QString SslInfoDlg::issuerInfo(const QSslCertificate &cert, QSslCertificate::SubjectInfo subjectInfo) const +QString SslInfoDlg::issuerInfo(const QSslCertificate& cert, QSslCertificate::SubjectInfo subjectInfo) const { return cert.issuerInfo(subjectInfo).join(", "); }