From 2a3f019ec6f0e01e9b7de98b13074ae3b7bc79f2 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Sun, 3 Nov 2024 18:26:46 +0100 Subject: [PATCH] Port away from Quotient::Omittable --- src/events/imagepackevent.cpp | 13 ++++++------- src/jobs/neochatadd3pidjob.cpp | 2 +- src/jobs/neochatadd3pidjob.h | 3 +-- src/jobs/neochatchangepasswordjob.cpp | 2 +- src/jobs/neochatchangepasswordjob.h | 4 +--- src/jobs/neochatdeactivateaccountjob.cpp | 2 +- src/jobs/neochatdeactivateaccountjob.h | 3 +-- src/jobs/neochatdeletedevicejob.cpp | 2 +- src/jobs/neochatdeletedevicejob.h | 3 +-- src/jobs/neochatgetcommonroomsjob.h | 1 - src/models/threadmodel.cpp | 1 - src/registration.cpp | 8 ++++---- src/registration.h | 5 ++--- 13 files changed, 20 insertions(+), 29 deletions(-) diff --git a/src/events/imagepackevent.cpp b/src/events/imagepackevent.cpp index bad6290e9..ae892fd13 100644 --- a/src/events/imagepackevent.cpp +++ b/src/events/imagepackevent.cpp @@ -3,7 +3,6 @@ #include "imagepackevent.h" #include -#include using namespace Quotient; @@ -11,10 +10,10 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json) { if (json.contains(QStringLiteral("pack"))) { pack = ImagePackEventContent::Pack{ - fromJson>(json["pack"_ls].toObject()["display_name"_ls]), - fromJson>(json["pack"_ls].toObject()["avatar_url"_ls]), - fromJson>(json["pack"_ls].toObject()["usage"_ls]), - fromJson>(json["pack"_ls].toObject()["attribution"_ls]), + fromJson>(json["pack"_ls].toObject()["display_name"_ls]), + fromJson>(json["pack"_ls].toObject()["avatar_url"_ls]), + fromJson>(json["pack"_ls].toObject()["usage"_ls]), + fromJson>(json["pack"_ls].toObject()["attribution"_ls]), }; } else { pack = std::nullopt; @@ -31,9 +30,9 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json) images += ImagePackImage{ k, fromJson(json["images"_ls][k]["url"_ls].toString()), - fromJson>(json["images"_ls][k]["body"_ls]), + fromJson>(json["images"_ls][k]["body"_ls]), info, - fromJson>(json["images"_ls][k]["usage"_ls]), + fromJson>(json["images"_ls][k]["usage"_ls]), }; } } diff --git a/src/jobs/neochatadd3pidjob.cpp b/src/jobs/neochatadd3pidjob.cpp index 5c86845ca..1cc993715 100644 --- a/src/jobs/neochatadd3pidjob.cpp +++ b/src/jobs/neochatadd3pidjob.cpp @@ -5,7 +5,7 @@ using namespace Quotient; -NeochatAdd3PIdJob::NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const Omittable &auth) +NeochatAdd3PIdJob::NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const std::optional &auth) : BaseJob(HttpVerb::Post, QStringLiteral("Add3PIDJob"), makePath("/_matrix/client/v3", "/account/3pid/add")) { QJsonObject _dataJson; diff --git a/src/jobs/neochatadd3pidjob.h b/src/jobs/neochatadd3pidjob.h index 4c6fb3094..2bf3e5b59 100644 --- a/src/jobs/neochatadd3pidjob.h +++ b/src/jobs/neochatadd3pidjob.h @@ -4,10 +4,9 @@ #pragma once #include -#include class NeochatAdd3PIdJob : public Quotient::BaseJob { public: - explicit NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const Quotient::Omittable &auth = {}); + explicit NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const std::optional &auth = {}); }; diff --git a/src/jobs/neochatchangepasswordjob.cpp b/src/jobs/neochatchangepasswordjob.cpp index dec09ef8f..9be9fa7b8 100644 --- a/src/jobs/neochatchangepasswordjob.cpp +++ b/src/jobs/neochatchangepasswordjob.cpp @@ -5,7 +5,7 @@ using namespace Quotient; -NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable &auth) +NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const std::optional &auth) : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password") { QJsonObject _data; diff --git a/src/jobs/neochatchangepasswordjob.h b/src/jobs/neochatchangepasswordjob.h index e4bad59ae..237bc4330 100644 --- a/src/jobs/neochatchangepasswordjob.h +++ b/src/jobs/neochatchangepasswordjob.h @@ -5,10 +5,8 @@ #include -#include - class NeochatChangePasswordJob : public Quotient::BaseJob { public: - explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Quotient::Omittable &auth = {}); + explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const std::optional &auth = {}); }; diff --git a/src/jobs/neochatdeactivateaccountjob.cpp b/src/jobs/neochatdeactivateaccountjob.cpp index 398a7df72..081e2ed8f 100644 --- a/src/jobs/neochatdeactivateaccountjob.cpp +++ b/src/jobs/neochatdeactivateaccountjob.cpp @@ -5,7 +5,7 @@ using namespace Quotient; -NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const Omittable &auth) +NeoChatDeactivateAccountJob::NeoChatDeactivateAccountJob(const std::optional &auth) : BaseJob(HttpVerb::Post, QStringLiteral("DisableDeviceJob"), "_matrix/client/v3/account/deactivate") { QJsonObject data; diff --git a/src/jobs/neochatdeactivateaccountjob.h b/src/jobs/neochatdeactivateaccountjob.h index 26e997f4c..327c04761 100644 --- a/src/jobs/neochatdeactivateaccountjob.h +++ b/src/jobs/neochatdeactivateaccountjob.h @@ -4,10 +4,9 @@ #pragma once #include -#include class NeoChatDeactivateAccountJob : public Quotient::BaseJob { public: - explicit NeoChatDeactivateAccountJob(const Quotient::Omittable &auth = {}); + explicit NeoChatDeactivateAccountJob(const std::optional &auth = {}); }; diff --git a/src/jobs/neochatdeletedevicejob.cpp b/src/jobs/neochatdeletedevicejob.cpp index 0283d41f2..08771cc08 100644 --- a/src/jobs/neochatdeletedevicejob.cpp +++ b/src/jobs/neochatdeletedevicejob.cpp @@ -5,7 +5,7 @@ using namespace Quotient; -NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable &auth) +NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const std::optional &auth) : BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1()) { QJsonObject _data; diff --git a/src/jobs/neochatdeletedevicejob.h b/src/jobs/neochatdeletedevicejob.h index ff775db09..07a03f0c3 100644 --- a/src/jobs/neochatdeletedevicejob.h +++ b/src/jobs/neochatdeletedevicejob.h @@ -4,10 +4,9 @@ #pragma once #include -#include class NeochatDeleteDeviceJob : public Quotient::BaseJob { public: - explicit NeochatDeleteDeviceJob(const QString &deviceId, const Quotient::Omittable &auth = {}); + explicit NeochatDeleteDeviceJob(const QString &deviceId, const std::optional &auth = {}); }; diff --git a/src/jobs/neochatgetcommonroomsjob.h b/src/jobs/neochatgetcommonroomsjob.h index f7817d53c..71bbaac77 100644 --- a/src/jobs/neochatgetcommonroomsjob.h +++ b/src/jobs/neochatgetcommonroomsjob.h @@ -4,7 +4,6 @@ #pragma once #include -#include // TODO: Upstream to libQuotient class NeochatGetCommonRoomsJob : public Quotient::BaseJob diff --git a/src/models/threadmodel.cpp b/src/models/threadmodel.cpp index 52c703509..a1a6e6046 100644 --- a/src/models/threadmodel.cpp +++ b/src/models/threadmodel.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include "chatbarcache.h" diff --git a/src/registration.cpp b/src/registration.cpp index 232af4693..cc0a408dc 100644 --- a/src/registration.cpp +++ b/src/registration.cpp @@ -62,7 +62,7 @@ QString Registration::recaptchaSiteKey() const void Registration::registerAccount() { setStatus(Working); - Omittable authData; + std::optional authData; if (nextStep() == "m.login.recaptcha"_ls) { authData = QJsonObject{ {"type"_ls, "m.login.recaptcha"_ls}, @@ -182,7 +182,7 @@ void Registration::testHomeserver() if (m_testServerJob) { delete m_testServerJob; } - m_testServerJob = m_connection->callApi("user"_ls, none, "user"_ls, QString(), QString(), QString(), false); + m_testServerJob = m_connection->callApi("user"_ls, std::nullopt, "user"_ls, QString(), QString(), QString(), false); connect(m_testServerJob.data(), &BaseJob::finished, this, [this]() { if (m_testServerJob->error() == BaseJob::StatusCode::ContentAccessError) { @@ -252,12 +252,12 @@ void Registration::setPassword(const QString &password) } NeoChatRegisterJob::NeoChatRegisterJob(const QString &kind, - const Omittable &auth, + const std::optional &auth, const QString &username, const QString &password, const QString &deviceId, const QString &initialDeviceDisplayName, - Omittable inhibitLogin) + std::optional inhibitLogin) : BaseJob(HttpVerb::Post, "RegisterJob"_ls, QByteArrayLiteral("/_matrix/client/r0/register"), false) { QJsonObject _data; diff --git a/src/registration.h b/src/registration.h index ccf61d02f..ef4243556 100644 --- a/src/registration.h +++ b/src/registration.h @@ -12,7 +12,6 @@ #include #include -#include #include #include @@ -28,12 +27,12 @@ class NeoChatRegisterJob : public Quotient::BaseJob { public: explicit NeoChatRegisterJob(const QString &kind = QStringLiteral("user"), - const Quotient::Omittable &auth = {}, + const std::optional &auth = {}, const QString &username = {}, const QString &password = {}, const QString &deviceId = {}, const QString &initialDeviceDisplayName = {}, - Quotient::Omittable inhibitLogin = {}); + std::optional inhibitLogin = {}); QString userId() const {