diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-06-14 09:36:41 +0300 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-06-14 09:36:41 +0300 |
| commit | 7fc010fc4f96d6a4cdec04558a7b053604e0cb39 (patch) | |
| tree | 2f1d3a39714774d8c4cffd83de274e4761ff3837 /src | |
| parent | Rename the log namespace to avoid symbol clash with the math function (diff) | |
| download | nheko-7fc010fc4f96d6a4cdec04558a7b053604e0cb39.tar.xz | |
Fix CI errors on macOS & Windows
- Run the linter - Explicitly use cmake for installing olm
Diffstat (limited to 'src')
| -rw-r--r-- | src/CommunitiesList.cc | 8 | ||||
| -rw-r--r-- | src/RegisterPage.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/CommunitiesList.cc b/src/CommunitiesList.cc index df4d6361..39e9a7fe 100644 --- a/src/CommunitiesList.cc +++ b/src/CommunitiesList.cc @@ -1,5 +1,5 @@ -#include "Cache.h" #include "CommunitiesList.h" +#include "Cache.h" #include "Logging.hpp" #include "MatrixClient.h" @@ -137,9 +137,9 @@ CommunitiesList::fetchCommunityAvatar(const QString &id, const QString &avatarUr opts, [this, opts, id](const std::string &res, mtx::http::RequestErr err) { if (err) { nhlog::net()->warn("failed to download avatar: {} - ({} {})", - opts.mxc_url, - mtx::errors::to_string(err->matrix_error.errcode), - err->matrix_error.error); + opts.mxc_url, + mtx::errors::to_string(err->matrix_error.errcode), + err->matrix_error.error); return; } diff --git a/src/RegisterPage.cc b/src/RegisterPage.cc index f56cd663..db52e101 100644 --- a/src/RegisterPage.cc +++ b/src/RegisterPage.cc @@ -248,7 +248,7 @@ RegisterPage::onRegisterButtonClicked() } nhlog::net()->warn("failed to register: status_code ({})", - static_cast<int>(err->status_code)); + static_cast<int>(err->status_code)); emit registerErrorCb(QString::fromStdString(err->matrix_error.error)); emit errorOccurred(); |