shiboken: Fix loops in QtDocGenerator::writeConstructors()

Remove removed constructors and move constructors first
before writing out documentation.

Task-number: PYSIDE-363
Change-Id: I8dbe3e96ccc8f293253eb52e00c384d3ff458dcc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 7 insertions, 6 deletions

diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
index 08c342cfa..e5c8c419e 100644
--- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
@@ -1376,15 +1376,16 @@ void QtDocGenerator::writeConstructors(QTextStream& s, const AbstractMetaClass*
     static const QString sectionTitle = QLatin1String(".. class:: ");
     static const QString sectionTitleSpace = QString(sectionTitle.size(), QLatin1Char(' '));
 
-    const AbstractMetaFunctionList lst = cppClass->queryFunctions(AbstractMetaClass::Constructors | AbstractMetaClass::Visible);
+    AbstractMetaFunctionList lst = cppClass->queryFunctions(AbstractMetaClass::Constructors | AbstractMetaClass::Visible);
+    for (int i = lst.size() - 1; i >= 0; --i) {
+        if (lst.at(i)->isModifiedRemoved() || lst.at(i)->functionType() == AbstractMetaFunction::MoveConstructorFunction)
+            lst.removeAt(i);
+    }
 
     bool first = true;
     QHash<QString, AbstractMetaArgument*> arg_map;
 
-    for (AbstractMetaFunction *func : lst) {
-        if (func->isModifiedRemoved())
-            continue;
-
+    for (AbstractMetaFunction *func : qAsConst(lst)) {
         if (first) {
             first = false;
             s << sectionTitle;
@@ -1409,7 +1410,7 @@ void QtDocGenerator::writeConstructors(QTextStream& s, const AbstractMetaClass*
 
     s << endl;
 
-    for (AbstractMetaFunction *func : lst)
+    for (AbstractMetaFunction *func : qAsConst(lst))
         writeFormattedText(s, func->documentation(), cppClass);
 }