Swiftdiff options
| 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/QtUI | |
| parent | 7a4d44dbc444b68b665535bb38847cfa48bfee3f (diff) | |
| download | swift-caca46ceedddd43c707e7eda9b4c765d61730ccb.zip swift-caca46ceedddd43c707e7eda9b4c765d61730ccb.tar.bz2 | |
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
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 32 | ||||
| -rw-r--r-- | Swift/QtUI/Roster/QtFilterWidget.cpp | 2 |
2 files changed, 17 insertions, 17 deletions
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) { |