Skip to content

tst_Encoder: stop using QVariant::Type in favour of QMetaType::Type #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thiagomacieira merged 2 commits into from
Mar 18, 2025
Merged

tst_Encoder: stop using QVariant::Type in favour of QMetaType::Type #285

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5b4b93
tst_Encoder: stop using QVariant::Type in favour of QMetaType::Type
thiagomacieira Mar 14, 2025
a412ff6
Merge branch 'main' into tst_Encoder_stop_using_QVariant_Type_in_favo…
thiagomacieira Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions tests/encoder/tst_encoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,35 +107,35 @@ CborError encodeVariant(CborEncoder *encoder, const QVariant &v)
{
int type = v.userType();
switch (type) {
case QVariant::Int:
case QVariant::LongLong:
case QMetaType::Int:
case QMetaType::LongLong:
return cbor_encode_int(encoder, v.toLongLong());

case QVariant::UInt:
case QVariant::ULongLong:
case QMetaType::UInt:
case QMetaType::ULongLong:
return cbor_encode_uint(encoder, v.toULongLong());

case QVariant::Bool:
case QMetaType::Bool:
return cbor_encode_boolean(encoder, v.toBool());

case QVariant::Invalid:
case QMetaType::UnknownType:
return cbor_encode_undefined(encoder);

case QMetaType::VoidStar:
return cbor_encode_null(encoder);

case QVariant::Double:
case QMetaType::Double:
return cbor_encode_double(encoder, v.toDouble());

case QMetaType::Float:
return cbor_encode_float(encoder, v.toFloat());

case QVariant::String: {
case QMetaType::QString: {
QByteArray string = v.toString().toUtf8();
return cbor_encode_text_string(encoder, string.constData(), string.length());
}

case QVariant::ByteArray: {
case QMetaType::QByteArray: {
QByteArray string = v.toByteArray();
return cbor_encode_byte_string(encoder, reinterpret_cast<const quint8 *>(string.constData()), string.length());
}
Expand All @@ -158,7 +158,7 @@ CborError encodeVariant(CborEncoder *encoder, const QVariant &v)
return err;
return static_cast<CborError>(err | encodeVariant(encoder, v.value<Tag>().tagged));
}
if (type == QVariant::List || type == qMetaTypeId<IndeterminateLengthArray>()) {
if (type == QMetaType::QVariantList || type == qMetaTypeId<IndeterminateLengthArray>()) {
CborEncoder sub;
QVariantList list = v.toList();
size_t len = list.length();
Expand Down
Loading