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/plugins | |
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/plugins')
4 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp index 7a5940cdd3..f47b9e09ac 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp @@ -52,7 +52,7 @@ QV4Debugger::BreakPoint::BreakPoint(const QString &fileName, int line) : fileName(fileName), lineNumber(line) {} -inline size_t qHash(const QV4Debugger::BreakPoint &b, size_t seed = 0) Q_DECL_NOTHROW +inline size_t qHash(const QV4Debugger::BreakPoint &b, size_t seed = 0) noexcept { return qHash(b.fileName, seed) ^ b.lineNumber; } diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp index 8791a6119f..473546aba5 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp @@ -83,7 +83,7 @@ public: int hitCount; }; -inline size_t qHash(const BreakPoint &b, size_t seed = 0) Q_DECL_NOTHROW +inline size_t qHash(const BreakPoint &b, size_t seed = 0) noexcept { return qHash(b.fileName, seed) ^ b.lineNumber; } diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp index 77fe69821c..f9be18a39e 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp @@ -74,7 +74,7 @@ QQmlPreviewBlacklist::Node::Node(const QQmlPreviewBlacklist::Node &other) : m_next.insert(it.key(), new Node(**it)); } -QQmlPreviewBlacklist::Node::Node(QQmlPreviewBlacklist::Node &&other) Q_DECL_NOEXCEPT +QQmlPreviewBlacklist::Node::Node(QQmlPreviewBlacklist::Node &&other) noexcept { m_mine.swap(other.m_mine); m_next.swap(other.m_next); @@ -99,7 +99,7 @@ QQmlPreviewBlacklist::Node &QQmlPreviewBlacklist::Node::operator=( } QQmlPreviewBlacklist::Node &QQmlPreviewBlacklist::Node::operator=( - QQmlPreviewBlacklist::Node &&other) Q_DECL_NOEXCEPT + QQmlPreviewBlacklist::Node &&other) noexcept { if (&other != this) { m_mine.swap(other.m_mine); diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.h index 2f743ca7a6..9d99517261 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.h @@ -71,12 +71,12 @@ private: public: Node(); Node(const Node &other); - Node(Node &&other) Q_DECL_NOEXCEPT; + Node(Node &&other) noexcept; ~Node(); Node &operator=(const Node &other); - Node &operator=(Node &&other) Q_DECL_NOEXCEPT; + Node &operator=(Node &&other) noexcept; void split(QString::iterator it, QString::iterator end); void insert(const QString &path, int offset); |