From caca46ceedddd43c707e7eda9b4c765d61730ccb Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Thu, 14 Nov 2019 14:45:27 +0100 Subject: Remove extra semicolons clang-trunk complained about them and ideally Swift would build without warnings. Test-Information: Builds find and tests pass. Change-Id: I1896befef0e65a980cc22f402e126aec8b56e71f diff --git a/Swift/Controllers/AccountController.cpp b/Swift/Controllers/AccountController.cpp index 27655c0..b877ce9 100644 --- a/Swift/Controllers/AccountController.cpp +++ b/Swift/Controllers/AccountController.cpp @@ -840,18 +840,18 @@ void AccountController::handleQuitRequest() { std::string AccountController::serializeClientOptions(const ClientOptions& options) { std::string result; - SERIALIZE_BOOL(useStreamCompression); + SERIALIZE_BOOL(useStreamCompression) switch (options.useTLS) { case ClientOptions::NeverUseTLS: result += "1";break; case ClientOptions::UseTLSWhenAvailable: result += "2";break; case ClientOptions::RequireTLS: result += "3";break; } result += ","; - SERIALIZE_BOOL(allowPLAINWithoutTLS); - SERIALIZE_BOOL(useStreamResumption); - SERIALIZE_BOOL(useAcks); - SERIALIZE_STRING(manualHostname); - SERIALIZE_INT(manualPort); + SERIALIZE_BOOL(allowPLAINWithoutTLS) + SERIALIZE_BOOL(useStreamResumption) + SERIALIZE_BOOL(useAcks) + SERIALIZE_STRING(manualHostname) + SERIALIZE_INT(manualPort) switch (options.proxyType) { case ClientOptions::NoProxy: result += "1";break; case ClientOptions::SystemConfiguredProxy: result += "2";break; @@ -859,14 +859,14 @@ std::string AccountController::serializeClientOptions(const ClientOptions& optio case ClientOptions::HTTPConnectProxy: result += "4";break; } result += ","; - SERIALIZE_STRING(manualProxyHostname); - SERIALIZE_INT(manualProxyPort); - SERIALIZE_URL(boshURL); - SERIALIZE_URL(boshHTTPConnectProxyURL); - SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID); - SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword); - SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround); - SERIALIZE_BOOL(singleSignOn); + SERIALIZE_STRING(manualProxyHostname) + SERIALIZE_INT(manualProxyPort) + SERIALIZE_URL(boshURL) + SERIALIZE_URL(boshHTTPConnectProxyURL) + SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID) + SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword) + SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround) + SERIALIZE_BOOL(singleSignOn) return result; } diff --git a/Swift/Controllers/Settings/XMLSettingsProvider.cpp b/Swift/Controllers/Settings/XMLSettingsProvider.cpp index 8415209..f1049f1 100644 --- a/Swift/Controllers/Settings/XMLSettingsProvider.cpp +++ b/Swift/Controllers/Settings/XMLSettingsProvider.cpp @@ -68,7 +68,7 @@ int XMLSettingsProvider::getSetting(const Setting& setting) { if (values_.find(setting.getKey()) != values_.end()) { std::string value = values_[setting.getKey()]; try { - return value.empty() ? setting.getDefaultValue() : boost::lexical_cast(value);; + return value.empty() ? setting.getDefaultValue() : boost::lexical_cast(value); } catch(boost::bad_lexical_cast &) {} } @@ -123,7 +123,3 @@ void XMLSettingsProvider::handleCharacterData(const std::string& data) { } - - - - diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 8de5d70..f1ad38e 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -446,34 +446,34 @@ ClientOptions QtSwift::parseClientOptions(const std::string& optionString) { std::string stringVal; std::vector segments = String::split(optionString, ','); - PARSE_BOOL(useStreamCompression, 1); - PARSE_INT_RAW(-1); + PARSE_BOOL(useStreamCompression, 1) + PARSE_INT_RAW(-1) switch (intVal) { case 1: result.useTLS = ClientOptions::NeverUseTLS; break; case 2: result.useTLS = ClientOptions::UseTLSWhenAvailable; break; case 3: result.useTLS = ClientOptions::RequireTLS; break; default:; } - PARSE_BOOL(allowPLAINWithoutTLS, 0); - PARSE_BOOL(useStreamResumption, 0); - PARSE_BOOL(useAcks, 1); - PARSE_STRING(manualHostname); - PARSE_INT(manualPort, -1); - PARSE_INT_RAW(-1); + PARSE_BOOL(allowPLAINWithoutTLS, 0) + PARSE_BOOL(useStreamResumption, 0) + PARSE_BOOL(useAcks, 1) + PARSE_STRING(manualHostname) + PARSE_INT(manualPort, -1) + PARSE_INT_RAW(-1) switch (intVal) { case 1: result.proxyType = ClientOptions::NoProxy; break; case 2: result.proxyType = ClientOptions::SystemConfiguredProxy; break; case 3: result.proxyType = ClientOptions::SOCKS5Proxy; break; case 4: result.proxyType = ClientOptions::HTTPConnectProxy; break; } - PARSE_STRING(manualProxyHostname); - PARSE_INT(manualProxyPort, -1); - PARSE_URL(boshURL); - PARSE_URL(boshHTTPConnectProxyURL); - PARSE_SAFE_STRING(boshHTTPConnectProxyAuthID); - PARSE_SAFE_STRING(boshHTTPConnectProxyAuthPassword); - PARSE_BOOL(tlsOptions.schannelTLS1_0Workaround, false); - PARSE_BOOL(singleSignOn, false); + PARSE_STRING(manualProxyHostname) + PARSE_INT(manualProxyPort, -1) + PARSE_URL(boshURL) + PARSE_URL(boshHTTPConnectProxyURL) + PARSE_SAFE_STRING(boshHTTPConnectProxyAuthID) + PARSE_SAFE_STRING(boshHTTPConnectProxyAuthPassword) + PARSE_BOOL(tlsOptions.schannelTLS1_0Workaround, false) + PARSE_BOOL(singleSignOn, false) return result; } diff --git a/Swift/QtUI/Roster/QtFilterWidget.cpp b/Swift/QtUI/Roster/QtFilterWidget.cpp index 2f561bd..c017d29 100644 --- a/Swift/QtUI/Roster/QtFilterWidget.cpp +++ b/Swift/QtUI/Roster/QtFilterWidget.cpp @@ -82,7 +82,7 @@ bool QtFilterWidget::eventFilter(QObject*, QEvent* event) { } else if ((keyEvent->key() == Qt::Key_Alt && event->type() == QEvent::KeyRelease && isModifierSinglePressed_) || (keyEvent->key() == Qt::Key_Menu)) { QPoint itemOffset(2,2); - QPoint contextMenuPosition = treeView_->visualRect(treeView_->currentIndex()).topLeft() + itemOffset;; + QPoint contextMenuPosition = treeView_->visualRect(treeView_->currentIndex()).topLeft() + itemOffset; QApplication::postEvent(treeView_, new QContextMenuEvent(QContextMenuEvent::Keyboard, contextMenuPosition, treeView_->mapToGlobal(contextMenuPosition))); return true; } else if (keyEvent->key() == Qt::Key_Return) { 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 @@ -17,7 +17,7 @@ void ChatStateTracker::handleMessageReceived(std::shared_ptr message) { } std::shared_ptr statePayload = message->getPayload(); 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 @@ -122,7 +122,7 @@ void ClientSession::sendStanza(std::shared_ptr stanza) { } void ClientSession::handleStreamStart(const ProtocolHeader&) { - CHECK_STATE_OR_RETURN(State::WaitingForStreamStart); + CHECK_STATE_OR_RETURN(State::WaitingForStreamStart) state = State::Negotiating; } @@ -214,7 +214,7 @@ void ClientSession::handleElement(std::shared_ptr element) { } } else if (StreamFeatures* streamFeatures = dynamic_cast(element.get())) { - CHECK_STATE_OR_RETURN(State::Negotiating); + CHECK_STATE_OR_RETURN(State::Negotiating) if (streamFeatures->hasStartTLS() && stream->supportsTLSEncryption() && useTLS != NeverUseTLS) { state = State::WaitingForEncrypt; @@ -320,7 +320,7 @@ void ClientSession::handleElement(std::shared_ptr element) { } } else if (std::dynamic_pointer_cast(element)) { - CHECK_STATE_OR_RETURN(State::Compressing); + CHECK_STATE_OR_RETURN(State::Compressing) state = State::WaitingForStreamStart; stream->addZLibCompression(); stream->resetXMPPParser(); @@ -343,7 +343,7 @@ void ClientSession::handleElement(std::shared_ptr element) { continueSessionInitialization(); } else if (AuthChallenge* challenge = dynamic_cast(element.get())) { - CHECK_STATE_OR_RETURN(State::Authenticating); + CHECK_STATE_OR_RETURN(State::Authenticating) assert(authenticator); if (authenticator->setChallenge(challenge->getValue())) { stream->writeElement(std::make_shared(authenticator->getResponse())); @@ -361,7 +361,7 @@ void ClientSession::handleElement(std::shared_ptr element) { } } else if (AuthSuccess* authSuccess = dynamic_cast(element.get())) { - CHECK_STATE_OR_RETURN(State::Authenticating); + CHECK_STATE_OR_RETURN(State::Authenticating) assert(authenticator); if (!authenticator->setChallenge(authSuccess->getValue())) { finishSession(Error::ServerVerificationFailedError); @@ -378,7 +378,7 @@ void ClientSession::handleElement(std::shared_ptr element) { finishSession(Error::AuthenticationFailedError); } else if (dynamic_cast(element.get())) { - CHECK_STATE_OR_RETURN(State::WaitingForEncrypt); + CHECK_STATE_OR_RETURN(State::WaitingForEncrypt) state = State::Encrypting; stream->addTLSEncryption(); } @@ -433,7 +433,7 @@ void ClientSession::sendCredentials(const SafeByteArray& password) { void ClientSession::handleTLSEncrypted() { if (!std::dynamic_pointer_cast(stream)) { - CHECK_STATE_OR_RETURN(State::Encrypting); + CHECK_STATE_OR_RETURN(State::Encrypting) } std::vector certificateChain = stream->getPeerCertificateChain(); 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 @@ -36,7 +36,7 @@ namespace Swift { public: void setName(const std::string& name) { - name_ = name;; + name_ = name; } const std::string& getName() const { 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 @@ -26,7 +26,7 @@ public: name(name), description(description), size(size), hash(hash), date(date), algo(algo), supportsRangeRequests(false), rangeOffset(0) {} void setName(const std::string& name) { - this->name = name;; + this->name = name; } const std::string& getName() const { 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 @@ -77,7 +77,7 @@ int main(int argc, char* argv[]) { ClientXMLTracer* tracer = new ClientXMLTracer(client); client->onConnected.connect(&handleConnected); 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()) { std::cout << connectHost << std::endl; ClientOptions options; 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 @@ -64,12 +64,12 @@ ByteArray IncrementalBytestreamHashCalculator::getMD5Hash() { std::string IncrementalBytestreamHashCalculator::getSHA1String() { assert(sha1Hasher); - return Hexify::hexify(getSHA1Hash());; + return Hexify::hexify(getSHA1Hash()); } 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 @@ -67,7 +67,7 @@ namespace Swift { element->setAttribute("height", std::to_string(rect.getHeight())); element->setAttribute("id", rect.getID()); 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())); element->setAttribute("opacity", alphaToOpacity(rect.getPenColor().getAlpha())); element->setAttribute("fill-opacity", alphaToOpacity(rect.getBrushColor().getAlpha())); @@ -80,7 +80,7 @@ namespace Swift { try { element->setAttribute("id", polygon.getID()); 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())); element->setAttribute("opacity", alphaToOpacity(polygon.getPenColor().getAlpha())); element->setAttribute("fill-opacity", alphaToOpacity(polygon.getBrushColor().getAlpha())); @@ -117,7 +117,7 @@ namespace Swift { element->setAttribute("ry", std::to_string(ellipse.getRY())); element->setAttribute("id", ellipse.getID()); 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())); element->setAttribute("opacity", alphaToOpacity(ellipse.getPenColor().getAlpha())); element->setAttribute("fill-opacity", alphaToOpacity(ellipse.getBrushColor().getAlpha())); 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 @@ -376,7 +376,7 @@ std::vector SecureTransportContext::getPeerCertificateChain() typedef boost::remove_pointer::type SecTrust; std::shared_ptr securityTrust; - SecTrustRef secTrust = nullptr;; + SecTrustRef secTrust = nullptr; OSStatus error = SSLCopyPeerTrust(sslContext_.get(), &secTrust); if (error == noErr) { securityTrust = std::shared_ptr(secTrust, CFRelease); -- cgit v0.10.2-6-g49f6