From e5fb9a25ea06f03129961a0df507361baae4b67a Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Thu, 8 Oct 2020 18:16:30 +0200 Subject: [PATCH] Try to please the CI gods --- src/DeviceVerificationFlow.h | 2 +- src/timeline/TimelineViewManager.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/DeviceVerificationFlow.h b/src/DeviceVerificationFlow.h index 9ca45a9..d70374d 100644 --- a/src/DeviceVerificationFlow.h +++ b/src/DeviceVerificationFlow.h @@ -211,7 +211,7 @@ private: body[this->toClient][deviceId.toStdString()] = msg; http::client()->send_to_device( - this->transaction_id, body, [this](mtx::http::RequestErr err) { + this->transaction_id, body, [](mtx::http::RequestErr err) { if (err) nhlog::net()->warn( "failed to send verification to_device message: {} {}", diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index b11c496..7c81ca8 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -128,9 +128,11 @@ TimelineViewManager::TimelineViewManager(QSharedPointer userSettin static auto self = this; qmlRegisterSingletonType( - "im.nheko", 1, 0, "TimelineManager", [](QQmlEngine *, QJSEngine *) { return self; }); + "im.nheko", 1, 0, "TimelineManager", [](QQmlEngine *, QJSEngine *) -> QObject * { + return self; + }); qmlRegisterSingletonType( - "im.nheko", 1, 0, "Settings", [](QQmlEngine *, QJSEngine *) { + "im.nheko", 1, 0, "Settings", [](QQmlEngine *, QJSEngine *) -> QObject * { return self->settings.data(); });