diff --git a/include/Deserializable.h b/include/Deserializable.h
index f51abc73..e4e07884 100644
--- a/include/Deserializable.h
+++ b/include/Deserializable.h
@@ -28,7 +28,7 @@ class DeserializationException : public std::exception
{
public:
explicit DeserializationException(const std::string &msg);
- virtual const char *what() const throw();
+ virtual const char *what() const noexcept;
private:
std::string msg_;
@@ -38,13 +38,13 @@ private:
class Deserializable
{
public:
- virtual void deserialize(const QJsonValue &) throw(DeserializationException)
+ virtual void deserialize(const QJsonValue &)
{
}
- virtual void deserialize(const QJsonObject &) throw(DeserializationException)
+ virtual void deserialize(const QJsonObject &)
{
}
- virtual void deserialize(const QJsonDocument &) throw(DeserializationException)
+ virtual void deserialize(const QJsonDocument &)
{
}
};
diff --git a/include/Login.h b/include/Login.h
index 5ea8bc68..98752083 100644
--- a/include/Login.h
+++ b/include/Login.h
@@ -28,7 +28,7 @@ public:
LoginRequest();
LoginRequest(QString username, QString password);
- QByteArray serialize();
+ QByteArray serialize() noexcept;
inline void setPassword(QString password);
inline void setUser(QString username);
@@ -51,7 +51,7 @@ inline void LoginRequest::setUser(QString username)
class LoginResponse : public Deserializable
{
public:
- void deserialize(const QJsonDocument &data) throw(DeserializationException) override;
+ void deserialize(const QJsonDocument &data) override;
inline QString getAccessToken();
inline QString getHomeServer();
diff --git a/include/MatrixClient.h b/include/MatrixClient.h
index dd7f92f9..ae67af3a 100644
--- a/include/MatrixClient.h
+++ b/include/MatrixClient.h
@@ -34,21 +34,21 @@ public:
MatrixClient(QString server, QObject *parent = 0);
// Client API.
- void initialSync();
- void sync();
- void sendTextMessage(const QString &roomid, const QString &msg);
- void login(const QString &username, const QString &password);
- void registerUser(const QString &username, const QString &password, const QString &server);
- void versions();
+ void initialSync() noexcept;
+ void sync() noexcept;
+ void sendTextMessage(const QString &roomid, const QString &msg) noexcept;
+ void login(const QString &username, const QString &password) noexcept;
+ void registerUser(const QString &username, const QString &password, const QString &server) noexcept;
+ void versions() noexcept;
inline QString getHomeServer();
inline void incrementTransactionId();
- void reset();
+ void reset() noexcept;
public slots:
- void getOwnProfile();
- void logout();
+ void getOwnProfile() noexcept;
+ void logout() noexcept;
inline void setServer(const QString &server);
inline void setAccessToken(const QString &token);
diff --git a/include/Profile.h b/include/Profile.h
index acf81fda..6dffa007 100644
--- a/include/Profile.h
+++ b/include/Profile.h
@@ -26,7 +26,7 @@
class ProfileResponse : public Deserializable
{
public:
- void deserialize(const QJsonDocument &data) throw(DeserializationException) override;
+ void deserialize(const QJsonDocument &data) override;
inline QUrl getAvatarUrl();
inline QString getDisplayName();
diff --git a/include/Register.h b/include/Register.h
index 2233ab6a..fb9438cb 100644
--- a/include/Register.h
+++ b/include/Register.h
@@ -28,7 +28,7 @@ public:
RegisterRequest();
RegisterRequest(const QString &username, const QString &password);
- QByteArray serialize();
+ QByteArray serialize() noexcept;
inline void setPassword(QString password);
inline void setUser(QString username);
@@ -51,7 +51,7 @@ inline void RegisterRequest::setUser(QString username)
class RegisterResponse : public Deserializable
{
public:
- void deserialize(const QJsonDocument &data) throw(DeserializationException) override;
+ void deserialize(const QJsonDocument &data) override;
inline QString getAccessToken();
inline QString getHomeServer();
diff --git a/include/Sync.h b/include/Sync.h
index 699c3ee8..1db52209 100644
--- a/include/Sync.h
+++ b/include/Sync.h
@@ -37,7 +37,7 @@ public:
inline uint64_t timestamp() const;
- void deserialize(const QJsonValue &data) throw(DeserializationException) override;
+ void deserialize(const QJsonValue &data) override;
private:
QJsonObject content_;
@@ -89,7 +89,7 @@ inline uint64_t Event::timestamp() const
class State : public Deserializable
{
public:
- void deserialize(const QJsonValue &data) throw(DeserializationException) override;
+ void deserialize(const QJsonValue &data) override;
inline QList<Event> events() const;
private:
@@ -108,7 +108,7 @@ public:
inline QString previousBatch() const;
inline bool limited() const;
- void deserialize(const QJsonValue &data) throw(DeserializationException) override;
+ void deserialize(const QJsonValue &data) override;
private:
QList<Event> events_;
@@ -138,7 +138,7 @@ public:
inline State state() const;
inline Timeline timeline() const;
- void deserialize(const QJsonValue &data) throw(DeserializationException) override;
+ void deserialize(const QJsonValue &data) override;
private:
State state_;
@@ -163,7 +163,7 @@ class Rooms : public Deserializable
{
public:
inline QMap<QString, JoinedRoom> join() const;
- void deserialize(const QJsonValue &data) throw(DeserializationException) override;
+ void deserialize(const QJsonValue &data) override;
private:
QMap<QString, JoinedRoom> join_;
@@ -177,7 +177,7 @@ inline QMap<QString, JoinedRoom> Rooms::join() const
class SyncResponse : public Deserializable
{
public:
- void deserialize(const QJsonDocument &data) throw(DeserializationException) override;
+ void deserialize(const QJsonDocument &data) override;
inline QString nextBatch() const;
inline Rooms rooms() const;
|
