diff options
| author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-09 18:37:30 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-09 18:37:30 +0200 |
| commit | bced31c677a5bb6399aad890d8e09c741bfc82a6 (patch) | |
| tree | 246d75793c7611ca3489a212f378705144eb4522 /libqmenumodel/src/qmenumodel.h | |
| parent | a03e7e775a9751f87efb8fd7acf226b5eb25f4e3 (diff) | |
| download | qmenumodel-bced31c677a5bb6399aad890d8e09c741bfc82a6.tar.gz qmenumodel-bced31c677a5bb6399aad890d8e09c741bfc82a6.tar.bz2 qmenumodel-bced31c677a5bb6399aad890d8e09c741bfc82a6.zip | |
Avoid including C headers (glib/gio) in public headers; use "forward declarations" instead.
Diffstat (limited to 'libqmenumodel/src/qmenumodel.h')
| -rw-r--r-- | libqmenumodel/src/qmenumodel.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libqmenumodel/src/qmenumodel.h b/libqmenumodel/src/qmenumodel.h index 7520480..af27802 100644 --- a/libqmenumodel/src/qmenumodel.h +++ b/libqmenumodel/src/qmenumodel.h @@ -22,9 +22,7 @@ #include <QAbstractListModel> -extern "C" { -#include <gio/gio.h> -} +typedef struct _GMenuModel GMenuModel; class QMenuModel : public QAbstractListModel { @@ -53,14 +51,14 @@ protected: private: GMenuModel *m_menuModel; - guint m_signalChangedId; + quint32 m_signalChangedId; QVariant getStringAttribute(const QModelIndex &index, const QString &attribute) const; QVariant getLink(const QModelIndex &index, const QString &linkName) const; QVariant getExtraProperties(const QModelIndex &index) const; QString parseExtraPropertyName(const QString &name) const; - static void onItemsChanged(GMenuModel *model, gint position, gint removed, gint added, gpointer data); + static void onItemsChanged(GMenuModel *model, int position, int removed, int added, void *data); }; #endif |