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.cpp | |
| 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.cpp')
| -rw-r--r-- | libqmenumodel/src/qmenumodel.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
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); |