From e3b1106afae5de6cd54ce627a0b11be041624591 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 24 Jul 2019 13:43:54 +0200 Subject: Compile fix with recent Qt dev The reasoning in 1b4766e26c6b did not take into account that the scope of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with f70905448f6 in Qt base. Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d Reviewed-by: Eike Ziller --- src/plugins/cpptools/cppworkingcopy.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/cpptools/cppworkingcopy.h') diff --git a/src/plugins/cpptools/cppworkingcopy.h b/src/plugins/cpptools/cppworkingcopy.h index 1477720553..1dd1c719d2 100644 --- a/src/plugins/cpptools/cppworkingcopy.h +++ b/src/plugins/cpptools/cppworkingcopy.h @@ -70,14 +70,14 @@ public: QPair get(const Utils::FilePath &fileName) const { return _elements.value(fileName); } - QHashIterator > iterator() const - { return QHashIterator >(_elements); } + using Table = QHash >; + const Table &elements() const + { return _elements; } int size() const { return _elements.size(); } private: - using Table = QHash >; Table _elements; }; -- cgit v1.2.1