From 7d6c6bc082dc4c93078c5803f0b6cc536474b9b1 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sun, 10 Aug 2014 19:31:57 +0200 Subject: Use Q_ENUM and Q_FLAG for types in QtCore Change-Id: I33590a9c4c6d87c5bbba1d201e32c6bf1bd3e00b Reviewed-by: Lars Knoll Reviewed-by: Marc Mutz --- src/corelib/itemmodels/qabstractitemmodel.h | 2 +- src/corelib/itemmodels/qitemselectionmodel.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/itemmodels') diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index 7699611408..7d8c1ff113 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -155,7 +155,6 @@ template class QMap; class Q_CORE_EXPORT QAbstractItemModel : public QObject { Q_OBJECT - Q_ENUMS(LayoutChangeHint) friend class QPersistentModelIndexData; friend class QAbstractItemViewPrivate; @@ -239,6 +238,7 @@ public: VerticalSortHint, HorizontalSortHint }; + Q_ENUM(LayoutChangeHint) Q_SIGNALS: void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector()); diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index f02149b2b7..58b52901cb 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -148,7 +148,6 @@ class Q_CORE_EXPORT QItemSelectionModel : public QObject Q_PROPERTY(QModelIndex currentIndex READ currentIndex NOTIFY currentChanged STORED false DESIGNABLE false) Q_DECLARE_PRIVATE(QItemSelectionModel) - Q_FLAGS(SelectionFlags) public: @@ -167,6 +166,7 @@ public: }; Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag) + Q_FLAG(SelectionFlags) explicit QItemSelectionModel(QAbstractItemModel *model = 0); explicit QItemSelectionModel(QAbstractItemModel *model, QObject *parent); -- cgit v1.2.3