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
author: Tobias Markmann <tobias.markmann@isode.com> 2019-11-14 13:45:27 (GMT)
committer: Tobias Markmann <tobias.markmann@isode.com> 2019-11-14 13:45:45 (GMT)
commit: caca46ceedddd43c707e7eda9b4c765d61730ccb (patch)
tree: 0f6f61935d79d0a0931e50ef0c21828e8b3c9a48 /Swift
parent: 7a4d44dbc444b68b665535bb38847cfa48bfee3f (diff)
download: swift-caca46ceedddd43c707e7eda9b4c765d61730ccb.zip
swift-caca46ceedddd43c707e7eda9b4c765d61730ccb.tar.bz2
4 files changed, 32 insertions, 36 deletions
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(allowPLAINWithoutTLS)
-    SERIALIZE_BOOL(useStreamResumption);
+    SERIALIZE_BOOL(useStreamResumption)
-    SERIALIZE_BOOL(useAcks);
+    SERIALIZE_BOOL(useAcks)
-    SERIALIZE_STRING(manualHostname);
+    SERIALIZE_STRING(manualHostname)
-    SERIALIZE_INT(manualPort);
+    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_STRING(manualProxyHostname)
-    SERIALIZE_INT(manualProxyPort);
+    SERIALIZE_INT(manualProxyPort)
-    SERIALIZE_URL(boshURL);
+    SERIALIZE_URL(boshURL)
-    SERIALIZE_URL(boshHTTPConnectProxyURL);
+    SERIALIZE_URL(boshHTTPConnectProxyURL)
-    SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID);
+    SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID)
-    SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword);
+    SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword)
-    SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround);
+    SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround)
-    SERIALIZE_BOOL(singleSignOn);
+    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<int>& setting) {
    if (values_.find(setting.getKey()) != values_.end()) {
        std::string value = values_[setting.getKey()];
        try {
-            return value.empty() ? setting.getDefaultValue() : boost::lexical_cast<int>(value);;
+            return value.empty() ? setting.getDefaultValue() : boost::lexical_cast<int>(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<std::string> segments = String::split(optionString, ',');
-    PARSE_BOOL(useStreamCompression, 1);
+    PARSE_BOOL(useStreamCompression, 1)
-    PARSE_INT_RAW(-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(allowPLAINWithoutTLS, 0)
-    PARSE_BOOL(useStreamResumption, 0);
+    PARSE_BOOL(useStreamResumption, 0)
-    PARSE_BOOL(useAcks, 1);
+    PARSE_BOOL(useAcks, 1)
-    PARSE_STRING(manualHostname);
+    PARSE_STRING(manualHostname)
-    PARSE_INT(manualPort, -1);
+    PARSE_INT(manualPort, -1)
-    PARSE_INT_RAW(-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_STRING(manualProxyHostname)
-    PARSE_INT(manualProxyPort, -1);
+    PARSE_INT(manualProxyPort, -1)
-    PARSE_URL(boshURL);
+    PARSE_URL(boshURL)
-    PARSE_URL(boshHTTPConnectProxyURL);
+    PARSE_URL(boshHTTPConnectProxyURL)
-    PARSE_SAFE_STRING(boshHTTPConnectProxyAuthID);
+    PARSE_SAFE_STRING(boshHTTPConnectProxyAuthID)
-    PARSE_SAFE_STRING(boshHTTPConnectProxyAuthPassword);
+    PARSE_SAFE_STRING(boshHTTPConnectProxyAuthPassword)
-    PARSE_BOOL(tlsOptions.schannelTLS1_0Workaround, false);
+    PARSE_BOOL(tlsOptions.schannelTLS1_0Workaround, false)
-    PARSE_BOOL(singleSignOn, 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) {
author	Tobias Markmann <tobias.markmann@isode.com>	2019-11-14 13:45:27 (GMT)
committer	Tobias Markmann <tobias.markmann@isode.com>	2019-11-14 13:45:45 (GMT)
commit	caca46ceedddd43c707e7eda9b4c765d61730ccb (patch)
tree	0f6f61935d79d0a0931e50ef0c21828e8b3c9a48 /Swift
parent	7a4d44dbc444b68b665535bb38847cfa48bfee3f (diff)
download	swift-caca46ceedddd43c707e7eda9b4c765d61730ccb.zip swift-caca46ceedddd43c707e7eda9b4c765d61730ccb.tar.bz2

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() {
840		840
841	std::string AccountController::serializeClientOptions(const ClientOptions& options) {	841	std::string AccountController::serializeClientOptions(const ClientOptions& options) {
842	std::string result;	842	std::string result;
843	SERIALIZE_BOOL(useStreamCompression);	843	SERIALIZE_BOOL(useStreamCompression)
844	switch (options.useTLS) {	844	switch (options.useTLS) {
845	case ClientOptions::NeverUseTLS: result += "1";break;	845	case ClientOptions::NeverUseTLS: result += "1";break;
846	case ClientOptions::UseTLSWhenAvailable: result += "2";break;	846	case ClientOptions::UseTLSWhenAvailable: result += "2";break;
847	case ClientOptions::RequireTLS: result += "3";break;	847	case ClientOptions::RequireTLS: result += "3";break;
848	}	848	}
849	result += ",";	849	result += ",";
850	SERIALIZE_BOOL(allowPLAINWithoutTLS);	850	SERIALIZE_BOOL(allowPLAINWithoutTLS)
851	SERIALIZE_BOOL(useStreamResumption);	851	SERIALIZE_BOOL(useStreamResumption)
852	SERIALIZE_BOOL(useAcks);	852	SERIALIZE_BOOL(useAcks)
853	SERIALIZE_STRING(manualHostname);	853	SERIALIZE_STRING(manualHostname)
854	SERIALIZE_INT(manualPort);	854	SERIALIZE_INT(manualPort)
855	switch (options.proxyType) {	855	switch (options.proxyType) {
856	case ClientOptions::NoProxy: result += "1";break;	856	case ClientOptions::NoProxy: result += "1";break;
857	case ClientOptions::SystemConfiguredProxy: result += "2";break;	857	case ClientOptions::SystemConfiguredProxy: result += "2";break;
@@ -859,14 +859,14 @@ std::string AccountController::serializeClientOptions(const ClientOptions& optio
859	case ClientOptions::HTTPConnectProxy: result += "4";break;	859	case ClientOptions::HTTPConnectProxy: result += "4";break;
860	}	860	}
861	result += ",";	861	result += ",";
862	SERIALIZE_STRING(manualProxyHostname);	862	SERIALIZE_STRING(manualProxyHostname)
863	SERIALIZE_INT(manualProxyPort);	863	SERIALIZE_INT(manualProxyPort)
864	SERIALIZE_URL(boshURL);	864	SERIALIZE_URL(boshURL)
865	SERIALIZE_URL(boshHTTPConnectProxyURL);	865	SERIALIZE_URL(boshHTTPConnectProxyURL)
866	SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID);	866	SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID)
867	SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword);	867	SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword)
868	SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround);	868	SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround)
869	SERIALIZE_BOOL(singleSignOn);	869	SERIALIZE_BOOL(singleSignOn)
870	return result;	870	return result;
871	}	871	}
872		872


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<int>& setting) {
68	if (values_.find(setting.getKey()) != values_.end()) {	68	if (values_.find(setting.getKey()) != values_.end()) {
69	std::string value = values_[setting.getKey()];	69	std::string value = values_[setting.getKey()];
70	try {	70	try {
71	return value.empty() ? setting.getDefaultValue() : boost::lexical_cast<int>(value);;	71	return value.empty() ? setting.getDefaultValue() : boost::lexical_cast<int>(value);
72	}	72	}
73	catch(boost::bad_lexical_cast &) {}	73	catch(boost::bad_lexical_cast &) {}
74	}	74	}
@@ -123,7 +123,3 @@ void XMLSettingsProvider::handleCharacterData(const std::string& data) {
123		123
124		124
125	}	125	}
126
127
128
129


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) {
446	std::string stringVal;	446	std::string stringVal;
447	std::vector<std::string> segments = String::split(optionString, ',');	447	std::vector<std::string> segments = String::split(optionString, ',');
448		448
449	PARSE_BOOL(useStreamCompression, 1);	449	PARSE_BOOL(useStreamCompression, 1)
450	PARSE_INT_RAW(-1);	450	PARSE_INT_RAW(-1)
451	switch (intVal) {	451	switch (intVal) {
452	case 1: result.useTLS = ClientOptions::NeverUseTLS; break;	452	case 1: result.useTLS = ClientOptions::NeverUseTLS; break;
453	case 2: result.useTLS = ClientOptions::UseTLSWhenAvailable; break;	453	case 2: result.useTLS = ClientOptions::UseTLSWhenAvailable; break;
454	case 3: result.useTLS = ClientOptions::RequireTLS; break;	454	case 3: result.useTLS = ClientOptions::RequireTLS; break;
455	default:;	455	default:;
456	}	456	}
457	PARSE_BOOL(allowPLAINWithoutTLS, 0);	457	PARSE_BOOL(allowPLAINWithoutTLS, 0)
458	PARSE_BOOL(useStreamResumption, 0);	458	PARSE_BOOL(useStreamResumption, 0)
459	PARSE_BOOL(useAcks, 1);	459	PARSE_BOOL(useAcks, 1)
460	PARSE_STRING(manualHostname);	460	PARSE_STRING(manualHostname)
461	PARSE_INT(manualPort, -1);	461	PARSE_INT(manualPort, -1)
462	PARSE_INT_RAW(-1);	462	PARSE_INT_RAW(-1)
463	switch (intVal) {	463	switch (intVal) {
464	case 1: result.proxyType = ClientOptions::NoProxy; break;	464	case 1: result.proxyType = ClientOptions::NoProxy; break;
465	case 2: result.proxyType = ClientOptions::SystemConfiguredProxy; break;	465	case 2: result.proxyType = ClientOptions::SystemConfiguredProxy; break;
466	case 3: result.proxyType = ClientOptions::SOCKS5Proxy; break;	466	case 3: result.proxyType = ClientOptions::SOCKS5Proxy; break;
467	case 4: result.proxyType = ClientOptions::HTTPConnectProxy; break;	467	case 4: result.proxyType = ClientOptions::HTTPConnectProxy; break;
468	}	468	}
469	PARSE_STRING(manualProxyHostname);	469	PARSE_STRING(manualProxyHostname)
470	PARSE_INT(manualProxyPort, -1);	470	PARSE_INT(manualProxyPort, -1)
471	PARSE_URL(boshURL);	471	PARSE_URL(boshURL)
472	PARSE_URL(boshHTTPConnectProxyURL);	472	PARSE_URL(boshHTTPConnectProxyURL)
473	PARSE_SAFE_STRING(boshHTTPConnectProxyAuthID);	473	PARSE_SAFE_STRING(boshHTTPConnectProxyAuthID)
474	PARSE_SAFE_STRING(boshHTTPConnectProxyAuthPassword);	474	PARSE_SAFE_STRING(boshHTTPConnectProxyAuthPassword)
475	PARSE_BOOL(tlsOptions.schannelTLS1_0Workaround, false);	475	PARSE_BOOL(tlsOptions.schannelTLS1_0Workaround, false)
476	PARSE_BOOL(singleSignOn, false);	476	PARSE_BOOL(singleSignOn, false)
477		477
478	return result;	478	return result;
479	}	479	}


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) {
82	} else if ((keyEvent->key() == Qt::Key_Alt && event->type() == QEvent::KeyRelease && isModifierSinglePressed_)	82	} else if ((keyEvent->key() == Qt::Key_Alt && event->type() == QEvent::KeyRelease && isModifierSinglePressed_)
83	\|\| (keyEvent->key() == Qt::Key_Menu)) {	83	\|\| (keyEvent->key() == Qt::Key_Menu)) {
84	QPoint itemOffset(2,2);	84	QPoint itemOffset(2,2);
85	QPoint contextMenuPosition = treeView_->visualRect(treeView_->currentIndex()).topLeft() + itemOffset;;	85	QPoint contextMenuPosition = treeView_->visualRect(treeView_->currentIndex()).topLeft() + itemOffset;
86	QApplication::postEvent(treeView_, new QContextMenuEvent(QContextMenuEvent::Keyboard, contextMenuPosition, treeView_->mapToGlobal(contextMenuPosition)));	86	QApplication::postEvent(treeView_, new QContextMenuEvent(QContextMenuEvent::Keyboard, contextMenuPosition, treeView_->mapToGlobal(contextMenuPosition)));
87	return true;	87	return true;
88	} else if (keyEvent->key() == Qt::Key_Return) {	88	} else if (keyEvent->key() == Qt::Key_Return) {