Clang: Do not derive deprecated std::iterator

Reported by MSVC.

Change-Id: If89d1c41c7b52e48d01d0d4251c85de4785c73ec
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/tools/clangbackend/source/diagnosticsetiterator.h

@@ -37,9 +37,15 @@ using uint = unsigned int;
 
 class DiagnosticSet;
 
-class DiagnosticSetIterator : public std::iterator<std::random_access_iterator_tag, Diagnostic, uint>
+class DiagnosticSetIterator
 {
 public:
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = Diagnostic;
+    using difference_type = uint;
+    using pointer = Diagnostic *;
+    using reference = Diagnostic &;
+
     DiagnosticSetIterator(CXTranslationUnit translationUnit,
                           CXDiagnosticSet cxDiagnosticSet,
                           uint index)

src/tools/clangbackend/source/tokenprocessoriterator.h

@@ -38,9 +38,15 @@ class DiagnosticSet;
 class Diagnostic;
 
 template<class T>
-class TokenProcessorIterator : public std::iterator<std::forward_iterator_tag, TokenInfo, uint>
+class TokenProcessorIterator
 {
 public:
+    using iterator_category = std::forward_iterator_tag;
+    using value_type = TokenInfo;
+    using difference_type = int;
+    using pointer = TokenInfo *;
+    using reference = TokenInfo &;
+
     TokenProcessorIterator(std::vector<Cursor>::const_iterator cursorIterator,
                            std::vector<Token>::const_iterator tokenIterator,
                            std::vector<CXSourceRange> &currentOutputArgumentRanges)