From bced31c677a5bb6399aad890d8e09c741bfc82a6 Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Tue, 9 Oct 2012 18:37:30 +0200
Subject: Avoid including C headers (glib/gio) in public headers; use "forward
 declarations" instead.

---
 libqmenumodel/src/qmenumodel.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'libqmenumodel/src/qmenumodel.cpp')

diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp
index 4c0fc23..a34cb47 100644
--- a/libqmenumodel/src/qmenumodel.cpp
+++ b/libqmenumodel/src/qmenumodel.cpp
@@ -17,6 +17,10 @@
  *      Renato Araujo Oliveira Filho <renato@canonical.com>
  */
 
+extern "C" {
+#include <gio/gio.h>
+}
+
 #include "qmenumodel.h"
 #include "converter.h"
 
@@ -205,10 +209,10 @@ QVariant QMenuModel::getExtraProperties(const QModelIndex &index) const
 
 /*! \internal */
 void QMenuModel::onItemsChanged(GMenuModel *,
-                                gint position,
-                                gint removed,
-                                gint added,
-                                gpointer data)
+                                int position,
+                                int removed,
+                                int added,
+                                void *data)
 {
     QMenuModel *self = reinterpret_cast<QMenuModel*>(data);
 
-- 
cgit v1.2.3