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/jsruntime | |
| 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/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 4 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4regexp_p.h | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4value_p.h | 4 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4vtable_p.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index 6db03181f9..016b3e2eea 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -92,7 +92,7 @@ inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {} #define V4_MANAGED(DataClass, superClass) \ private: \ - DataClass() Q_DECL_EQ_DELETE; \ + DataClass() = delete; \ Q_DISABLE_COPY(DataClass) \ V4_MANAGED_ITSELF(DataClass, superClass) \ Q_STATIC_ASSERT(std::is_trivial< QV4::Heap::DataClass >::value); @@ -119,7 +119,7 @@ struct Q_QML_PRIVATE_EXPORT Managed : Value, VTableBase }; private: void *operator new(size_t); - Managed() Q_DECL_EQ_DELETE; + Managed() = delete; Q_DISABLE_COPY(Managed) public: diff --git a/src/qml/jsruntime/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h index ff6cc061ee..122db47008 100644 --- a/src/qml/jsruntime/qv4regexp_p.h +++ b/src/qml/jsruntime/qv4regexp_p.h @@ -164,7 +164,7 @@ inline RegExpCacheKey::RegExpCacheKey(const RegExp::Data *re) , flags(re->flags) {} -inline size_t qHash(const RegExpCacheKey& key, size_t seed = 0) Q_DECL_NOTHROW +inline size_t qHash(const RegExpCacheKey& key, size_t seed = 0) noexcept { return qHash(key.pattern, seed); } class RegExpCache : public QHash<RegExpCacheKey, WeakValue> diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index 42e97b1d36..530c8eaf27 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -480,7 +480,7 @@ inline double Value::toInteger() const template <size_t o> struct HeapValue : Value { - static Q_CONSTEXPR size_t offset = o; + static constexpr size_t offset = o; HeapBasePtr base() { HeapBasePtr base = reinterpret_cast<HeapBasePtr>(this) - (offset/sizeof(Heap::Base)); Q_ASSERT(base->inUse()); @@ -497,7 +497,7 @@ struct HeapValue : Value { template <size_t o> struct ValueArray { - static Q_CONSTEXPR size_t offset = o; + static constexpr size_t offset = o; uint size; uint alloc; Value values[1]; diff --git a/src/qml/jsruntime/qv4vtable_p.h b/src/qml/jsruntime/qv4vtable_p.h index 9dda104cd1..588205f046 100644 --- a/src/qml/jsruntime/qv4vtable_p.h +++ b/src/qml/jsruntime/qv4vtable_p.h @@ -202,7 +202,7 @@ const QV4::VTable classname::static_vtbl = DEFINE_MANAGED_VTABLE_INT(classname, #define V4_OBJECT2(DataClass, superClass) \ private: \ - DataClass() Q_DECL_EQ_DELETE; \ + DataClass() = delete; \ Q_DISABLE_COPY(DataClass) \ public: \ Q_MANAGED_CHECK \ |