X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsslinfodlg.cpp;h=a549d8fc76ecbf147793de6180e2adf5ab67a887;hp=d3069df126ce22bb33a2b6a1dbfbec29a1b98a26;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=7df097437df5c77a1fd772ff1a5b63d40d09ac4f

diff --git a/src/qtui/sslinfodlg.cpp b/src/qtui/sslinfodlg.cpp
index d3069df1..a549d8fc 100644
--- a/src/qtui/sslinfodlg.cpp
+++ b/src/qtui/sslinfodlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -80,32 +80,18 @@ void SslInfoDlg::setCurrentCert(int index)
     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)));
-#if QT_VERSION < 0x050000
-    // Qt 4 doesn't include SHA-2 hashes, so hide the row
-    ui.sha256Label->hide();
-    ui.sha256Digest->hide();
-#else
     ui.sha256Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Sha256)));
-#endif
 }
 
 // in Qt5, subjectInfo returns a QStringList(); turn this into a comma-separated string instead
 QString SslInfoDlg::subjectInfo(const QSslCertificate &cert, QSslCertificate::SubjectInfo subjectInfo) const
 {
-#if QT_VERSION < 0x050000
-    return cert.subjectInfo(subjectInfo);
-#else
     return cert.subjectInfo(subjectInfo).join(", ");
-#endif
 }
 
 
 // same here
 QString SslInfoDlg::issuerInfo(const QSslCertificate &cert, QSslCertificate::SubjectInfo subjectInfo) const
 {
-#if QT_VERSION < 0x050000
-    return cert.issuerInfo(subjectInfo);
-#else
     return cert.issuerInfo(subjectInfo).join(", ");
-#endif
 }