diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2020-10-30 03:22:48 +0100 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2020-10-30 03:22:48 +0100 |
| commit | 888d0047648c008e884a017a3ef8be5fdf72ced4 (patch) | |
| tree | 97fd4a64f69de4c318ba6d728658e2a44750ed09 /src | |
| parent | Merge pull request #311 from trilene/webrtc-video (diff) | |
| download | nheko-888d0047648c008e884a017a3ef8be5fdf72ced4.tar.xz | |
Supress unused var warning for STUN_SERVER (used only if gstreamer supported)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Olm.cpp | 4 | ||||
| -rw-r--r-- | src/TextInputWidget.cpp | 4 | ||||
| -rw-r--r-- | src/Utils.cpp | 2 | ||||
| -rw-r--r-- | src/WebRTCSession.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Olm.cpp b/src/Olm.cpp index af8bb512..cdafabf3 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp @@ -435,8 +435,8 @@ send_key_request_for(mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> e, e.content.session_id); mtx::events::msg::KeyRequest request; - request.action = !cancel ? mtx::events::msg::RequestAction::Request - : mtx::events::msg::RequestAction::Cancellation; + request.action = !cancel ? mtx::events::msg::RequestAction::Request + : mtx::events::msg::RequestAction::Cancellation; request.algorithm = MEGOLM_ALGO; request.room_id = e.room_id; request.sender_key = e.content.sender_key; diff --git a/src/TextInputWidget.cpp b/src/TextInputWidget.cpp index c75c6c89..81c1bce9 100644 --- a/src/TextInputWidget.cpp +++ b/src/TextInputWidget.cpp @@ -453,8 +453,8 @@ FilteredTextEdit::completerRect() auto item_height = completer_->popup()->sizeHintForRow(0); auto max_height = item_height * completer_->maxVisibleItems(); auto height = (completer_->completionCount() > completer_->maxVisibleItems()) - ? max_height - : completer_->completionCount() * item_height; + ? max_height + : completer_->completionCount() * item_height; rect.setWidth(completer_->popup()->sizeHintForColumn(0)); rect.moveBottom(-height); return rect; diff --git a/src/Utils.cpp b/src/Utils.cpp index 38dbba22..0bfc82c3 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -638,7 +638,7 @@ utils::luminance(const QColor &col) qreal lumRgb[3]; for (int i = 0; i < 3; i++) { - qreal v = colRgb[i] / 255.0; + qreal v = colRgb[i] / 255.0; v <= 0.03928 ? lumRgb[i] = v / 12.92 : lumRgb[i] = qPow((v + 0.055) / 1.055, 2.4); } diff --git a/src/WebRTCSession.cpp b/src/WebRTCSession.cpp index 890bb866..c746df8e 100644 --- a/src/WebRTCSession.cpp +++ b/src/WebRTCSession.cpp @@ -25,7 +25,7 @@ extern "C" #endif // https://github.com/vector-im/riot-web/issues/10173 -constexpr std::string_view STUN_SERVER = "stun://turn.matrix.org:3478"; +[[maybe_unused]] constexpr std::string_view STUN_SERVER = "stun://turn.matrix.org:3478"; Q_DECLARE_METATYPE(webrtc::State) |