1 files changed, 14 insertions, 6 deletions
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
index a5024c4a3..667e27344 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
@@ -47,9 +47,9 @@ private:
 };
 
 template <class T>
-static QSharedPointer<T> findModelItem(const QList<QSharedPointer<T> > &list, const QString &name)
+static QSharedPointer<T> findModelItem(const QVector<QSharedPointer<T> > &list, const QString &name)
 {
-    typedef typename QList<QSharedPointer<T> >::const_iterator It;
+    typedef typename QVector<QSharedPointer<T> >::const_iterator It;
     const It it = std::find_if(list.begin(), list.end(), ModelItemNamePredicate<T>(name));
     return it != list.end() ? *it : QSharedPointer<T>();
 }
@@ -221,7 +221,7 @@ QString TypeInfo::toString() const
         tmp += QLatin1Char(')');
     }
 
-    foreach(QString elt, arrayElements()) {
+    for (const QString &elt : m_arrayElements) {
         tmp += QLatin1Char('[');
         tmp += elt;
         tmp += QLatin1Char(']');
@@ -230,7 +230,7 @@ QString TypeInfo::toString() const
     return tmp;
 }
 
-bool TypeInfo::operator==(const TypeInfo &other)
+bool TypeInfo::operator==(const TypeInfo &other) const
 {
     if (arrayElements().count() != other.arrayElements().count())
         return false;
@@ -588,7 +588,7 @@ void _ClassModelItem::formatDebug(QDebug &d) const
 // ---------------------------------------------------------------------------
 FunctionModelItem _ScopeModelItem::declaredFunction(FunctionModelItem item)
 {
-    foreach (const FunctionModelItem &fun, m_functions) {
+    for (const FunctionModelItem &fun : qAsConst(m_functions)) {
         if (fun->name() == item->name() && fun->isSimilar(item))
             return fun;
 
@@ -730,7 +730,7 @@ EnumModelItem _ScopeModelItem::findEnum(const QString &name) const
 FunctionList _ScopeModelItem::findFunctions(const QString &name) const
 {
     FunctionList result;
-    foreach (const FunctionModelItem &func, m_functions) {
+    for (const FunctionModelItem &func : m_functions) {
         if (func->name() == name)
             result.append(func);
     }
@@ -742,6 +742,14 @@ _NamespaceModelItem::~_NamespaceModelItem()
 {
 }
 
+QSet<NamespaceModelItem> _NamespaceModelItem::uniqueNamespaces() const
+{
+    QSet<NamespaceModelItem> result;
+    for (const NamespaceModelItem &n : m_namespaces)
+        result.insert(n);
+    return result;
+}
+
 void _NamespaceModelItem::addNamespace(NamespaceModelItem item)
 {
     m_namespaces.append(item);