Swiftdiff options
| -rw-r--r-- | Sluift/SluiftException.h | 3 | ||||
| -rw-r--r-- | SwifTools/Idle/MacOSXIdleQuerier.cpp | 2 | ||||
| -rw-r--r-- | Swift/Controllers/Chat/UserSearchController.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtMUCConfigurationWindow.cpp | 2 | ||||
| -rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h | 2 | ||||
| -rw-r--r-- | Swiften/QA/TLSTest/CertificateTest.cpp | 3 | ||||
| -rw-r--r-- | Swiften/Session/Session.cpp | 2 |
7 files changed, 10 insertions, 6 deletions
diff --git a/Sluift/SluiftException.h b/Sluift/SluiftException.h index 92326b6..28393ab 100644 --- a/Sluift/SluiftException.h +++ b/Sluift/SluiftException.h @@ -31,12 +31,15 @@ namespace Swift { case ClientError::NoSupportedAuthMechanismsError: reason += "Authentication mechanisms not supported"; break; case ClientError::UnexpectedElementError: reason += "Unexpected response"; break; case ClientError::ResourceBindError: reason += "Error binding resource"; break; + case ClientError::RevokedError: reason += "Certificate got revoked"; break; + case ClientError::RevocationCheckFailedError: reason += "Failed to do revokation check"; break; case ClientError::SessionStartError: reason += "Error starting session"; break; case ClientError::StreamError: reason += "Stream error"; break; case ClientError::TLSError: reason += "Encryption error"; break; case ClientError::ClientCertificateLoadError: reason += "Error loading certificate (Invalid password?)"; break; case ClientError::ClientCertificateError: reason += "Certificate not authorized"; break; case ClientError::UnknownCertificateError: reason += "Unknown certificate"; break; + case ClientError::CertificateCardRemoved: reason += "Certificate card removed"; break; case ClientError::CertificateExpiredError: reason += "Certificate has expired"; break; case ClientError::CertificateNotYetValidError: reason += "Certificate is not yet valid"; break; case ClientError::CertificateSelfSignedError: reason += "Certificate is self-signed"; break; diff --git a/SwifTools/Idle/MacOSXIdleQuerier.cpp b/SwifTools/Idle/MacOSXIdleQuerier.cpp index b634fcb..233d7c6 100644 --- a/SwifTools/Idle/MacOSXIdleQuerier.cpp +++ b/SwifTools/Idle/MacOSXIdleQuerier.cpp @@ -14,7 +14,7 @@ namespace Swift { -MacOSXIdleQuerier::MacOSXIdleQuerier() : ioService(NULL) { +MacOSXIdleQuerier::MacOSXIdleQuerier() : ioService(0) { mach_port_t masterPort; IOMasterPort(MACH_PORT_NULL, &masterPort); ioService = IOServiceGetMatchingService(masterPort, IOServiceMatching("IOHIDSystem")); diff --git a/Swift/Controllers/Chat/UserSearchController.cpp b/Swift/Controllers/Chat/UserSearchController.cpp index 47d57d4..839f4fa 100644 --- a/Swift/Controllers/Chat/UserSearchController.cpp +++ b/Swift/Controllers/Chat/UserSearchController.cpp @@ -48,7 +48,7 @@ void UserSearchController::handleUIEvent(boost::shared_ptr<UIEvent> event) { bool handle = false; boost::shared_ptr<RequestAddUserDialogUIEvent> request = boost::shared_ptr<RequestAddUserDialogUIEvent>(); if (type_ == AddContact) { - if (request = boost::dynamic_pointer_cast<RequestAddUserDialogUIEvent>(event)) { + if ((request = boost::dynamic_pointer_cast<RequestAddUserDialogUIEvent>(event))) { handle = true; } } else { diff --git a/Swift/QtUI/QtMUCConfigurationWindow.cpp b/Swift/QtUI/QtMUCConfigurationWindow.cpp index 6fdfd43..83a5f35 100644 --- a/Swift/QtUI/QtMUCConfigurationWindow.cpp +++ b/Swift/QtUI/QtMUCConfigurationWindow.cpp @@ -44,7 +44,7 @@ QtMUCConfigurationWindow::~QtMUCConfigurationWindow() { } -void QtMUCConfigurationWindow::closeEvent(QCloseEvent* event) { +void QtMUCConfigurationWindow::closeEvent(QCloseEvent* /*event*/) { if (!closed_) { onFormCancelled(); } diff --git a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h index fd0e9d0..d3c9488 100644 --- a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h @@ -41,7 +41,7 @@ namespace Swift { void updateServiceInfo(const ByteArray& txtRecord) { boost::lock_guard<boost::mutex> lock(sdRefMutex); - DNSServiceUpdateRecord(sdRef, NULL, NULL, txtRecord.size(), vecptr(txtRecord), 0); + DNSServiceUpdateRecord(sdRef, NULL, 0, txtRecord.size(), vecptr(txtRecord), 0); } private: diff --git a/Swiften/QA/TLSTest/CertificateTest.cpp b/Swiften/QA/TLSTest/CertificateTest.cpp index 67ca064..6932881 100644 --- a/Swiften/QA/TLSTest/CertificateTest.cpp +++ b/Swiften/QA/TLSTest/CertificateTest.cpp @@ -6,11 +6,12 @@ #include <Swiften/Base/ByteArray.h> +#include <QA/Checker/IO.h> + #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> #include <boost/bind.hpp> -#include <QA/Checker/IO.h> #include <Swiften/TLS/CertificateFactory.h> #include "SwifTools/Application/PlatformApplicationPathProvider.h" diff --git a/Swiften/Session/Session.cpp b/Swiften/Session/Session.cpp index 0eef997..acc73f1 100644 --- a/Swiften/Session/Session.cpp +++ b/Swiften/Session/Session.cpp @@ -50,7 +50,7 @@ void Session::finishSession() { connection->disconnect(); } -void Session::finishSession(const SessionError& error) { +void Session::finishSession(const SessionError& /*error*/) { if (finishing) { return; } |