diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-03-18 11:05:39 +0200 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-03-18 11:05:39 +0200 |
| commit | 49270d10b410c0ed32e2d4cb535cd9c6f577abe1 (patch) | |
| tree | 4c4a06620f0e061559c12f8a9118bcc9b5c495e3 | |
| parent | Update readme (diff) | |
| download | nheko-49270d10b410c0ed32e2d4cb535cd9c6f577abe1.tar.xz | |
Update matrix-structs library
| -rw-r--r-- | cmake/MatrixStructs.cmake | 2 | ||||
| -rw-r--r-- | src/InviteeItem.cc | 2 | ||||
| -rw-r--r-- | src/MatrixClient.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake index 61cf619e..4b1a3c12 100644 --- a/cmake/MatrixStructs.cmake +++ b/cmake/MatrixStructs.cmake @@ -23,7 +23,7 @@ ExternalProject_Add( MatrixStructs GIT_REPOSITORY https://github.com/mujx/matrix-structs - GIT_TAG 850100c0ac2b5a04720b2a1f09270749bf99f7dd + GIT_TAG 701eb5b06c370c23bca35a957f5a208c2115b52f BUILD_IN_SOURCE 1 SOURCE_DIR ${MATRIX_STRUCTS_ROOT} diff --git a/src/InviteeItem.cc b/src/InviteeItem.cc index c544032c..5ae2a7b6 100644 --- a/src/InviteeItem.cc +++ b/src/InviteeItem.cc @@ -9,7 +9,7 @@ constexpr int IconSize = 13; InviteeItem::InviteeItem(mtx::identifiers::User user, QWidget *parent) : QWidget{parent} - , user_{QString::fromStdString(user.toString())} + , user_{QString::fromStdString(user.to_string())} { auto topLayout_ = new QHBoxLayout(this); topLayout_->setSpacing(0); diff --git a/src/MatrixClient.cc b/src/MatrixClient.cc index 5f9e1b86..dff7b825 100644 --- a/src/MatrixClient.cc +++ b/src/MatrixClient.cc @@ -154,7 +154,7 @@ MatrixClient::login(const QString &username, const QString &password) noexcept if (server_.port() > 0) 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, QString::fromStdString(login.access_token)); } catch (std::exception &e) { @@ -228,7 +228,7 @@ MatrixClient::registerUser(const QString &user, // Try to parse a regular register response. try { 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.access_token)); } catch (const std::exception &e) { |