summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppworkingcopy.h
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-07-24 13:43:54 +0200
committerhjk <hjk@qt.io>2019-07-29 08:54:18 +0000
commite3b1106afae5de6cd54ce627a0b11be041624591 (patch)
treeaccfac6791013e79476650b6dd840d5cf243e12b /src/plugins/cpptools/cppworkingcopy.h
parent02e224fcfa7135f1e32adb02a14426ea153ae618 (diff)
downloadqt-creator-e3b1106afae5de6cd54ce627a0b11be041624591.tar.gz
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 <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppworkingcopy.h')
-rw-r--r--src/plugins/cpptools/cppworkingcopy.h6
1 files changed, 3 insertions, 3 deletions
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<QByteArray, unsigned> get(const Utils::FilePath &fileName) const
{ return _elements.value(fileName); }
- QHashIterator<Utils::FilePath, QPair<QByteArray, unsigned> > iterator() const
- { return QHashIterator<Utils::FilePath, QPair<QByteArray, unsigned> >(_elements); }
+ using Table = QHash<Utils::FilePath, QPair<QByteArray, unsigned> >;
+ const Table &elements() const
+ { return _elements; }
int size() const
{ return _elements.size(); }
private:
- using Table = QHash<Utils::FilePath, QPair<QByteArray, unsigned> >;
Table _elements;
};