X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmessage.h;h=79e25cf5e636b760d52de10f0f9e5838e0e99a1b;hb=fa3449061f17d7e8db1387f0758fd052f22f4c3b;hp=d61a8a72cc2c504fe4919e8d3cd47eb094a4bd64;hpb=dba66762993507168b1a3de25cfd2d7bff0ff969;p=quassel.git diff --git a/src/common/message.h b/src/common/message.h index d61a8a72..79e25cf5 100644 --- a/src/common/message.h +++ b/src/common/message.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -53,6 +53,7 @@ public: NetsplitQuit = 0x10000, Invite = 0x20000, }; + Q_DECLARE_FLAGS(Types, Type) // DO NOT CHANGE without knowing what you do, some of these flags are stored in the database enum Flag { @@ -66,9 +67,11 @@ public: }; Q_DECLARE_FLAGS(Flags, Flag) - Message(const BufferInfo &bufferInfo = BufferInfo(), Type type = Plain, const QString &contents = "", const QString &sender = "", const QString &senderPrefixes = "", Flags flags = None); + Message(const BufferInfo &bufferInfo = BufferInfo(), Type type = Plain, const QString &contents = {}, + const QString &sender = {}, const QString &senderPrefixes = {}, Flags flags = None); Message(const QDateTime &ts, const BufferInfo &buffer = BufferInfo(), Type type = Plain, - const QString &contents = "", const QString &sender = "", const QString &senderPrefixes = "", Flags flags = None); + const QString &contents = {}, const QString &sender = {}, const QString &senderPrefixes = {}, + Flags flags = None); inline static Message ChangeOfDay(const QDateTime &day) { return Message(day, BufferInfo(), DayChange); } inline const MsgId &msgId() const { return _msgId; } @@ -110,6 +113,7 @@ QDataStream &operator>>(QDataStream &in, Message &msg); QDebug operator<<(QDebug dbg, const Message &msg); Q_DECLARE_METATYPE(Message) +Q_DECLARE_OPERATORS_FOR_FLAGS(Message::Types) Q_DECLARE_OPERATORS_FOR_FLAGS(Message::Flags) #endif