From 5fb1863497f1d02ea2f9eb1ad6c73e652d19d59f Mon Sep 17 00:00:00 2001 From: Olivier Tilloy Date: Thu, 4 Oct 2012 17:53:52 +0200 Subject: Fix variant conversion on 32-bits platforms. --- libqmenumodel/src/converter.cpp | 12 ++++++------ tests/client/modeltest.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libqmenumodel/src/converter.cpp b/libqmenumodel/src/converter.cpp index a060618..452f68c 100644 --- a/libqmenumodel/src/converter.cpp +++ b/libqmenumodel/src/converter.cpp @@ -21,17 +21,17 @@ QVariant Converter::toQVariant(GVariant *value) } else if (g_variant_type_equal(type, G_VARIANT_TYPE_BYTE)) { result.setValue(g_variant_get_byte(value)); } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT16)) { - result.setValue(g_variant_get_int16(value)); + result.setValue(qint16(g_variant_get_int16(value))); } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT16)) { - result.setValue(g_variant_get_uint16(value)); + result.setValue(quint16(g_variant_get_uint16(value))); } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT32)) { - result.setValue(g_variant_get_int32(value)); + result.setValue(qint32(g_variant_get_int32(value))); } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT32)) { - result.setValue(g_variant_get_uint32(value)); + result.setValue(quint32(g_variant_get_uint32(value))); } else if (g_variant_type_equal(type, G_VARIANT_TYPE_INT64)) { - result.setValue(g_variant_get_int64(value)); + result.setValue(qint64(g_variant_get_int64(value))); } else if (g_variant_type_equal(type, G_VARIANT_TYPE_UINT64)) { - result.setValue(g_variant_get_uint64(value)); + result.setValue(quint64(g_variant_get_uint64(value))); } else if (g_variant_type_equal(type, G_VARIANT_TYPE_DOUBLE)) { result.setValue(g_variant_get_double(value)); } else if (g_variant_type_equal(type, G_VARIANT_TYPE_STRING)) { diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp index b1f2090..9f6ee76 100644 --- a/tests/client/modeltest.cpp +++ b/tests/client/modeltest.cpp @@ -185,12 +185,12 @@ private Q_SLOTS: // Int64 v = extra["int64"]; - QCOMPARE(v.typeName(), "long"); + QCOMPARE(v.type(), QVariant::LongLong); QCOMPARE(v.value(), (long) -42); // UInt64 v = extra["uint64"]; - QCOMPARE(v.typeName(), "ulong"); + QCOMPARE(v.type(), QVariant::ULongLong); QCOMPARE(v.value(), (ulong) 42); // Double -- cgit v1.2.3