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.

4 files changed, 0 insertions, 20 deletions

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 <renato@canonical.com>
  */
 
-extern "C" {
-#include <glib-object.h>
-}
-
 #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 <renato@canonical.com>
  */
 
-extern "C" {
-#include <glib-object.h>
-}
-
 #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 <renato@canonical.com>
  */
 
-extern "C" {
-#include <glib-object.h>
-}
-
 #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 <renato@canonical.com>
  */
 
-extern "C" {
-#include <glib-object.h>
-}
-
 #include "qdbusmenumodel.h"
 #include "dbusmenuscript.h"
 
@@ -46,7 +42,6 @@ private:
 private Q_SLOTS:
     void initTestCase()
     {
-        g_type_init();
         Q_ASSERT(m_script.connect());
     }