diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-30 16:00:24 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-31 11:55:27 +0100 |
commit | 963cbbaa420b12e810d23820b78f73c3eaaa15a8 (patch) | |
tree | b9f9fd1284560b5dfaf9b3cf650c775fa1c8083a /src/qml/types | |
parent | 3019b82b1b9813b7d23ebc74a40e437cecd60a60 (diff) |
Replace old Q_DECL statements with modern C++
Since we depend on C++17 now, all of these can go.
Change-Id: I0484fd4bb99e4367ec211c29146c316453729959
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/qml/types')
-rw-r--r-- | src/qml/types/qqmlmodelindexvaluetype_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/types/qqmlmodelindexvaluetype_p.h b/src/qml/types/qqmlmodelindexvaluetype_p.h index 59c33bf5af..dae04f6581 100644 --- a/src/qml/types/qqmlmodelindexvaluetype_p.h +++ b/src/qml/types/qqmlmodelindexvaluetype_p.h @@ -76,11 +76,11 @@ public: Q_INVOKABLE QString toString() const { return QLatin1String("QModelIndex") + propertiesString(v); } - inline int row() const Q_DECL_NOTHROW { return v.row(); } - inline int column() const Q_DECL_NOTHROW { return v.column(); } + inline int row() const noexcept { return v.row(); } + inline int column() const noexcept { return v.column(); } inline QModelIndex parent() const { return v.parent(); } - inline bool isValid() const Q_DECL_NOTHROW { return v.isValid(); } - inline QAbstractItemModel *model() const Q_DECL_NOTHROW + inline bool isValid() const noexcept { return v.isValid(); } + inline QAbstractItemModel *model() const noexcept { return const_cast<QAbstractItemModel *>(v.model()); } quint64 internalId() const { return v.internalId(); } |