diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Deserializable.cc | 2 | ||||
-rw-r--r-- | src/Login.cc | 4 | ||||
-rw-r--r-- | src/MatrixClient.cc | 18 | ||||
-rw-r--r-- | src/Profile.cc | 2 | ||||
-rw-r--r-- | src/Register.cc | 4 | ||||
-rw-r--r-- | src/Sync.cc | 12 |
6 files changed, 21 insertions, 21 deletions
diff --git a/src/Deserializable.cc b/src/Deserializable.cc index 967f5ef4..d9cdaf0d 100644 --- a/src/Deserializable.cc +++ b/src/Deserializable.cc @@ -25,7 +25,7 @@ DeserializationException::DeserializationException(const std::string &msg) : msg { } -const char *DeserializationException::what() const throw() +const char *DeserializationException::what() const noexcept { return msg_.c_str(); } diff --git a/src/Login.cc b/src/Login.cc index 0ce05a80..1f1fb572 100644 --- a/src/Login.cc +++ b/src/Login.cc @@ -32,7 +32,7 @@ LoginRequest::LoginRequest(QString username, QString password) { } -QByteArray LoginRequest::serialize() +QByteArray LoginRequest::serialize() noexcept { QJsonObject body{ {"type", "m.login.password"}, @@ -42,7 +42,7 @@ QByteArray LoginRequest::serialize() return QJsonDocument(body).toJson(QJsonDocument::Compact); } -void LoginResponse::deserialize(const QJsonDocument &data) throw(DeserializationException) +void LoginResponse::deserialize(const QJsonDocument &data) { if (!data.isObject()) throw DeserializationException("Login response is not a JSON object"); diff --git a/src/MatrixClient.cc b/src/MatrixClient.cc index f7c1b0d4..86aeb179 100644 --- a/src/MatrixClient.cc +++ b/src/MatrixClient.cc @@ -43,7 +43,7 @@ MatrixClient::MatrixClient(QString server, QObject *parent) connect(this, SIGNAL(finished(QNetworkReply *)), this, SLOT(onResponse(QNetworkReply *))); } -void MatrixClient::reset() +void MatrixClient::reset() noexcept { next_batch_ = ""; server_ = ""; @@ -295,7 +295,7 @@ void MatrixClient::onResponse(QNetworkReply *reply) } } -void MatrixClient::login(const QString &username, const QString &password) +void MatrixClient::login(const QString &username, const QString &password) noexcept { QUrl endpoint(server_); endpoint.setPath(api_url_ + "/login"); @@ -309,7 +309,7 @@ void MatrixClient::login(const QString &username, const QString &password) reply->setProperty("endpoint", Endpoint::Login); } -void MatrixClient::logout() +void MatrixClient::logout() noexcept { QUrlQuery query; query.addQueryItem("access_token", token_); @@ -326,7 +326,7 @@ void MatrixClient::logout() reply->setProperty("endpoint", Endpoint::Logout); } -void MatrixClient::registerUser(const QString &user, const QString &pass, const QString &server) +void MatrixClient::registerUser(const QString &user, const QString &pass, const QString &server) noexcept { setServer(server); @@ -346,7 +346,7 @@ void MatrixClient::registerUser(const QString &user, const QString &pass, const reply->setProperty("endpoint", Endpoint::Register); } -void MatrixClient::sync() +void MatrixClient::sync() noexcept { QJsonObject filter{{"room", QJsonObject{{"ephemeral", QJsonObject{{"limit", 0}}}}}, @@ -374,7 +374,7 @@ void MatrixClient::sync() reply->setProperty("endpoint", Endpoint::Sync); } -void MatrixClient::sendTextMessage(const QString &roomid, const QString &msg) +void MatrixClient::sendTextMessage(const QString &roomid, const QString &msg) noexcept { QUrlQuery query; query.addQueryItem("access_token", token_); @@ -396,7 +396,7 @@ void MatrixClient::sendTextMessage(const QString &roomid, const QString &msg) reply->setProperty("txn_id", txn_id_); } -void MatrixClient::initialSync() +void MatrixClient::initialSync() noexcept { QJsonObject filter{{"room", QJsonObject{{"timeline", QJsonObject{{"limit", 70}}}, @@ -419,7 +419,7 @@ void MatrixClient::initialSync() reply->setProperty("endpoint", Endpoint::InitialSync); } -void MatrixClient::versions() +void MatrixClient::versions() noexcept { QUrl endpoint(server_); endpoint.setPath("/_matrix/client/versions"); @@ -430,7 +430,7 @@ void MatrixClient::versions() reply->setProperty("endpoint", Endpoint::Versions); } -void MatrixClient::getOwnProfile() +void MatrixClient::getOwnProfile() noexcept { // FIXME: Remove settings from the matrix client. The class should store the user's matrix ID. QSettings settings; diff --git a/src/Profile.cc b/src/Profile.cc index 40b1b074..86089bee 100644 --- a/src/Profile.cc +++ b/src/Profile.cc @@ -22,7 +22,7 @@ #include "Deserializable.h" #include "Profile.h" -void ProfileResponse::deserialize(const QJsonDocument &data) throw(DeserializationException) +void ProfileResponse::deserialize(const QJsonDocument &data) { if (!data.isObject()) throw DeserializationException("Response is not a JSON object"); diff --git a/src/Register.cc b/src/Register.cc index 4c14b400..4f4e4ded 100644 --- a/src/Register.cc +++ b/src/Register.cc @@ -32,7 +32,7 @@ RegisterRequest::RegisterRequest(const QString &username, const QString &passwor { } -QByteArray RegisterRequest::serialize() +QByteArray RegisterRequest::serialize() noexcept { QJsonObject body{ {"username", user_}, @@ -41,7 +41,7 @@ QByteArray RegisterRequest::serialize() return QJsonDocument(body).toJson(QJsonDocument::Compact); } -void RegisterResponse::deserialize(const QJsonDocument &data) throw(DeserializationException) +void RegisterResponse::deserialize(const QJsonDocument &data) { if (!data.isObject()) throw DeserializationException("Response is not a JSON object"); diff --git a/src/Sync.cc b/src/Sync.cc index b51ecff7..50b49fc6 100644 --- a/src/Sync.cc +++ b/src/Sync.cc @@ -24,7 +24,7 @@ #include "Deserializable.h" #include "Sync.h" -void SyncResponse::deserialize(const QJsonDocument &data) throw(DeserializationException) +void SyncResponse::deserialize(const QJsonDocument &data) { if (!data.isObject()) throw DeserializationException("Sync response is not a JSON object"); @@ -41,7 +41,7 @@ void SyncResponse::deserialize(const QJsonDocument &data) throw(DeserializationE next_batch_ = object.value("next_batch").toString(); } -void Rooms::deserialize(const QJsonValue &data) throw(DeserializationException) +void Rooms::deserialize(const QJsonValue &data) { if (!data.isObject()) throw DeserializationException("Rooms value is not a JSON object"); @@ -81,7 +81,7 @@ void Rooms::deserialize(const QJsonValue &data) throw(DeserializationException) } } -void JoinedRoom::deserialize(const QJsonValue &data) throw(DeserializationException) +void JoinedRoom::deserialize(const QJsonValue &data) { if (!data.isObject()) throw DeserializationException("JoinedRoom is not a JSON object"); @@ -112,7 +112,7 @@ void JoinedRoom::deserialize(const QJsonValue &data) throw(DeserializationExcept timeline_.deserialize(object.value("timeline")); } -void Event::deserialize(const QJsonValue &data) throw(DeserializationException) +void Event::deserialize(const QJsonValue &data) { if (!data.isObject()) throw DeserializationException("Event is not a JSON object"); @@ -152,7 +152,7 @@ void Event::deserialize(const QJsonValue &data) throw(DeserializationException) origin_server_ts_ = object.value("origin_server_ts").toDouble(); } -void State::deserialize(const QJsonValue &data) throw(DeserializationException) +void State::deserialize(const QJsonValue &data) { if (!data.isArray()) throw DeserializationException("State is not a JSON array"); @@ -172,7 +172,7 @@ void State::deserialize(const QJsonValue &data) throw(DeserializationException) } } -void Timeline::deserialize(const QJsonValue &data) throw(DeserializationException) +void Timeline::deserialize(const QJsonValue &data) { if (!data.isObject()) throw DeserializationException("Timeline is not a JSON object"); |