8 files changed, 17 insertions, 17 deletions
diff --git a/Swiften/Chat/ChatStateTracker.cpp b/Swiften/Chat/ChatStateTracker.cpp
index 25ecd1c..839f47d 100644
--- a/Swiften/Chat/ChatStateTracker.cpp
+++ b/Swiften/Chat/ChatStateTracker.cpp
@@ -19,3 +19,3 @@ void ChatStateTracker::handleMessageReceived(std::shared_ptr<Message> message) {
     if (statePayload) {
-        changeState(statePayload->getChatState());;
+        changeState(statePayload->getChatState());
     }
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp
index bb9be58..4e34417 100644
--- a/Swiften/Client/ClientSession.cpp
+++ b/Swiften/Client/ClientSession.cpp
@@ -124,3 +124,3 @@ void ClientSession::sendStanza(std::shared_ptr<Stanza> stanza) {
 void ClientSession::handleStreamStart(const ProtocolHeader&) {
-    CHECK_STATE_OR_RETURN(State::WaitingForStreamStart);
+    CHECK_STATE_OR_RETURN(State::WaitingForStreamStart)
     state = State::Negotiating;
@@ -216,3 +216,3 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
     else if (StreamFeatures* streamFeatures = dynamic_cast<StreamFeatures*>(element.get())) {
-        CHECK_STATE_OR_RETURN(State::Negotiating);
+        CHECK_STATE_OR_RETURN(State::Negotiating)
 
@@ -322,3 +322,3 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
     else if (std::dynamic_pointer_cast<Compressed>(element)) {
-        CHECK_STATE_OR_RETURN(State::Compressing);
+        CHECK_STATE_OR_RETURN(State::Compressing)
         state = State::WaitingForStreamStart;
@@ -345,3 +345,3 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
     else if (AuthChallenge* challenge = dynamic_cast<AuthChallenge*>(element.get())) {
-        CHECK_STATE_OR_RETURN(State::Authenticating);
+        CHECK_STATE_OR_RETURN(State::Authenticating)
         assert(authenticator);
@@ -363,3 +363,3 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
     else if (AuthSuccess* authSuccess = dynamic_cast<AuthSuccess*>(element.get())) {
-        CHECK_STATE_OR_RETURN(State::Authenticating);
+        CHECK_STATE_OR_RETURN(State::Authenticating)
         assert(authenticator);
@@ -380,3 +380,3 @@ void ClientSession::handleElement(std::shared_ptr<ToplevelElement> element) {
     else if (dynamic_cast<TLSProceed*>(element.get())) {
-        CHECK_STATE_OR_RETURN(State::WaitingForEncrypt);
+        CHECK_STATE_OR_RETURN(State::WaitingForEncrypt)
         state = State::Encrypting;
@@ -435,3 +435,3 @@ void ClientSession::handleTLSEncrypted() {
     if (!std::dynamic_pointer_cast<BOSHSessionStream>(stream)) {
-        CHECK_STATE_OR_RETURN(State::Encrypting);
+        CHECK_STATE_OR_RETURN(State::Encrypting)
     }
diff --git a/Swiften/Elements/JingleFileTransferFileInfo.h b/Swiften/Elements/JingleFileTransferFileInfo.h
index 9fd8756..0e8ccd4 100644
--- a/Swiften/Elements/JingleFileTransferFileInfo.h
+++ b/Swiften/Elements/JingleFileTransferFileInfo.h
@@ -38,3 +38,3 @@ namespace Swift {
             void setName(const std::string& name) {
-                name_ = name;;
+                name_ = name;
             }
diff --git a/Swiften/Elements/StreamInitiationFileInfo.h b/Swiften/Elements/StreamInitiationFileInfo.h
index f2dc5b9..773814f 100644
--- a/Swiften/Elements/StreamInitiationFileInfo.h
+++ b/Swiften/Elements/StreamInitiationFileInfo.h
@@ -28,3 +28,3 @@ public:
     void setName(const std::string& name) {
-        this->name = name;;
+        this->name = name;
     }
diff --git a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
index 607038f..cc783c6 100644
--- a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
+++ b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
@@ -79,3 +79,3 @@ int main(int argc, char* argv[]) {
     errorConnection = client->onDisconnected.connect(&handleDisconnected);
-    std::cout << "Connecting to JID " << jid << " with timeout " << timeout << "ms on host: "; ;
+    std::cout << "Connecting to JID " << jid << " with timeout " << timeout << "ms on host: ";
     if (!connectHost.empty()) {
diff --git a/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.cpp b/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.cpp
index f177304..faddcb9 100644
--- a/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.cpp
+++ b/Swiften/FileTransfer/IncrementalBytestreamHashCalculator.cpp
@@ -66,3 +66,3 @@ std::string IncrementalBytestreamHashCalculator::getSHA1String() {
     assert(sha1Hasher);
-    return Hexify::hexify(getSHA1Hash());;
+    return Hexify::hexify(getSHA1Hash());
 }
@@ -71,3 +71,3 @@ std::string IncrementalBytestreamHashCalculator::getMD5String() {
     assert(md5Hasher);
-    return Hexify::hexify(getMD5Hash());;
+    return Hexify::hexify(getMD5Hash());
 }
diff --git a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp
index 4743089..8c05c6f 100644
--- a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp
@@ -69,3 +69,3 @@ namespace Swift {
             element->setAttribute("stroke", rect.getPenColor().toHex());
-            element->setAttribute("fill", rect.getBrushColor().toHex());;
+            element->setAttribute("fill", rect.getBrushColor().toHex());
             element->setAttribute("stroke-width", std::to_string(rect.getPenWidth()));
@@ -82,3 +82,3 @@ namespace Swift {
             element->setAttribute("stroke", polygon.getPenColor().toHex());
-            element->setAttribute("fill", polygon.getBrushColor().toHex());;
+            element->setAttribute("fill", polygon.getBrushColor().toHex());
             element->setAttribute("stroke-width", std::to_string(polygon.getPenWidth()));
@@ -119,3 +119,3 @@ namespace Swift {
             element->setAttribute("stroke", ellipse.getPenColor().toHex());
-            element->setAttribute("fill", ellipse.getBrushColor().toHex());;
+            element->setAttribute("fill", ellipse.getBrushColor().toHex());
             element->setAttribute("stroke-width", std::to_string(ellipse.getPenWidth()));
diff --git a/Swiften/TLS/SecureTransport/SecureTransportContext.mm b/Swiften/TLS/SecureTransport/SecureTransportContext.mm
index 1ed636b..25f476f 100644
--- a/Swiften/TLS/SecureTransport/SecureTransportContext.mm
+++ b/Swiften/TLS/SecureTransport/SecureTransportContext.mm
@@ -378,3 +378,3 @@ std::vector<Certificate::ref> SecureTransportContext::getPeerCertificateChain()
 
-            SecTrustRef secTrust = nullptr;;
+            SecTrustRef secTrust = nullptr;
             OSStatus error = SSLCopyPeerTrust(sslContext_.get(), &secTrust);