X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fserializers%2Fserializers.h;h=5f3dea881563eb6fc9af47b7a8f861c3fcad72f5;hp=b3c0aa04d2b94047f7537432998117d80b78bcec;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=2b777e99fc9f74d4ed21491710260664a1721d1f diff --git a/src/common/serializers/serializers.h b/src/common/serializers/serializers.h index b3c0aa04..5f3dea88 100644 --- a/src/common/serializers/serializers.h +++ b/src/common/serializers/serializers.h @@ -33,85 +33,87 @@ #include "peer.h" namespace Serializers { - namespace Types { - enum class VariantType : quint32 { - Void = 0, - Bool = 1, - Int = 2, - UInt = 3, +namespace Types { +enum class VariantType : quint32 +{ + Void = 0, + Bool = 1, + Int = 2, + UInt = 3, - QChar = 7, - QVariantMap = 8, - QVariantList = 9, - QString = 10, - QStringList = 11, - QByteArray = 12, + QChar = 7, + QVariantMap = 8, + QVariantList = 9, + QString = 10, + QStringList = 11, + QByteArray = 12, - QDate = 14, - QTime = 15, - QDateTime = 16, + QDate = 14, + QTime = 15, + QDateTime = 16, - Long = 129, - Short = 130, - Char = 131, - ULong = 132, - UShort = 133, - UChar = 134, + Long = 129, + Short = 130, + Char = 131, + ULong = 132, + UShort = 133, + UChar = 134, - QVariant = 138, + QVariant = 138, - UserType = 127 - }; + UserType = 127 +}; - enum class QuasselType { - Invalid, - BufferId, - BufferInfo, - Identity, - IdentityId, - Message, - MsgId, - NetworkId, - NetworkInfo, - Network_Server, - PeerPtr - }; +enum class QuasselType +{ + Invalid, + BufferId, + BufferInfo, + Identity, + IdentityId, + Message, + MsgId, + NetworkId, + NetworkInfo, + Network_Server, + PeerPtr +}; - VariantType variantType(QuasselType type); - QString toName(QuasselType type); - Types::QuasselType fromName(::QByteArray &name); - } +VariantType variantType(QuasselType type); +QString toName(QuasselType type); +Types::QuasselType fromName(::QByteArray& name); +} // namespace Types - bool deserialize(QDataStream &stream, const Quassel::Features &features, QVariant &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QVariantList &list); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QVariantMap &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QVariant &data, Types::VariantType type); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QVariant &data, Types::QuasselType type); - bool deserialize(QDataStream &stream, const Quassel::Features &features, bool &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, int8_t &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, uint8_t &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, int16_t &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, uint16_t &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, int32_t &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, uint32_t &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, qlonglong &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, qulonglong &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, Types::VariantType &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QChar &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QString &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QTime &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QDate &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QDateTime &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QByteArray &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, QStringList &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, Message &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, BufferInfo &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, BufferId &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, IdentityId &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, NetworkId &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, MsgId &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, PeerPtr &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, NetworkInfo &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, Identity &data); - bool deserialize(QDataStream &stream, const Quassel::Features &features, Network::Server &data); -}; +bool deserialize(QDataStream& stream, const Quassel::Features& features, QVariant& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QVariantList& list); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QVariantMap& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QVariant& data, Types::VariantType type); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QVariant& data, Types::QuasselType type); +bool deserialize(QDataStream& stream, const Quassel::Features& features, bool& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, int8_t& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, uint8_t& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, int16_t& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, uint16_t& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, int32_t& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, uint32_t& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, qlonglong& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, qulonglong& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, Types::VariantType& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QChar& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QString& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QTime& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QDate& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QDateTime& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QByteArray& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, QStringList& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, Message& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, BufferInfo& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, BufferId& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, IdentityId& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, NetworkId& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, MsgId& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, PeerPtr& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, NetworkInfo& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, Identity& data); +bool deserialize(QDataStream& stream, const Quassel::Features& features, Network::Server& data); +} // namespace Serializers