diff options
| author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-10 09:41:24 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-10 09:41:24 +0200 |
| commit | 92ee9e3197ebbfef98ec044d9d45622a880136f3 (patch) | |
| tree | 671a091f4b650654cc29ea0ab12a1c676cdc2e57 /libqmenumodel/src/qmenumodel.h | |
| parent | bced31c677a5bb6399aad890d8e09c741bfc82a6 (diff) | |
| download | qmenumodel-92ee9e3197ebbfef98ec044d9d45622a880136f3.tar.gz qmenumodel-92ee9e3197ebbfef98ec044d9d45622a880136f3.tar.bz2 qmenumodel-92ee9e3197ebbfef98ec044d9d45622a880136f3.zip | |
Revert to using g* types, and forward-declare them.
This is more future-proof.
Diffstat (limited to 'libqmenumodel/src/qmenumodel.h')
| -rw-r--r-- | libqmenumodel/src/qmenumodel.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libqmenumodel/src/qmenumodel.h b/libqmenumodel/src/qmenumodel.h index af27802..b5c76c0 100644 --- a/libqmenumodel/src/qmenumodel.h +++ b/libqmenumodel/src/qmenumodel.h @@ -22,6 +22,9 @@ #include <QAbstractListModel> +typedef int gint; +typedef unsigned int guint; +typedef void* gpointer; typedef struct _GMenuModel GMenuModel; class QMenuModel : public QAbstractListModel @@ -51,14 +54,14 @@ protected: private: GMenuModel *m_menuModel; - quint32 m_signalChangedId; + guint 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, int position, int removed, int added, void *data); + static void onItemsChanged(GMenuModel *model, gint position, gint removed, gint added, gpointer data); }; #endif |