summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authortrilene <trilene@runbox.com>2020-11-13 09:06:38 -0500
committertrilene <trilene@runbox.com>2020-11-13 09:06:38 -0500
commitee543254e845aebb9a19202a7626e561c7e598ea (patch)
treeecfd95ad41d30831a38fa7fb1d5181436ea5d8d8 /src
parentMake incoming call ringtone a user setting (diff)
downloadnheko-ee543254e845aebb9a19202a7626e561c7e598ea.tar.xz
clang-format
Diffstat (limited to 'src')
-rw-r--r--src/Olm.cpp4
-rw-r--r--src/TextInputWidget.cpp4
-rw-r--r--src/Utils.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Olm.cpp b/src/Olm.cpp

index cdafabf3..af8bb512 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 81c1bce9..c75c6c89 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 0bfc82c3..38dbba22 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); }