Skip to content

Commit

Permalink
Fix doxygen/sip binding test failures
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson authored and m-kuhn committed Mar 9, 2016
1 parent ee46ece commit 5bb1723
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
8 changes: 5 additions & 3 deletions python/gui/qgsmaplayermodel.sip
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ class QgsMapLayerModel : QAbstractItemModel
%End

public:
enum

//! Item data roles
enum ItemDataRole
{
LayerIdRole,
LayerRole
LayerIdRole, /*!< Stores the map layer ID */
LayerRole, /*!< Stores pointer to the map layer itself */
};

/**
Expand Down
12 changes: 7 additions & 5 deletions src/gui/qgsmaplayermodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ class GUI_EXPORT QgsMapLayerModel : public QAbstractItemModel
{
Q_OBJECT
public:
enum

//! Item data roles
enum ItemDataRole
{
LayerIdRole = Qt::UserRole + 1,
LayerRole
LayerIdRole = Qt::UserRole + 1, /*!< Stores the map layer ID */
LayerRole, /*!< Stores pointer to the map layer itself */
};

/**
Expand Down Expand Up @@ -86,7 +88,7 @@ class GUI_EXPORT QgsMapLayerModel : public QAbstractItemModel
int rowCount( const QModelIndex &parent ) const override;
int columnCount( const QModelIndex &parent ) const override;
QVariant data( const QModelIndex &index, int role ) const override;
///@cond PRIVATE

#if QT_VERSION >= 0x050000
/**
* Returns strings for all roles supported by this model.
Expand All @@ -95,7 +97,7 @@ class GUI_EXPORT QgsMapLayerModel : public QAbstractItemModel
*/
QHash<int, QByteArray> roleNames() const override;
#endif
///@endcond

bool setData( const QModelIndex &index, const QVariant &value, int role ) override;
Qt::ItemFlags flags( const QModelIndex &index ) const override;
};
Expand Down

0 comments on commit 5bb1723

Please sign in to comment.