aboutsummaryrefslogtreecommitdiff
path: root/lib/events/accountdataevents.h
diff options
context:
space:
mode:
authorMarc Deop <marc@marcdeop.com>2019-03-02 12:26:57 +0100
committerMarc Deop <marc@marcdeop.com>2019-03-02 12:26:57 +0100
commitaacc4bcb4a487871daae6717f77605aaba444341 (patch)
tree4f50b6874821667ccb6b91c017e5d041e3846112 /lib/events/accountdataevents.h
parentc971b924cd62822ed6fb1a0291c483ae73a3ecda (diff)
downloadlibquotient-aacc4bcb4a487871daae6717f77605aaba444341.tar.gz
libquotient-aacc4bcb4a487871daae6717f77605aaba444341.zip
style: apply .clang-format to all .cpp and .h files
Diffstat (limited to 'lib/events/accountdataevents.h')
-rw-r--r--lib/events/accountdataevents.h67
1 files changed, 33 insertions, 34 deletions
diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h
index a99d85ac..0cf2dc60 100644
--- a/lib/events/accountdataevents.h
+++ b/lib/events/accountdataevents.h
@@ -15,38 +15,37 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
+#include "converters.h"
#include "event.h"
#include "eventcontent.h"
-#include "converters.h"
-namespace QMatrixClient
-{
+namespace QMatrixClient {
constexpr const char* FavouriteTag = "m.favourite";
constexpr const char* LowPriorityTag = "m.lowpriority";
- struct TagRecord
- {
+ struct TagRecord {
using order_type = Omittable<float>;
order_type order;
- TagRecord (order_type order = none) : order(order) { }
+ TagRecord(order_type order = none) : order(order) {}
bool operator<(const TagRecord& other) const
{
- // Per The Spec, rooms with no order should be after those with order
- return !order.omitted() &&
- (other.order.omitted() || order.value() < other.order.value());
+ // Per The Spec, rooms with no order should be after those with
+ // order
+ return !order.omitted()
+ && (other.order.omitted()
+ || order.value() < other.order.value());
}
};
- template <> struct JsonObjectConverter<TagRecord>
- {
+ template <> struct JsonObjectConverter<TagRecord> {
static void fillFrom(const QJsonObject& jo, TagRecord& rec)
{
// Parse a float both from JSON double and JSON string because
@@ -54,8 +53,7 @@ namespace QMatrixClient
const auto orderJv = jo.value("order"_ls);
if (orderJv.isDouble())
rec.order = fromJson<float>(orderJv);
- if (orderJv.isString())
- {
+ if (orderJv.isString()) {
bool ok;
rec.order = orderJv.toString().toFloat(&ok);
if (!ok)
@@ -70,30 +68,31 @@ namespace QMatrixClient
using TagsMap = QHash<QString, TagRecord>;
-#define DEFINE_SIMPLE_EVENT(_Name, _TypeId, _ContentType, _ContentKey) \
- class _Name : public Event \
- { \
- public: \
- using content_type = _ContentType; \
- DEFINE_EVENT_TYPEID(_TypeId, _Name) \
- explicit _Name(QJsonObject obj) \
- : Event(typeId(), std::move(obj)) \
- { } \
- explicit _Name(_ContentType content) \
- : Event(typeId(), matrixTypeId(), \
- QJsonObject { { QStringLiteral(#_ContentKey), \
- toJson(std::move(content)) } }) \
- { } \
- auto _ContentKey() const \
- { return fromJson<content_type>(contentJson()[#_ContentKey##_ls]); } \
- }; \
- REGISTER_EVENT_TYPE(_Name) \
+#define DEFINE_SIMPLE_EVENT(_Name, _TypeId, _ContentType, _ContentKey) \
+ class _Name : public Event \
+ { \
+ public: \
+ using content_type = _ContentType; \
+ DEFINE_EVENT_TYPEID(_TypeId, _Name) \
+ explicit _Name(QJsonObject obj) : Event(typeId(), std::move(obj)) {} \
+ explicit _Name(_ContentType content) \
+ : Event(typeId(), matrixTypeId(), \
+ QJsonObject { { QStringLiteral(#_ContentKey), \
+ toJson(std::move(content)) } }) \
+ { \
+ } \
+ auto _ContentKey() const \
+ { \
+ return fromJson<content_type>(contentJson()[#_ContentKey##_ls]); \
+ } \
+ }; \
+ REGISTER_EVENT_TYPE(_Name) \
// End of macro
DEFINE_SIMPLE_EVENT(TagEvent, "m.tag", TagsMap, tags)
DEFINE_SIMPLE_EVENT(ReadMarkerEvent, "m.fully_read", QString, event_id)
- DEFINE_SIMPLE_EVENT(IgnoredUsersEvent, "m.ignored_user_list",
- QSet<QString>, ignored_users)
+ DEFINE_SIMPLE_EVENT(IgnoredUsersEvent, "m.ignored_user_list", QSet<QString>,
+ ignored_users)
DEFINE_EVENTTYPE_ALIAS(Tag, TagEvent)
DEFINE_EVENTTYPE_ALIAS(ReadMarker, ReadMarkerEvent)