summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-04-28 13:16:37 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-04-28 13:16:37 +0300
commitbee9278a1aaaabd9b9c90c84e7c713b36bbde5e9 (patch)
tree84689222576f0c821b1c6ca007dd88dc8c01054a /src
parentAdd support for displaying m.sticker events (diff)
downloadnheko-bee9278a1aaaabd9b9c90c84e7c713b36bbde5e9.tar.xz
Remove old/unused code
Diffstat (limited to 'src')
-rw-r--r--src/Deserializable.cc28
-rw-r--r--src/MatrixClient.cc17
2 files changed, 8 insertions, 37 deletions
diff --git a/src/Deserializable.cc b/src/Deserializable.cc
deleted file mode 100644

index 8bdbfc2c..00000000 --- a/src/Deserializable.cc +++ /dev/null
@@ -1,28 +0,0 @@ -/* - * nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "Deserializable.h" - -DeserializationException::DeserializationException(const std::string &msg) - : msg_(msg) -{} - -const char * -DeserializationException::what() const noexcept -{ - return msg_.c_str(); -} diff --git a/src/MatrixClient.cc b/src/MatrixClient.cc
index e95f8b97..5593dbe6 100644 --- a/src/MatrixClient.cc +++ b/src/MatrixClient.cc
@@ -31,7 +31,6 @@ #include <QtConcurrent> #include <mtx/errors.hpp> -#include "Deserializable.h" #include "MatrixClient.h" MatrixClient::MatrixClient(QString server, QObject *parent) @@ -559,16 +558,16 @@ MatrixClient::getOwnCommunities() noexcept auto data = reply->readAll(); auto json = QJsonDocument::fromJson(data).object(); - try { - QList<QString> response; + if (!json.contains("groups")) { + qWarning() << "failed to parse own communities. 'groups' key not found"; + return; + } - for (auto group : json["groups"].toArray()) - response.append(group.toString()); + QList<QString> response; + for (auto group : json["groups"].toArray()) + response.append(group.toString()); - emit getOwnCommunitiesResponse(response); - } catch (DeserializationException &e) { - qWarning() << "Own communities:" << e.what(); - } + emit getOwnCommunitiesResponse(response); }); }