Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-06-26 03:57:43 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-06-26 08:15:04 (GMT) |
| commit | 96528818b201c5a250701b58bb9c4d11048b237e (patch) | |
| tree | e0685e693f4adacf5bab77357ab0b6b3353d126e /Swift | |
| parent | bd0e671455f6b042bbbd385f1551e9a5011badf5 (diff) | |
| download | swift-96528818b201c5a250701b58bb9c4d11048b237e.zip swift-96528818b201c5a250701b58bb9c4d11048b237e.tar.bz2 | |
Fix compiler warnings raise by Clang on Linux
Clang raises warnings about unused members and
macros on Linux. These are fixed with this change.
Test-Information:
Tested with clang-3.9 on Debian Stretch.
Change-Id: I87bc0606cfd14365330aaad4ed433d3bca2d5330
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtCertificateViewerDialog.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtDBUSURIHandler.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Swift/QtUI/QtCertificateViewerDialog.cpp b/Swift/QtUI/QtCertificateViewerDialog.cpp index 6454d82..a36ccdb 100644 --- a/Swift/QtUI/QtCertificateViewerDialog.cpp +++ b/Swift/QtUI/QtCertificateViewerDialog.cpp @@ -89,60 +89,58 @@ void QtCertificateViewerDialog::currentItemChanged(QTreeWidgetItem* current, QTr void QtCertificateViewerDialog::setCertificateDetails(const QSslCertificate& cert) { QLayoutItem* item; while ((item = ui->certGridLayout->takeAt(0)) != NULL ) { delete item->widget(); delete item; } int rowCount = 0; ui->certGridLayout->setColumnStretch(2, 1); QLabel* valueLabel = 0; ADD_SECTION(tr("General")); ADD_FIELD(tr("Valid From"), cert.effectiveDate().toString(Qt::TextDate)); ADD_FIELD(tr("Valid To"), cert.expiryDate().toString(Qt::TextDate)); ADD_FIELD(tr("Serial Number"), QString(cert.serialNumber().toHex())); ADD_FIELD(tr("Version"), QString(cert.version())); ADD_SECTION(tr("Subject")); ADD_FIELD(tr("Organization"), cert.subjectInfo(QSslCertificate::Organization)); ADD_FIELD(tr("Common Name"), cert.subjectInfo(QSslCertificate::CommonName)); ADD_FIELD(tr("Locality"), cert.subjectInfo(QSslCertificate::LocalityName)); ADD_FIELD(tr("Organizational Unit"), cert.subjectInfo(QSslCertificate::OrganizationalUnitName)); ADD_FIELD(tr("Country"), cert.subjectInfo(QSslCertificate::CountryName)); ADD_FIELD(tr("State"), cert.subjectInfo(QSslCertificate::StateOrProvinceName)); #if QT_VERSION < 0x050000 QMultiMap<QSsl::AlternateNameEntryType, QString> altNames = cert.alternateSubjectNames(); -#define SANTYPE QSsl::AlternateNameEntryType #else QMultiMap<QSsl::AlternativeNameEntryType, QString> altNames = cert.subjectAlternativeNames(); -#define SANTYPE QSsl::AlternativeNameEntryType #endif if (!altNames.empty()) { ADD_SECTION(tr("Alternate Subject Names")); for (const auto& type : altNames.uniqueKeys()) { for (auto&& name : altNames.values(type)) { if (type == QSsl::EmailEntry) { ADD_FIELD(tr("E-mail Address"), name); } else { ADD_FIELD(tr("DNS Name"), name); } } } } ADD_SECTION(tr("Issuer")); ADD_FIELD(tr("Organization"), cert.issuerInfo(QSslCertificate::Organization)); ADD_FIELD(tr("Common Name"), cert.issuerInfo(QSslCertificate::CommonName)); ADD_FIELD(tr("Locality"), cert.issuerInfo(QSslCertificate::LocalityName)); ADD_FIELD(tr("Organizational Unit"), cert.issuerInfo(QSslCertificate::OrganizationalUnitName)); ADD_FIELD(tr("Country"), cert.issuerInfo(QSslCertificate::CountryName)); ADD_FIELD(tr("State"), cert.issuerInfo(QSslCertificate::StateOrProvinceName)); ui->certGridLayout->setRowStretch(rowCount + 1, 1); } } diff --git a/Swift/QtUI/QtDBUSURIHandler.cpp b/Swift/QtUI/QtDBUSURIHandler.cpp index c873676..34659f4 100644 --- a/Swift/QtUI/QtDBUSURIHandler.cpp +++ b/Swift/QtUI/QtDBUSURIHandler.cpp @@ -1,41 +1,46 @@ /* * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swift/QtUI/QtDBUSURIHandler.h> #include <QDBusAbstractAdaptor> #include <QDBusConnection> #include <Swift/QtUI/QtSwiftUtil.h> using namespace Swift; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-member-function" + namespace { class DBUSAdaptor: public QDBusAbstractAdaptor { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "im.swift.Swift.URIHandler"); public: DBUSAdaptor(QtDBUSURIHandler* uriHandler) : QDBusAbstractAdaptor(uriHandler), uriHandler(uriHandler) { } public slots: void openURI(const QString& uri) { uriHandler->onURI(Q2PSTRING(uri)); } private: QtDBUSURIHandler* uriHandler; }; } QtDBUSURIHandler::QtDBUSURIHandler() { new DBUSAdaptor(this); QDBusConnection connection = QDBusConnection::sessionBus(); connection.registerService("im.swift.Swift.URIHandler"); connection.registerObject("/", this); } +#pragma clang diagnostic pop + #include "QtDBUSURIHandler.moc" |