From 098655e14e53a9430480fb42cc15b58335369487 Mon Sep 17 00:00:00 2001 From: Roman Isaikin Date: Tue, 3 May 2016 10:31:39 +0300 Subject: [PATCH 1/2] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f04532a..dd63250 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ MessagePack for Qt Build Status - + Doc Status @@ -17,7 +17,7 @@ MessagePack for Qt Documentation ------------- -Complete documentation is available here: [qmsgpack.readthedocs.org](http://qmsgpack.readthedocs.org/) +Complete documentation is available here: [qmsgpack.readthedocs.io](http://qmsgpack.readthedocs.io/en/latest/) Installation ------------ From 35b0e9108cb7b33af03a9c0ced1dfd36cadf67c5 Mon Sep 17 00:00:00 2001 From: Enoch Carter Date: Thu, 26 May 2016 08:51:54 -0600 Subject: [PATCH 2/2] changed QMetaType::Type T to int to allow registration of custom QMetaTypes --- src/msgpack.cpp | 2 +- src/msgpack.h | 2 +- src/private/pack_p.cpp | 4 ++-- src/private/pack_p.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/msgpack.cpp b/src/msgpack.cpp index e18c361..4924970 100644 --- a/src/msgpack.cpp +++ b/src/msgpack.cpp @@ -28,7 +28,7 @@ QByteArray MsgPack::pack(const QVariant &variant) return arr; } -bool MsgPack::registerPacker(QMetaType::Type qType, qint8 msgpackType, MsgPack::pack_user_f packer) +bool MsgPack::registerPacker(int qType, qint8 msgpackType, MsgPack::pack_user_f packer) { return MsgPackPrivate::register_packer(qType, msgpackType, packer); } diff --git a/src/msgpack.h b/src/msgpack.h index 5a6d43e..6a55981 100644 --- a/src/msgpack.h +++ b/src/msgpack.h @@ -13,7 +13,7 @@ namespace MsgPack MSGPACK_EXPORT bool registerUnpacker(qint8 msgpackType, unpack_user_f unpacker); MSGPACK_EXPORT QByteArray pack(const QVariant &variant); - MSGPACK_EXPORT bool registerPacker(QMetaType::Type qType, qint8 msgpackType, pack_user_f packer); + MSGPACK_EXPORT bool registerPacker(int qType, qint8 msgpackType, pack_user_f packer); MSGPACK_EXPORT qint8 msgpackType(int qType); MSGPACK_EXPORT bool registerType(QMetaType::Type qType, quint8 msgpackType); diff --git a/src/private/pack_p.cpp b/src/private/pack_p.cpp index 2c2d6ec..a0d4080 100644 --- a/src/private/pack_p.cpp +++ b/src/private/pack_p.cpp @@ -11,7 +11,7 @@ #include #include -QHash MsgPackPrivate::user_packers; +QHash MsgPackPrivate::user_packers; bool MsgPackPrivate::compatibilityMode = false; QReadWriteLock MsgPackPrivate::packers_lock; @@ -319,7 +319,7 @@ quint8 *MsgPackPrivate::pack_map(const QVariantMap &map, quint8 *p, bool wr, QVe return p; } -bool MsgPackPrivate::register_packer(QMetaType::Type q_type, qint8 msgpack_type, MsgPack::pack_user_f packer) +bool MsgPackPrivate::register_packer(int q_type, qint8 msgpack_type, MsgPack::pack_user_f packer) { QWriteLocker locker(&packers_lock); if (user_packers.contains(q_type)) { diff --git a/src/private/pack_p.h b/src/private/pack_p.h index cf9a785..f3daaef 100644 --- a/src/private/pack_p.h +++ b/src/private/pack_p.h @@ -19,9 +19,9 @@ typedef struct { MsgPack::pack_user_f packer; qint8 type; } packer_t; -bool register_packer(QMetaType::Type q_type, qint8 msgpack_type, MsgPack::pack_user_f packer); +bool register_packer(int q_type, qint8 msgpack_type, MsgPack::pack_user_f packer); qint8 msgpack_type(QMetaType::Type q_type); -extern QHash user_packers; +extern QHash user_packers; extern QReadWriteLock packers_lock; extern bool compatibilityMode;