aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-04 15:53:06 +0200
committerOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-04 15:53:06 +0200
commit1e045bbea3e1f8037ea92e449bbce94ed7408c7c (patch)
tree8d0e63f315360323522f7eea7916d1296d336915 /src/common
parent7a410b589e8c7b15bcc15ec6b2275ffe7e6a7db0 (diff)
downloadqmenumodel-1e045bbea3e1f8037ea92e449bbce94ed7408c7c.tar.gz
qmenumodel-1e045bbea3e1f8037ea92e449bbce94ed7408c7c.tar.bz2
qmenumodel-1e045bbea3e1f8037ea92e449bbce94ed7408c7c.zip
Fixed some #include statements.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/qdbusactiongroup.cpp4
-rw-r--r--src/common/qdbusactiongroup.h3
-rw-r--r--src/common/qdbusmenumodel.cpp1
-rw-r--r--src/common/qdbusmenumodel.h2
-rw-r--r--src/common/qdbusobject.h6
-rw-r--r--src/common/qmenumodel.h3
6 files changed, 12 insertions, 7 deletions
diff --git a/src/common/qdbusactiongroup.cpp b/src/common/qdbusactiongroup.cpp
index d25f2de..5a9e0bd 100644
--- a/src/common/qdbusactiongroup.cpp
+++ b/src/common/qdbusactiongroup.cpp
@@ -21,9 +21,9 @@
#include "qstateaction.h"
#include "converter.h"
-#include <QDebug>
-
+extern "C" {
#include <gio/gio.h>
+}
/*!
\qmlclass QDBusActionGroup
diff --git a/src/common/qdbusactiongroup.h b/src/common/qdbusactiongroup.h
index 2bd0a15..518f78c 100644
--- a/src/common/qdbusactiongroup.h
+++ b/src/common/qdbusactiongroup.h
@@ -23,8 +23,7 @@
#include "qdbusobject.h"
#include <QObject>
-#include <QAction>
-#include <QSet>
+#include <QVariant>
class QStateAction;
diff --git a/src/common/qdbusmenumodel.cpp b/src/common/qdbusmenumodel.cpp
index 354b10b..88a6084 100644
--- a/src/common/qdbusmenumodel.cpp
+++ b/src/common/qdbusmenumodel.cpp
@@ -18,7 +18,6 @@
*/
#include "qdbusmenumodel.h"
-#include <QDebug>
/*!
\qmlclass QDBusMenuModel
diff --git a/src/common/qdbusmenumodel.h b/src/common/qdbusmenumodel.h
index 2660ffe..fdf23f7 100644
--- a/src/common/qdbusmenumodel.h
+++ b/src/common/qdbusmenumodel.h
@@ -23,7 +23,9 @@
#include "qdbusobject.h"
#include "qmenumodel.h"
+extern "C" {
#include <gio/gio.h>
+}
class QDBusMenuModel : public QMenuModel, public QDBusObject
{
diff --git a/src/common/qdbusobject.h b/src/common/qdbusobject.h
index a3cef38..ef2b42f 100644
--- a/src/common/qdbusobject.h
+++ b/src/common/qdbusobject.h
@@ -20,9 +20,11 @@
#ifndef QDBUSOBJECT_H
#define QDBUSOBJECT_H
-#include <QObject>
-
+extern "C" {
#include <gio/gio.h>
+}
+
+#include <QString>
#include "dbus-enums.h"
diff --git a/src/common/qmenumodel.h b/src/common/qmenumodel.h
index 598efd6..7520480 100644
--- a/src/common/qmenumodel.h
+++ b/src/common/qmenumodel.h
@@ -21,7 +21,10 @@
#define QMENUMODEL_H
#include <QAbstractListModel>
+
+extern "C" {
#include <gio/gio.h>
+}
class QMenuModel : public QAbstractListModel
{