diff options
| author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-08 13:44:24 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-08 13:44:24 +0200 |
| commit | fa5d7c1aa69ee8b4cf49c5e3cfe291e2f503f815 (patch) | |
| tree | 065b22b817734ae62db948836bd915f212293bc2 /libqmenumodel | |
| parent | a7852eabec9bcce2f93b30b9ea1c88ca2ab8d790 (diff) | |
| download | qmenumodel-fa5d7c1aa69ee8b4cf49c5e3cfe291e2f503f815.tar.gz qmenumodel-fa5d7c1aa69ee8b4cf49c5e3cfe291e2f503f815.tar.bz2 qmenumodel-fa5d7c1aa69ee8b4cf49c5e3cfe291e2f503f815.zip | |
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.
Diffstat (limited to 'libqmenumodel')
| -rw-r--r-- | libqmenumodel/QMenuModel/plugin.cpp | 5 | ||||
| -rw-r--r-- | libqmenumodel/src/qdbusobject.cpp | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp index 26650eb..ee05fff 100644 --- a/libqmenumodel/QMenuModel/plugin.cpp +++ b/libqmenumodel/QMenuModel/plugin.cpp @@ -17,10 +17,6 @@ * Renato Araujo Oliveira Filho <renato@canonical.com> */ -extern "C" { -#include <glib-object.h> -} - #include "plugin.h" #include "qmenumodel.h" #include "qdbusmenumodel.h" @@ -31,7 +27,6 @@ extern "C" { void QMenuModelQmlPlugin::registerTypes(const char *uri) { - g_type_init(); qmlRegisterUncreatableType<QMenuModel>(uri, 0, 1, "QMenuModel", "QMenuModel is a interface"); qmlRegisterUncreatableType<QStateAction>(uri, 0, 1, "QStateAction", diff --git a/libqmenumodel/src/qdbusobject.cpp b/libqmenumodel/src/qdbusobject.cpp index 63be580..ba348ad 100644 --- a/libqmenumodel/src/qdbusobject.cpp +++ b/libqmenumodel/src/qdbusobject.cpp @@ -17,6 +17,10 @@ * Renato Araujo Oliveira Filho <renato@canonical.com> */ +extern "C" { +#include <glib-object.h> +} + #include "qdbusobject.h" #include <QDebug> @@ -73,6 +77,7 @@ QDBusObject::QDBusObject() m_busType(DBusEnums::None), m_status(DBusEnums::Disconnected) { + g_type_init(); qRegisterMetaType<DBusEnums::ConnectionStatus>("DBusEnums::ConnectionStatus"); } |