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;