From 33490eddab385ca488b11d6d50683ddb6a18da6c Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sun, 15 Jul 2018 19:09:08 +0300 Subject: Remove the v2 namespace from the http client --- src/dialogs/ReCaptcha.cpp | 4 ++-- src/dialogs/RoomSettings.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/dialogs') diff --git a/src/dialogs/ReCaptcha.cpp b/src/dialogs/ReCaptcha.cpp index 6b1143b5..ba54268c 100644 --- a/src/dialogs/ReCaptcha.cpp +++ b/src/dialogs/ReCaptcha.cpp @@ -55,8 +55,8 @@ ReCaptcha::ReCaptcha(const QString &session, QWidget *parent) connect(openCaptchaBtn_, &QPushButton::clicked, [session]() { const auto url = QString("https://%1:%2/_matrix/client/r0/auth/m.login.recaptcha/" "fallback/web?session=%3") - .arg(QString::fromStdString(http::v2::client()->server())) - .arg(http::v2::client()->port()) + .arg(QString::fromStdString(http::client()->server())) + .arg(http::client()->port()) .arg(session); QDesktopServices::openUrl(url); diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp index 74d08478..3f40ae89 100644 --- a/src/dialogs/RoomSettings.cpp +++ b/src/dialogs/RoomSettings.cpp @@ -103,7 +103,7 @@ EditModal::EditModal(const QString &roomId, QWidget *parent) state::Name body; body.name = newName.toStdString(); - http::v2::client()->send_state_event( + http::client()->send_state_event( roomId_.toStdString(), body, [this, newName](const mtx::responses::EventId &, @@ -122,7 +122,7 @@ EditModal::EditModal(const QString &roomId, QWidget *parent) state::Topic body; body.topic = newTopic.toStdString(); - http::v2::client()->send_state_event( + http::client()->send_state_event( roomId_.toStdString(), body, [this](const mtx::responses::EventId &, mtx::http::RequestErr err) { @@ -412,7 +412,7 @@ void RoomSettings::enableEncryption() { const auto room_id = room_id_.toStdString(); - http::v2::client()->enable_encryption( + http::client()->enable_encryption( room_id, [room_id, this](const mtx::responses::EventId &, mtx::http::RequestErr err) { if (err) { int status_code = static_cast(err->status_code); -- cgit 1.5.1