Replace Qt CONSTEXPR defines with constexpr

Both normal and relaxed constexpr are required by our new minimum of
C++17.

Change-Id: Ic028b88a2e7a6cb7d5925f3133b9d54859a81744
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>

3 files changed, 15 insertions, 15 deletions

diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h
index a7fb429cf3..7012b9fe92 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
@@ -57,11 +57,11 @@ class QModelIndex
 {
     friend class QAbstractItemModel;
 public:
-    Q_DECL_CONSTEXPR inline QModelIndex() noexcept : r(-1), c(-1), i(0), m(nullptr) {}
+    constexpr inline QModelIndex() noexcept : r(-1), c(-1), i(0), m(nullptr) {}
     // compiler-generated copy/move ctors/assignment operators are fine!
-    Q_DECL_CONSTEXPR inline int row() const noexcept { return r; }
-    Q_DECL_CONSTEXPR inline int column() const noexcept { return c; }
-    Q_DECL_CONSTEXPR inline quintptr internalId() const noexcept { return i; }
+    constexpr inline int row() const noexcept { return r; }
+    constexpr inline int column() const noexcept { return c; }
+    constexpr inline quintptr internalId() const noexcept { return i; }
     inline void *internalPointer() const noexcept { return reinterpret_cast<void*>(i); }
     inline const void *constInternalPointer() const noexcept { return reinterpret_cast<const void *>(i); }
     inline QModelIndex parent() const;
@@ -70,13 +70,13 @@ public:
     inline QModelIndex siblingAtRow(int row) const;
     inline QVariant data(int role = Qt::DisplayRole) const;
     inline Qt::ItemFlags flags() const;
-    Q_DECL_CONSTEXPR inline const QAbstractItemModel *model() const noexcept { return m; }
-    Q_DECL_CONSTEXPR inline bool isValid() const noexcept { return (r >= 0) && (c >= 0) && (m != nullptr); }
-    Q_DECL_CONSTEXPR inline bool operator==(const QModelIndex &other) const noexcept
+    constexpr inline const QAbstractItemModel *model() const noexcept { return m; }
+    constexpr inline bool isValid() const noexcept { return (r >= 0) && (c >= 0) && (m != nullptr); }
+    constexpr inline bool operator==(const QModelIndex &other) const noexcept
         { return (other.r == r) && (other.i == i) && (other.c == c) && (other.m == m); }
-    Q_DECL_CONSTEXPR inline bool operator!=(const QModelIndex &other) const noexcept
+    constexpr inline bool operator!=(const QModelIndex &other) const noexcept
         { return !(*this == other); }
-    Q_DECL_CONSTEXPR inline bool operator<(const QModelIndex &other) const noexcept
+    constexpr inline bool operator<(const QModelIndex &other) const noexcept
         {
             return  r <  other.r
                 || (r == other.r && (c <  other.c
@@ -86,7 +86,7 @@ public:
 private:
     inline QModelIndex(int arow, int acolumn, const void *ptr, const QAbstractItemModel *amodel) noexcept
         : r(arow), c(acolumn), i(reinterpret_cast<quintptr>(ptr)), m(amodel) {}
-    Q_DECL_CONSTEXPR inline QModelIndex(int arow, int acolumn, quintptr id, const QAbstractItemModel *amodel) noexcept
+    constexpr inline QModelIndex(int arow, int acolumn, quintptr id, const QAbstractItemModel *amodel) noexcept
         : r(arow), c(acolumn), i(id), m(amodel) {}
     int r, c;
     quintptr i;
diff --git a/src/corelib/itemmodels/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h
index 6b2f69cf30..a2892cea87 100644
--- a/src/corelib/itemmodels/qabstractitemmodel_p.h
+++ b/src/corelib/itemmodels/qabstractitemmodel_p.h
@@ -115,8 +115,8 @@ public:
     void invalidatePersistentIndex(const QModelIndex &index);
 
     struct Change {
-        Q_DECL_CONSTEXPR Change() : parent(), first(-1), last(-1), needsAdjust(false) {}
-        Q_DECL_CONSTEXPR Change(const QModelIndex &p, int f, int l) : parent(p), first(f), last(l), needsAdjust(false) {}
+        constexpr Change() : parent(), first(-1), last(-1), needsAdjust(false) {}
+        constexpr Change(const QModelIndex &p, int f, int l) : parent(p), first(f), last(l), needsAdjust(false) {}
 
         QModelIndex parent;
         int first, last;
@@ -136,7 +136,7 @@ public:
         // rowsMoved signal.
         bool needsAdjust;
 
-        Q_DECL_CONSTEXPR bool isValid() const { return first >= 0 && last >= 0; }
+        constexpr bool isValid() const { return first >= 0 && last >= 0; }
     };
     QStack<Change> changes;
 
diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp
index 5eed378f9e..b0708a1074 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.cpp
+++ b/src/corelib/itemmodels/qitemselectionmodel.cpp
@@ -1259,10 +1259,10 @@ struct IsNotValid {
     typedef bool result_type;
     struct is_transparent : std::true_type {};
     template <typename T>
-    Q_DECL_CONSTEXPR bool operator()(T &t) const noexcept(noexcept(t.isValid()))
+    constexpr bool operator()(T &t) const noexcept(noexcept(t.isValid()))
     { return !t.isValid(); }
     template <typename T>
-    Q_DECL_CONSTEXPR bool operator()(T *t) const noexcept(noexcept(t->isValid()))
+    constexpr bool operator()(T *t) const noexcept(noexcept(t->isValid()))
     { return !t->isValid(); }
 };
 }