d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update matrix-structs library

Browse source
This commit is contained in:
Konstantinos Sideris 2018-03-18 11:05:39 +02:00
parent 97e6fc6af3
commit 49270d10b4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/MatrixStructs.cmake
View file

@ -23,7 +23,7 @@ ExternalProject_Add(
MatrixStructs MatrixStructs
GIT_REPOSITORY https://github.com/mujx/matrix-structs GIT_REPOSITORY https://github.com/mujx/matrix-structs
GIT_TAG 850100c0ac2b5a04720b2a1f09270749bf99f7dd GIT_TAG 701eb5b06c370c23bca35a957f5a208c2115b52f
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
SOURCE_DIR ${MATRIX_STRUCTS_ROOT} SOURCE_DIR ${MATRIX_STRUCTS_ROOT}

2
src/InviteeItem.cc
View file

@ -9,7 +9,7 @@ constexpr int IconSize = 13;
InviteeItem::InviteeItem(mtx::identifiers::User user, QWidget *parent) InviteeItem::InviteeItem(mtx::identifiers::User user, QWidget *parent)
: QWidget{parent} : QWidget{parent}
, user_{QString::fromStdString(user.toString())} , user_{QString::fromStdString(user.to_string())}
{ {
auto topLayout_ = new QHBoxLayout(this); auto topLayout_ = new QHBoxLayout(this);
topLayout_->setSpacing(0); topLayout_->setSpacing(0);

4
src/MatrixClient.cc
View file

@ -154,7 +154,7 @@ MatrixClient::login(const QString &username, const QString &password) noexcept
if (server_.port() > 0) if (server_.port() > 0)
hostname = QString("%1:%2").arg(server_.host()).arg(server_.port()); hostname = QString("%1:%2").arg(server_.host()).arg(server_.port());
emit loginSuccess(QString::fromStdString(login.user_id.toString()), emit loginSuccess(QString::fromStdString(login.user_id.to_string()),
hostname, hostname,
QString::fromStdString(login.access_token)); QString::fromStdString(login.access_token));
} catch (std::exception &e) { } catch (std::exception &e) {
@ -228,7 +228,7 @@ MatrixClient::registerUser(const QString &user,
// Try to parse a regular register response. // Try to parse a regular register response.
try { try {
mtx::responses::Register res = nlohmann::json::parse(data); mtx::responses::Register res = nlohmann::json::parse(data);
emit registerSuccess(QString::fromStdString(res.user_id.toString()), emit registerSuccess(QString::fromStdString(res.user_id.to_string()),
QString::fromStdString(res.user_id.hostname()), QString::fromStdString(res.user_id.hostname()),
QString::fromStdString(res.access_token)); QString::fromStdString(res.access_token));
} catch (const std::exception &e) { } catch (const std::exception &e) {