summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qmap.h
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2020-10-11 20:57:26 +0200
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2020-10-14 20:58:51 +0200
commita095a999a3904a53e78857759a79a0e8c7d8a474 (patch)
treecffb4b7a44eff0355d2852c9d9db41aa3a36e988 /src/corelib/tools/qmap.h
parenta8dc2a5b6dda85d63dd8f9f7570069df008941c6 (diff)
Long live Q_IMPLICIT!
C++20 will give us explicit(bool). While we can't use it just yet in its full potential, we can introduce a macro to start marking our implicit conversions (aka `explicit(false)`), removing the need for /* implicit */-like comments. Port a few usages to it. Change-Id: I336d5e4c8d51d8329627900d1059e59062c5cafd Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools/qmap.h')
-rw-r--r--src/corelib/tools/qmap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index 24d82fa22d..f7915b149c 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -492,7 +492,7 @@ public:
typedef const T &reference;
const_iterator() = default;
- /* implicit */ const_iterator(const iterator &o) { i = o.i; }
+ Q_IMPLICIT const_iterator(const iterator &o) { i = o.i; }
const Key &key() const { return i->first; }
const T &value() const { return i->second; }
@@ -1116,7 +1116,7 @@ public:
typedef const T &reference;
const_iterator() = default;
- /* implicit */ const_iterator(const iterator &o) { i = o.i; }
+ Q_IMPLICIT const_iterator(const iterator &o) { i = o.i; }
const Key &key() const { return i->first; }
const T &value() const { return i->second; }