diff options
| author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-04 14:52:34 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-04 14:52:34 +0200 |
| commit | e14ab1e03bf40e5f63329f8ed26b3f11cc15fb0a (patch) | |
| tree | 54306253f20dfd98ee318b45fd954e4e9d8809e3 | |
| parent | ba89bb27ac5ff18d237dc88608bfbeb3071ac25c (diff) | |
| download | qmenumodel-e14ab1e03bf40e5f63329f8ed26b3f11cc15fb0a.tar.gz qmenumodel-e14ab1e03bf40e5f63329f8ed26b3f11cc15fb0a.tar.bz2 qmenumodel-e14ab1e03bf40e5f63329f8ed26b3f11cc15fb0a.zip | |
Replace #include statements with forward declarations in converter.h.
| -rw-r--r-- | src/common/converter.cpp | 5 | ||||
| -rw-r--r-- | src/common/converter.h | 4 | ||||
| -rw-r--r-- | tests/client/convertertest.cpp | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/common/converter.cpp b/src/common/converter.cpp index 365f891..a060618 100644 --- a/src/common/converter.cpp +++ b/src/common/converter.cpp @@ -1,6 +1,11 @@ +extern "C" { +#include <glib.h> +} + #include "converter.h" #include <QDebug> +#include <QVariant> /*! \internal */ QVariant Converter::toQVariant(GVariant *value) diff --git a/src/common/converter.h b/src/common/converter.h index f4d7e08..5f05bc7 100644 --- a/src/common/converter.h +++ b/src/common/converter.h @@ -20,8 +20,8 @@ #ifndef CONVERTER_H #define CONVERTER_H -#include <QVariant> -#include <glib.h> +typedef struct _GVariant GVariant; +class QVariant; class Converter { diff --git a/tests/client/convertertest.cpp b/tests/client/convertertest.cpp index 496b62a..72b6a87 100644 --- a/tests/client/convertertest.cpp +++ b/tests/client/convertertest.cpp @@ -17,6 +17,10 @@ * Renato Araujo Oliveira Filho <renato@canonical.com> */ +extern "C" { +#include <glib.h> +} + #include "converter.h" #include <QObject> |