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/QtUI | |
| 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/QtUI')
| -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 @@ -116,10 +116,8 @@ void QtCertificateViewerDialog::setCertificateDetails(const QSslCertificate& cer #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")); 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 @@ -13,6 +13,9 @@ using namespace Swift; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-member-function" + namespace { class DBUSAdaptor: public QDBusAbstractAdaptor { Q_OBJECT @@ -38,4 +41,6 @@ QtDBUSURIHandler::QtDBUSURIHandler() { connection.registerObject("/", this); } +#pragma clang diagnostic pop + #include "QtDBUSURIHandler.moc" |