diff options
-rw-r--r-- | libqmenumodel/src/qdbusobject.cpp | 1 | ||||
-rw-r--r-- | tests/client/actiongrouptest.cpp | 1 | ||||
-rw-r--r-- | tests/client/cachetest.cpp | 5 | ||||
-rw-r--r-- | tests/client/convertertest.cpp | 4 | ||||
-rw-r--r-- | tests/client/modelsignalstest.cpp | 5 | ||||
-rw-r--r-- | tests/client/treetest.cpp | 5 |
6 files changed, 3 insertions, 18 deletions
diff --git a/libqmenumodel/src/qdbusobject.cpp b/libqmenumodel/src/qdbusobject.cpp index be9fb93..fab2df7 100644 --- a/libqmenumodel/src/qdbusobject.cpp +++ b/libqmenumodel/src/qdbusobject.cpp @@ -81,7 +81,6 @@ QDBusObject::QDBusObject(QObject* listener) m_busType(DBusEnums::None), m_status(DBusEnums::Disconnected) { - g_type_init(); qRegisterMetaType<DBusEnums::ConnectionStatus>("DBusEnums::ConnectionStatus"); } diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index 3ab329c..425f97c 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -43,6 +43,7 @@ private: // Get Action QVariant action = m_model.data(m_model.index(index, 0), QMenuModel::Action); QVERIFY(action.isValid()); + printf("aCTION IS %s\n",action.toString().toUtf8().data()); *act = m_actionGroup.action(action.toString()); QVERIFY(act); } diff --git a/tests/client/cachetest.cpp b/tests/client/cachetest.cpp index 22fe5d3..8ad65af 100644 --- a/tests/client/cachetest.cpp +++ b/tests/client/cachetest.cpp @@ -77,11 +77,6 @@ class CacheTest : public QObject Q_OBJECT private Q_SLOTS: - void initTestCase() - { - g_type_init(); - } - // Verify that normal menu items are not cached (only sub-menus are) void testCacheContents() { 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 diff --git a/tests/client/modelsignalstest.cpp b/tests/client/modelsignalstest.cpp index 40a76c6..3064778 100644 --- a/tests/client/modelsignalstest.cpp +++ b/tests/client/modelsignalstest.cpp @@ -192,11 +192,6 @@ class ModelSignalsTest : public QObject { Q_OBJECT private Q_SLOTS: - void initTestCase() - { - g_type_init(); - } - /* * Test if the model state still correct before and after insert a new row */ diff --git a/tests/client/treetest.cpp b/tests/client/treetest.cpp index b6fec3c..81399f7 100644 --- a/tests/client/treetest.cpp +++ b/tests/client/treetest.cpp @@ -62,11 +62,6 @@ class TreeTest : public QObject Q_OBJECT private Q_SLOTS: - void initTestCase() - { - g_type_init(); - } - void testMenuBuild() { TestModel menu; |