diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-06-28 13:16:10 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-06-28 13:16:10 +0200 |
| commit | e89e65dc17020772eb057414b4f0c5d6f4ad98d0 (patch) | |
| tree | 2ab2c444a5298af2567952f4053724ad758c179b /src | |
| parent | Allow viewing and changing the history visibility (diff) | |
| download | nheko-e89e65dc17020772eb057414b4f0c5d6f4ad98d0.tar.xz | |
Fix build against fmt10
fixes #1499
Diffstat (limited to 'src')
| -rw-r--r-- | src/Cache.cpp | 2 | ||||
| -rw-r--r-- | src/encryption/DeviceVerificationFlow.cpp | 2 | ||||
| -rw-r--r-- | src/timeline/InputBar.cpp | 10 | ||||
| -rw-r--r-- | src/ui/MxcMediaProxy.cpp | 9 |
4 files changed, 14 insertions, 9 deletions
diff --git a/src/Cache.cpp b/src/Cache.cpp index f4aad6b3..7a19cba4 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -434,7 +434,7 @@ Cache::loadSecretsFromStore( if (job->error() && job->error() != QKeychain::Error::EntryNotFound) { nhlog::db()->error("Restoring secret '{}' failed ({}): {}", name.toStdString(), - job->error(), + static_cast<int>(job->error()), job->errorString().toStdString()); fatalSecretError(); diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp index a240a095..1e7ed7bc 100644 --- a/src/encryption/DeviceVerificationFlow.cpp +++ b/src/encryption/DeviceVerificationFlow.cpp @@ -37,7 +37,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *, , deviceIds(std::move(deviceIds_)) , model_(model) { - nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", flow_type, (void *)this); + nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", static_cast<int>(flow_type), (void *)this); if (deviceIds.size() == 1) deviceId = deviceIds.front(); diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp index 2f3b6eae..a59bc4c6 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp @@ -1041,14 +1041,16 @@ MediaUpload::MediaUpload(std::unique_ptr<QIODevice> source_, &QMediaPlayer::errorOccurred, this, [](QMediaPlayer::Error error, QString errorString) { - nhlog::ui()->debug( - "Media player error {} and errorStr {}", error, errorString.toStdString()); + nhlog::ui()->debug("Media player error {} and errorStr {}", + static_cast<int>(error), + errorString.toStdString()); }); connect(mediaPlayer, &QMediaPlayer::mediaStatusChanged, [mediaPlayer](QMediaPlayer::MediaStatus status) { - nhlog::ui()->debug( - "Media player status {} and error {}", status, mediaPlayer->error()); + nhlog::ui()->debug("Media player status {} and error {}", + static_cast<int>(status), + static_cast<int>(mediaPlayer->error())); }); connect(mediaPlayer, &QMediaPlayer::metaDataChanged, this, [this, mediaPlayer]() { nhlog::ui()->debug("Got metadata {}"); diff --git a/src/ui/MxcMediaProxy.cpp b/src/ui/MxcMediaProxy.cpp index 2adf2538..5fae0654 100644 --- a/src/ui/MxcMediaProxy.cpp +++ b/src/ui/MxcMediaProxy.cpp @@ -27,11 +27,14 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent) connect(this, &MxcMediaProxy::roomChanged, &MxcMediaProxy::startDownload); connect( this, &QMediaPlayer::errorOccurred, this, [](QMediaPlayer::Error error, QString errorString) { - nhlog::ui()->debug( - "Media player error {} and errorStr {}", error, errorString.toStdString()); + nhlog::ui()->debug("Media player error {} and errorStr {}", + static_cast<int>(error), + errorString.toStdString()); }); connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) { - nhlog::ui()->info("Media player status {} and error {}", status, this->error()); + nhlog::ui()->info("Media player status {} and error {}", + static_cast<int>(status), + static_cast<int>(this->error())); }); connect(this, &MxcMediaProxy::metaDataChanged, [this]() { emit orientationChanged(); }); |