From fa5d7c1aa69ee8b4cf49c5e3cfe291e2f503f815 Mon Sep 17 00:00:00 2001 From: Olivier Tilloy Date: Mon, 8 Oct 2012 13:44:24 +0200 Subject: Call g_type_init() in the constructor for QDBusObject. This ensures it is always called where needed: clients don’t need to invoke it themselves. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/client/actiongrouptest.cpp | 5 ----- tests/client/menuchangestest.cpp | 5 ----- tests/client/modeltest.cpp | 5 ----- tests/client/servicetest.cpp | 5 ----- 4 files changed, 20 deletions(-) (limited to 'tests/client') diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp index 958ddc7..116bd44 100644 --- a/tests/client/actiongrouptest.cpp +++ b/tests/client/actiongrouptest.cpp @@ -17,10 +17,6 @@ * Renato Araujo Oliveira Filho */ -extern "C" { -#include -} - #include "qdbusmenumodel.h" #include "qdbusactiongroup.h" #include "dbusmenuscript.h" @@ -42,7 +38,6 @@ private: private Q_SLOTS: void initTestCase() { - g_type_init(); Q_ASSERT(m_script.connect()); } diff --git a/tests/client/menuchangestest.cpp b/tests/client/menuchangestest.cpp index bc7dcbd..2015582 100644 --- a/tests/client/menuchangestest.cpp +++ b/tests/client/menuchangestest.cpp @@ -17,10 +17,6 @@ * Renato Araujo Oliveira Filho */ -extern "C" { -#include -} - #include "qdbusmenumodel.h" #include "dbusmenuscript.h" @@ -39,7 +35,6 @@ private: private Q_SLOTS: void initTestCase() { - g_type_init(); Q_ASSERT(m_script.connect()); } diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp index 542b38a..9f6ee76 100644 --- a/tests/client/modeltest.cpp +++ b/tests/client/modeltest.cpp @@ -17,10 +17,6 @@ * Renato Araujo Oliveira Filho */ -extern "C" { -#include -} - #include "qdbusmenumodel.h" #include "dbusmenuscript.h" @@ -39,7 +35,6 @@ private: private Q_SLOTS: void initTestCase() { - g_type_init(); Q_ASSERT(m_script.connect()); } diff --git a/tests/client/servicetest.cpp b/tests/client/servicetest.cpp index d34ba79..a8b0c2a 100644 --- a/tests/client/servicetest.cpp +++ b/tests/client/servicetest.cpp @@ -17,10 +17,6 @@ * Renato Araujo Oliveira Filho */ -extern "C" { -#include -} - #include "qdbusmenumodel.h" #include "dbusmenuscript.h" @@ -46,7 +42,6 @@ private: private Q_SLOTS: void initTestCase() { - g_type_init(); Q_ASSERT(m_script.connect()); } -- cgit v1.2.3