Don't assign iterator to const_iterator

It should also be possible to use QT_STRICT_ITERATORS in Qt's own code base

Change-Id: I0914db480d4d2b06e71e3a2588163efdd3ff6d27
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

5 files changed, 16 insertions, 16 deletions

diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 8d84019ab5..b340883c12 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -2199,7 +2199,7 @@ void HtmlGenerator::generateRequisites(InnerNode *inner, CodeMarker *marker)
         out() << "<div class=\"table\"><table class=\"alignedsummary\">\n";
 
         QStringList::ConstIterator i;
-        for (i = requisiteorder.begin(); i != requisiteorder.constEnd(); ++i) {
+        for (i = requisiteorder.constBegin(); i != requisiteorder.constEnd(); ++i) {
 
             if (requisites.contains(*i)) {
                 out() << "<tr>"
@@ -2319,7 +2319,7 @@ void HtmlGenerator::generateQmlRequisites(QmlTypeNode *qcn, CodeMarker *marker)
         out() << "<div class=\"table\"><table class=\"alignedsummary\">\n";
 
         QStringList::ConstIterator i;
-        for (i = requisiteorder.begin(); i != requisiteorder.constEnd(); ++i) {
+        for (i = requisiteorder.constBegin(); i != requisiteorder.constEnd(); ++i) {
 
             if (requisites.contains(*i)) {
                 out() << "<tr>"
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index 230ce50df8..37bc0c5fef 100644
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -2763,8 +2763,8 @@ bool CollectionNode::hasNamespaces() const
 bool CollectionNode::hasClasses() const
 {
     if (!members_.isEmpty()) {
-        NodeList::const_iterator i = members_.begin();
-        while (i != members_.end()) {
+        NodeList::const_iterator i = members_.cbegin();
+        while (i != members_.cend()) {
             if ((*i)->isClass())
                 return true;
             ++i;
@@ -2780,8 +2780,8 @@ bool CollectionNode::hasClasses() const
 void CollectionNode::getMemberNamespaces(NodeMap& out)
 {
     out.clear();
-    NodeList::const_iterator i = members_.begin();
-    while (i != members_.end()) {
+    NodeList::const_iterator i = members_.cbegin();
+    while (i != members_.cend()) {
         if ((*i)->isNamespace())
             out.insert((*i)->name(),(*i));
         ++i;
@@ -2795,8 +2795,8 @@ void CollectionNode::getMemberNamespaces(NodeMap& out)
 void CollectionNode::getMemberClasses(NodeMap& out)
 {
     out.clear();
-    NodeList::const_iterator i = members_.begin();
-    while (i != members_.end()) {
+    NodeList::const_iterator i = members_.cbegin();
+    while (i != members_.cend()) {
         if ((*i)->isClass())
             out.insert((*i)->name(),(*i));
         ++i;
diff --git a/src/tools/qdoc/puredocparser.cpp b/src/tools/qdoc/puredocparser.cpp
index 7029431460..e47460efb2 100644
--- a/src/tools/qdoc/puredocparser.cpp
+++ b/src/tools/qdoc/puredocparser.cpp
@@ -188,8 +188,8 @@ bool PureDocParser::processQdocComments()
                     topics.insert(i+1,"and");
                     doc.location().warning(tr("Multiple topic commands found in comment: %1").arg(topics));
                 }
-                ArgList::ConstIterator a = args.begin();
-                while (a != args.end()) {
+                ArgList::ConstIterator a = args.cbegin();
+                while (a != args.cend()) {
                     Doc nodeDoc = doc;
                     Node* node = processTopicCommand(nodeDoc,topic,*a);
                     if (node != 0) {
diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp
index f1afb92eff..bf84fa8335 100644
--- a/src/tools/qdoc/qdocdatabase.cpp
+++ b/src/tools/qdoc/qdocdatabase.cpp
@@ -1549,8 +1549,8 @@ void QDocDatabase::mergeCollections(Node::Genus genus, CNMap& cnm, const Node* r
     foreach (Tree* t, searchOrder()) {
         CNMap* m = t->getCollectionMap(genus);
         if (m && !m->isEmpty()) {
-            CNMap::const_iterator i = m->begin();
-            while (i != m->end()) {
+            CNMap::const_iterator i = m->cbegin();
+            while (i != m->cend()) {
                 if (!i.value()->isInternal())
                     cnmm.insert(i.key(), i.value());
                 ++i;
diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp
index 420396e51c..1b0aba1a0c 100644
--- a/src/tools/qdoc/tree.cpp
+++ b/src/tools/qdoc/tree.cpp
@@ -1222,8 +1222,8 @@ CollectionNode* Tree::getCollection(const QString& name, Node::Genus genus)
 {
     CNMap* m = getCollectionMap(genus);
     if (m) {
-        CNMap::const_iterator i = m->find(name);
-        if (i != m->end())
+        CNMap::const_iterator i = m->constFind(name);
+        if (i != m->cend())
             return i.value();
     }
     return 0;
@@ -1249,8 +1249,8 @@ CollectionNode* Tree::findCollection(const QString& name, Node::Genus genus)
     CNMap* m = getCollectionMap(genus);
     if (!m) // error
         return 0;
-    CNMap::const_iterator i = m->find(name);
-    if (i != m->end())
+    CNMap::const_iterator i = m->constFind(name);
+    if (i != m->cend())
         return i.value();
     Node::Type t = Node::NoType;
     switch (genus) {