diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-10-22 19:00:49 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-10-22 19:00:49 +0200 |
| commit | 3d2c260f804273e5a65f27a379f4ad74407ee921 (patch) | |
| tree | af512bd158d98727ed499a9294f4697351c76df9 /tests/client/convertertest.cpp | |
| parent | 3897067538752e4538995ac1e3107fdf8c72e847 (diff) | |
| download | qmenumodel-3d2c260f804273e5a65f27a379f4ad74407ee921.tar.gz qmenumodel-3d2c260f804273e5a65f27a379f4ad74407ee921.tar.bz2 qmenumodel-3d2c260f804273e5a65f27a379f4ad74407ee921.zip | |
remove deprecated g_type_init() calls
Diffstat (limited to 'tests/client/convertertest.cpp')
| -rw-r--r-- | tests/client/convertertest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/client/convertertest.cpp b/tests/client/convertertest.cpp index 9e563cd..ddb6aa2 100644 --- a/tests/client/convertertest.cpp +++ b/tests/client/convertertest.cpp @@ -32,7 +32,7 @@ class QGVariantType : public QObject { Q_OBJECT public: - QGVariantType() : type(nullptr) {} + QGVariantType() : type(NULL) {} QGVariantType(const GVariantType *gvtype) : type(gvtype) {} QGVariantType(const QGVariantType &other) : type(other.type) {} const GVariantType *getType() const { return type; } @@ -163,7 +163,7 @@ private Q_SLOTS: QTest::newRow("string from double") << QVariant::fromValue<double>(1.1) << "s"; // convert to tuple - auto list = QVariantList() << QVariant::fromValue<bool>(true) << QVariant::fromValue<int>(1) << QVariant::fromValue<int>(1) << QVariant::fromValue<QString>("test1"); + QVariantList list = QVariantList() << QVariant::fromValue<bool>(true) << QVariant::fromValue<int>(1) << QVariant::fromValue<int>(1) << QVariant::fromValue<QString>("test1"); QTest::newRow("tuple") << QVariant(list) << "(bdis)"; // convert to array |