From 9a380ea907832bbf5616b3deb71e25c7983b5a77 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Fri, 19 Jul 2024 09:52:18 +0300 Subject: [PATCH] Fix coverity errors WE2-1003 Signed-off-by: Raul Metsma --- lib/libelectronic-id | 2 +- src/ui/webeiddialog.cpp | 7 ++++--- src/ui/webeiddialog.hpp | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libelectronic-id b/lib/libelectronic-id index 7395eb21..f47fc152 160000 --- a/lib/libelectronic-id +++ b/lib/libelectronic-id @@ -1 +1 @@ -Subproject commit 7395eb21bdaf13cac25c97b09860971c85ec5fce +Subproject commit f47fc15265f9864eececcde85d0b246bac240aa3 diff --git a/src/ui/webeiddialog.cpp b/src/ui/webeiddialog.cpp index 76f7ab75..dd30e2d0 100644 --- a/src/ui/webeiddialog.cpp +++ b/src/ui/webeiddialog.cpp @@ -478,7 +478,7 @@ void WebEidDialog::onVerifyPinFailed(const VerifyPinFailed::Status status, const break; case Status::UNKNOWN_ERROR: message = [] { return tr("Technical error"); }; - displayFatalError(message); + displayFatalError(std::move(message)); return; } @@ -682,14 +682,15 @@ void WebEidDialog::displayPinBlockedError() displayFatalError([] { return tr("PIN is locked. Unblock and try again."); }); } -void WebEidDialog::displayFatalError(std::function message) +template +void WebEidDialog::displayFatalError(Text message) { ui->pinTitleLabel->hide(); ui->pinInput->hide(); ui->pinTimeoutTimer->stop(); ui->pinTimeRemaining->hide(); ui->pinEntryTimeoutProgressBar->hide(); - setTrText(ui->pinErrorLabel, message); + setTrText(ui->pinErrorLabel, std::forward(message)); ui->pinErrorLabel->show(); ui->okButton->hide(); ui->cancelButton->setEnabled(true); diff --git a/src/ui/webeiddialog.hpp b/src/ui/webeiddialog.hpp index bf60a98a..308632a7 100644 --- a/src/ui/webeiddialog.hpp +++ b/src/ui/webeiddialog.hpp @@ -104,7 +104,8 @@ class WebEidDialog final : public WebEidUI template void setupOK(Func func, const char* text = {}, bool enabled = false); void displayPinBlockedError(); - void displayFatalError(std::function message); + template + void displayFatalError(Text message); void showPinInputWarning(bool show); void resizeHeight();