diff --git a/include/events/AliasesEventContent.h b/include/events/AliasesEventContent.h
index 49e51275..7784fad7 100644
--- a/include/events/AliasesEventContent.h
+++ b/include/events/AliasesEventContent.h
@@ -32,16 +32,11 @@ public:
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
- inline QList<QString> aliases() const;
+ QList<QString> aliases() const { return aliases_; };
private:
QList<QString> aliases_;
};
-inline QList<QString>
-AliasesEventContent::aliases() const
-{
- return aliases_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/AvatarEventContent.h b/include/events/AvatarEventContent.h
index 98e2f12d..55284aa4 100644
--- a/include/events/AvatarEventContent.h
+++ b/include/events/AvatarEventContent.h
@@ -36,16 +36,11 @@ public:
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
- inline QUrl url() const;
+ QUrl url() const { return url_; };
private:
QUrl url_;
};
-inline QUrl
-AvatarEventContent::url() const
-{
- return url_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/CanonicalAliasEventContent.h b/include/events/CanonicalAliasEventContent.h
index 9c961d42..6322c001 100644
--- a/include/events/CanonicalAliasEventContent.h
+++ b/include/events/CanonicalAliasEventContent.h
@@ -38,16 +38,11 @@ public:
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
- inline QString alias() const;
+ QString alias() const { return alias_; };
private:
QString alias_;
};
-inline QString
-CanonicalAliasEventContent::alias() const
-{
- return alias_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/CreateEventContent.h b/include/events/CreateEventContent.h
index 8edc4d24..0a47860e 100644
--- a/include/events/CreateEventContent.h
+++ b/include/events/CreateEventContent.h
@@ -36,17 +36,12 @@ public:
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
- inline QString creator() const;
+ QString creator() const { return creator_; };
private:
// The user_id of the room creator. This is set by the homeserver.
QString creator_;
};
-inline QString
-CreateEventContent::creator() const
-{
- return creator_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/Event.h b/include/events/Event.h
index 43ab4cc6..84c21907 100644
--- a/include/events/Event.h
+++ b/include/events/Event.h
@@ -66,8 +66,8 @@ class Event
, public Serializable
{
public:
- inline Content content() const;
- inline EventType eventType() const;
+ Content content() const;
+ EventType eventType() const;
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
diff --git a/include/events/HistoryVisibilityEventContent.h b/include/events/HistoryVisibilityEventContent.h
index 94563d55..1c39ae03 100644
--- a/include/events/HistoryVisibilityEventContent.h
+++ b/include/events/HistoryVisibilityEventContent.h
@@ -36,7 +36,7 @@ class HistoryVisibilityEventContent
, public Serializable
{
public:
- inline HistoryVisibility historyVisibility() const;
+ HistoryVisibility historyVisibility() const { return history_visibility_; };
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
@@ -45,10 +45,5 @@ private:
HistoryVisibility history_visibility_;
};
-inline HistoryVisibility
-HistoryVisibilityEventContent::historyVisibility() const
-{
- return history_visibility_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/JoinRulesEventContent.h b/include/events/JoinRulesEventContent.h
index b9b6848d..4ed9e65f 100644
--- a/include/events/JoinRulesEventContent.h
+++ b/include/events/JoinRulesEventContent.h
@@ -51,16 +51,11 @@ public:
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
- inline JoinRule joinRule() const;
+ JoinRule joinRule() const { return join_rule_; };
private:
JoinRule join_rule_;
};
-inline JoinRule
-JoinRulesEventContent::joinRule() const
-{
- return join_rule_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/MemberEventContent.h b/include/events/MemberEventContent.h
index 1dd703a0..8b7b1576 100644
--- a/include/events/MemberEventContent.h
+++ b/include/events/MemberEventContent.h
@@ -54,9 +54,9 @@ public:
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
- inline QUrl avatarUrl() const;
- inline QString displayName() const;
- inline Membership membershipState() const;
+ QUrl avatarUrl() const { return avatar_url_; };
+ QString displayName() const { return display_name_; };
+ Membership membershipState() const { return membership_state_; };
private:
QUrl avatar_url_;
@@ -64,22 +64,5 @@ private:
Membership membership_state_;
};
-inline QUrl
-MemberEventContent::avatarUrl() const
-{
- return avatar_url_;
-}
-
-inline QString
-MemberEventContent::displayName() const
-{
- return display_name_;
-}
-
-inline Membership
-MemberEventContent::membershipState() const
-{
- return membership_state_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/MessageEvent.h b/include/events/MessageEvent.h
index 7e7493e7..3c4f83e9 100644
--- a/include/events/MessageEvent.h
+++ b/include/events/MessageEvent.h
@@ -26,7 +26,7 @@ template<class MsgContent>
class MessageEvent : public RoomEvent<MessageEventContent>
{
public:
- inline MsgContent msgContent() const;
+ MsgContent msgContent() const;
void deserialize(const QJsonValue &data) override;
diff --git a/include/events/MessageEventContent.h b/include/events/MessageEventContent.h
index c096f155..aa08c066 100644
--- a/include/events/MessageEventContent.h
+++ b/include/events/MessageEventContent.h
@@ -64,16 +64,11 @@ public:
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
- inline QString body() const;
+ QString body() const { return body_; };
private:
QString body_;
};
-inline QString
-MessageEventContent::body() const
-{
- return body_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/NameEventContent.h b/include/events/NameEventContent.h
index 413c28cb..378f689d 100644
--- a/include/events/NameEventContent.h
+++ b/include/events/NameEventContent.h
@@ -35,16 +35,11 @@ public:
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
- inline QString name() const;
+ QString name() const { return name_; };
private:
QString name_;
};
-inline QString
-NameEventContent::name() const
-{
- return name_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/PowerLevelsEventContent.h b/include/events/PowerLevelsEventContent.h
index 04afa473..63998871 100644
--- a/include/events/PowerLevelsEventContent.h
+++ b/include/events/PowerLevelsEventContent.h
@@ -43,14 +43,14 @@ public:
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
- inline int banLevel() const;
- inline int inviteLevel() const;
- inline int kickLevel() const;
- inline int redactLevel() const;
+ int banLevel() const { return ban_; };
+ int inviteLevel() const { return invite_; };
+ int kickLevel() const { return kick_; };
+ int redactLevel() const { return redact_; };
- inline int eventsDefaultLevel() const;
- inline int stateDefaultLevel() const;
- inline int usersDefaultLevel() const;
+ int eventsDefaultLevel() const { return events_default_; };
+ int stateDefaultLevel() const { return state_default_; };
+ int usersDefaultLevel() const { return users_default_; };
int eventLevel(QString event_type) const;
int userLevel(QString user_id) const;
@@ -69,46 +69,5 @@ private:
QMap<QString, int> users_;
};
-inline int
-PowerLevelsEventContent::banLevel() const
-{
- return ban_;
-}
-
-inline int
-PowerLevelsEventContent::inviteLevel() const
-{
- return invite_;
-}
-
-inline int
-PowerLevelsEventContent::kickLevel() const
-{
- return kick_;
-}
-
-inline int
-PowerLevelsEventContent::redactLevel() const
-{
- return redact_;
-}
-
-inline int
-PowerLevelsEventContent::eventsDefaultLevel() const
-{
- return events_default_;
-}
-
-inline int
-PowerLevelsEventContent::stateDefaultLevel() const
-{
- return state_default_;
-}
-
-inline int
-PowerLevelsEventContent::usersDefaultLevel() const
-{
- return users_default_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/RoomEvent.h b/include/events/RoomEvent.h
index a1e88807..d80951c7 100644
--- a/include/events/RoomEvent.h
+++ b/include/events/RoomEvent.h
@@ -28,10 +28,10 @@ template<class Content>
class RoomEvent : public Event<Content>
{
public:
- inline QString eventId() const;
- inline QString roomId() const;
- inline QString sender() const;
- inline uint64_t timestamp() const;
+ QString eventId() const;
+ QString roomId() const;
+ QString sender() const;
+ uint64_t timestamp() const;
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
diff --git a/include/events/StateEvent.h b/include/events/StateEvent.h
index 146e96bd..19342a48 100644
--- a/include/events/StateEvent.h
+++ b/include/events/StateEvent.h
@@ -27,8 +27,8 @@ template<class Content>
class StateEvent : public RoomEvent<Content>
{
public:
- inline QString stateKey() const;
- inline Content previousContent() const;
+ QString stateKey() const;
+ Content previousContent() const;
void deserialize(const QJsonValue &data);
QJsonObject serialize() const;
diff --git a/include/events/TopicEventContent.h b/include/events/TopicEventContent.h
index d059e489..67e21208 100644
--- a/include/events/TopicEventContent.h
+++ b/include/events/TopicEventContent.h
@@ -36,16 +36,11 @@ public:
void deserialize(const QJsonValue &data) override;
QJsonObject serialize() const override;
- inline QString topic() const;
+ QString topic() const { return topic_; };
private:
QString topic_;
};
-inline QString
-TopicEventContent::topic() const
-{
- return topic_;
-}
} // namespace events
} // namespace matrix
diff --git a/include/events/messages/Audio.h b/include/events/messages/Audio.h
index 8abdf7f2..8466e0e4 100644
--- a/include/events/messages/Audio.h
+++ b/include/events/messages/Audio.h
@@ -35,8 +35,8 @@ struct AudioInfo
class Audio : public Deserializable
{
public:
- inline QString url() const;
- inline AudioInfo info() const;
+ QString url() const { return url_; };
+ AudioInfo info() const { return info_; };
void deserialize(const QJsonObject &object) override;
@@ -45,18 +45,6 @@ private:
AudioInfo info_;
};
-inline QString
-Audio::url() const
-{
- return url_;
-}
-
-inline AudioInfo
-Audio::info() const
-{
- return info_;
-}
-
} // namespace messages
} // namespace events
} // namespace matrix
diff --git a/include/events/messages/File.h b/include/events/messages/File.h
index ff5eb0a6..2fb2aa83 100644
--- a/include/events/messages/File.h
+++ b/include/events/messages/File.h
@@ -37,10 +37,9 @@ struct FileInfo
class File : public Deserializable
{
public:
- inline QString url() const;
- inline QString filename() const;
-
- inline FileInfo info() const;
+ QString url() const { return url_; };
+ QString filename() const { return filename_; };
+ FileInfo info() const { return info_; };
void deserialize(const QJsonObject &object) override;
@@ -51,24 +50,6 @@ private:
FileInfo info_;
};
-inline QString
-File::filename() const
-{
- return filename_;
-}
-
-inline QString
-File::url() const
-{
- return url_;
-}
-
-inline FileInfo
-File::info() const
-{
- return info_;
-}
-
} // namespace messages
} // namespace events
} // namespace matrix
diff --git a/include/events/messages/Image.h b/include/events/messages/Image.h
index 14889ff1..1e709579 100644
--- a/include/events/messages/Image.h
+++ b/include/events/messages/Image.h
@@ -39,8 +39,8 @@ struct ImageInfo
class Image : public Deserializable
{
public:
- inline QString url() const;
- inline ImageInfo info() const;
+ QString url() const { return url_; };
+ ImageInfo info() const { return info_; };
void deserialize(const QJsonObject &object) override;
@@ -49,18 +49,6 @@ private:
ImageInfo info_;
};
-inline QString
-Image::url() const
-{
- return url_;
-}
-
-inline ImageInfo
-Image::info() const
-{
- return info_;
-}
-
} // namespace messages
} // namespace events
} // namespace matrix
diff --git a/include/events/messages/Location.h b/include/events/messages/Location.h
index e51c6799..27722b37 100644
--- a/include/events/messages/Location.h
+++ b/include/events/messages/Location.h
@@ -34,8 +34,8 @@ struct LocationInfo
class Location : public Deserializable
{
public:
- inline QString geoUri() const;
- inline LocationInfo info() const;
+ QString geoUri() const { return geo_uri_; };
+ LocationInfo info() const { return info_; };
void deserialize(const QJsonObject &object) override;
@@ -45,18 +45,6 @@ private:
LocationInfo info_;
};
-inline QString
-Location::geoUri() const
-{
- return geo_uri_;
-}
-
-inline LocationInfo
-Location::info() const
-{
- return info_;
-}
-
} // namespace messages
} // namespace events
} // namespace matrix
diff --git a/include/events/messages/Video.h b/include/events/messages/Video.h
index d167b8c1..79713546 100644
--- a/include/events/messages/Video.h
+++ b/include/events/messages/Video.h
@@ -40,8 +40,8 @@ struct VideoInfo
class Video : public Deserializable
{
public:
- inline QString url() const;
- inline VideoInfo info() const;
+ QString url() const { return url_; };
+ VideoInfo info() const { return info_; };
void deserialize(const QJsonObject &object) override;
@@ -50,18 +50,6 @@ private:
VideoInfo info_;
};
-inline QString
-Video::url() const
-{
- return url_;
-}
-
-inline VideoInfo
-Video::info() const
-{
- return info_;
-}
-
} // namespace messages
} // namespace events
} // namespace matrix
|
