Remove QT_VERSION checks

jameshilliard · jameshilliard · commit 3a093dd32961 · 2018-10-09T19:08:06.000-06:00
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
@@ -405,11 +405,7 @@ namespace // Anon namespace
 
 static void ReportInvalidCertificate(const QSslCertificate& cert)
 {
-#if QT_VERSION < 0x050000
-    qDebug() << QString("%1: Payment server found an invalid certificate: ").arg(__func__) << cert.serialNumber() << cert.subjectInfo(QSslCertificate::CommonName) << cert.subjectInfo(QSslCertificate::OrganizationalUnitName);
-#else
     qDebug() << QString("%1: Payment server found an invalid certificate: ").arg(__func__) << cert.serialNumber() << cert.subjectInfo(QSslCertificate::CommonName) << cert.subjectInfo(QSslCertificate::DistinguishedNameQualifier) << cert.subjectInfo(QSslCertificate::OrganizationalUnitName);
-#endif
 }
 
 //
@@ -462,13 +458,12 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)
             continue;
         }
 
-#if QT_VERSION >= 0x050000
         // Blacklisted certificate
         if (cert.isBlacklisted()) {
             ReportInvalidCertificate(cert);
             continue;
         }
-#endif
+
         QByteArray certData = cert.toDer();
         const unsigned char *data = (const unsigned char *)certData.data();
 

Original file line number	Diff line number	Diff line change
`@@ -405,11 +405,7 @@ namespace // Anon namespace`
`405`	`405`
`406`	`406`	`static void ReportInvalidCertificate(const QSslCertificate& cert)`
`407`	`407`	`{`
`408`		`-#if QT_VERSION < 0x050000`
`409`		`- qDebug() << QString("%1: Payment server found an invalid certificate: ").arg(__func__) << cert.serialNumber() << cert.subjectInfo(QSslCertificate::CommonName) << cert.subjectInfo(QSslCertificate::OrganizationalUnitName);`
`410`		`-#else`
`411`	`408`	`qDebug() << QString("%1: Payment server found an invalid certificate: ").arg(__func__) << cert.serialNumber() << cert.subjectInfo(QSslCertificate::CommonName) << cert.subjectInfo(QSslCertificate::DistinguishedNameQualifier) << cert.subjectInfo(QSslCertificate::OrganizationalUnitName);`
`412`		`-#endif`
`413`	`409`	`}`
`414`	`410`
`415`	`411`	`//`
`@@ -462,13 +458,12 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)`
`462`	`458`	`continue;`
`463`	`459`	`}`
`464`	`460`
`465`		`-#if QT_VERSION >= 0x050000`
`466`	`461`	`// Blacklisted certificate`
`467`	`462`	`if (cert.isBlacklisted()) {`
`468`	`463`	`ReportInvalidCertificate(cert);`
`469`	`464`	`continue;`
`470`	`465`	`}`
`471`		`-#endif`
	`466`	`+`
`472`	`467`	`QByteArray certData = cert.toDer();`
`473`	`468`	`const unsigned char data = (const unsigned char )certData.data();`
`474`	`469`