forked from romixlab/qmsgpack
qt_types test fixed
Sphinx doc added
This commit is contained in:
@@ -98,8 +98,6 @@ QTime MsgPackPrivate::unpack_qtime_raw(quint8 *p, bool with_ms)
|
||||
QByteArray MsgPackPrivate::pack_qtime(const QVariant &variant)
|
||||
{
|
||||
QTime time = variant.toTime();
|
||||
if (time.isNull())
|
||||
return QByteArray("\xc0", 1);
|
||||
quint8 size = time.msec() == 0 ? 2 : 4;
|
||||
QByteArray data;
|
||||
data.resize(size);
|
||||
@@ -109,8 +107,6 @@ QByteArray MsgPackPrivate::pack_qtime(const QVariant &variant)
|
||||
|
||||
QVariant MsgPackPrivate::unpack_qtime(const QByteArray &data)
|
||||
{
|
||||
if (data.size() == 1)
|
||||
return QTime();
|
||||
return unpack_qtime_raw((quint8 *)data.data(), data.size() == 4);
|
||||
}
|
||||
|
||||
@@ -139,8 +135,6 @@ QDate MsgPackPrivate::unpack_qdate_raw(quint8 *p)
|
||||
QByteArray MsgPackPrivate::pack_qdate(const QVariant &variant)
|
||||
{
|
||||
QDate date = variant.toDate();
|
||||
if (date.isNull())
|
||||
return QByteArray("\xc0", 1);
|
||||
QByteArray data;
|
||||
data.resize(3);
|
||||
pack_qdate_raw(variant.toDate(), (quint8 *)data.data());
|
||||
@@ -149,16 +143,12 @@ QByteArray MsgPackPrivate::pack_qdate(const QVariant &variant)
|
||||
|
||||
QVariant MsgPackPrivate::unpack_qdate(const QByteArray &data)
|
||||
{
|
||||
if (data.size() == 1)
|
||||
return QDate();
|
||||
return unpack_qdate_raw((quint8 *)data.data());
|
||||
}
|
||||
|
||||
QByteArray MsgPackPrivate::pack_qdatetime(const QVariant &variant)
|
||||
{
|
||||
QDateTime dt = variant.toDateTime();
|
||||
if (dt.isNull())
|
||||
return QByteArray("\xc0", 1);
|
||||
quint8 time_size = dt.time().msec() == 0 ? 2 : 4;
|
||||
QByteArray data;
|
||||
data.resize(3 + time_size);
|
||||
@@ -171,8 +161,6 @@ QByteArray MsgPackPrivate::pack_qdatetime(const QVariant &variant)
|
||||
|
||||
QVariant MsgPackPrivate::unpack_qdatetime(const QByteArray &data)
|
||||
{
|
||||
if (data.size() == 1)
|
||||
return QDateTime();
|
||||
quint8 *p = (quint8 *)data.data();
|
||||
QDate d = unpack_qdate_raw(p);
|
||||
QTime t = unpack_qtime_raw(p + 3, data.size() == 7);
|
||||
@@ -183,8 +171,6 @@ QVariant MsgPackPrivate::unpack_qdatetime(const QByteArray &data)
|
||||
QByteArray MsgPackPrivate::pack_qpoint(const QVariant &variant)
|
||||
{
|
||||
QPoint point = variant.toPoint();
|
||||
if (point.isNull())
|
||||
return QByteArray("\xc0", 1);
|
||||
QByteArray packed;
|
||||
MsgPackStream stream(&packed, QIODevice::WriteOnly);
|
||||
stream << point.x() << point.y();
|
||||
@@ -193,8 +179,6 @@ QByteArray MsgPackPrivate::pack_qpoint(const QVariant &variant)
|
||||
|
||||
QVariant MsgPackPrivate::unpack_qpoint(const QByteArray &data)
|
||||
{
|
||||
if (data.size() == 1)
|
||||
return QPoint();
|
||||
MsgPackStream stream(data);
|
||||
qint32 x, y;
|
||||
stream >> x >> y;
|
||||
@@ -204,8 +188,6 @@ QVariant MsgPackPrivate::unpack_qpoint(const QByteArray &data)
|
||||
QByteArray MsgPackPrivate::pack_qsize(const QVariant &variant)
|
||||
{
|
||||
QSize size = variant.toSize();
|
||||
if (size.isNull())
|
||||
return QByteArray("\xc0", 1);
|
||||
QByteArray packed;
|
||||
MsgPackStream stream(&packed, QIODevice::WriteOnly);
|
||||
stream << size.width() << size.height();
|
||||
@@ -214,8 +196,6 @@ QByteArray MsgPackPrivate::pack_qsize(const QVariant &variant)
|
||||
|
||||
QVariant MsgPackPrivate::unpack_qsize(const QByteArray &data)
|
||||
{
|
||||
if (data.size() == 1)
|
||||
return QSize();
|
||||
MsgPackStream stream(data);
|
||||
qint32 width, height;
|
||||
stream >> width >> height;
|
||||
@@ -225,8 +205,6 @@ QVariant MsgPackPrivate::unpack_qsize(const QByteArray &data)
|
||||
QByteArray MsgPackPrivate::pack_qrect(const QVariant &variant)
|
||||
{
|
||||
QRect rect = variant.toRect();
|
||||
if (rect.isNull())
|
||||
return QByteArray("\xc0", 1);
|
||||
QPoint pt1 = rect.topLeft();
|
||||
QPoint pt2 = rect.bottomRight();
|
||||
QByteArray packed;
|
||||
@@ -237,8 +215,6 @@ QByteArray MsgPackPrivate::pack_qrect(const QVariant &variant)
|
||||
|
||||
QVariant MsgPackPrivate::unpack_qrect(const QByteArray &data)
|
||||
{
|
||||
if (data.size() == 1)
|
||||
return QRect();
|
||||
MsgPackStream stream(data);
|
||||
qint32 x, y;
|
||||
stream >> x >> y;
|
||||
|
||||
Reference in New Issue
Block a user