1 files changed, 68 insertions, 64 deletions

diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
index d47ba8bd7..19ddd5f37 100644
--- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
@@ -28,6 +28,7 @@
 
 #include "qtdocgenerator.h"
 #include <abstractmetalang.h>
+#include <messages.h>
 #include <reporthandler.h>
 #include <typesystem.h>
 #include <qtdocparser.h>
@@ -202,34 +203,6 @@ private:
     const QString &m_label;
 };
 
-static QString msgTagWarning(const QXmlStreamReader &reader, const QString &context,
-                             const QString &tag, const QString &message)
-{
-    QString result;
-    QTextStream str(&result);
-    str << "While handling <";
-    const QStringRef currentTag = reader.name();
-    if (currentTag.isEmpty())
-        str << tag;
-    else
-        str << currentTag;
-    str << "> in " << context << ", line "<< reader.lineNumber()
-        << ": " << message;
-    return result;
-}
-
-static QString msgFallbackWarning(const QXmlStreamReader &reader, const QString &context,
-                                  const QString &tag, const QString &location, const QString &identifier,
-                                  const QString &fallback)
-{
-    QString message = QLatin1String("Falling back to \"")
-        + QDir::toNativeSeparators(fallback) + QLatin1String("\" for \"") + location
-        + QLatin1Char('"');
-    if (!identifier.isEmpty())
-        message += QLatin1String(" [") + identifier + QLatin1Char(']');
-    return msgTagWarning(reader, context, tag, message);
-}
-
 struct QtXmlToSphinx::LinkContext
 {
     enum Type
@@ -305,7 +278,7 @@ QTextStream &operator<<(QTextStream &str, const QtXmlToSphinx::LinkContext &link
 }
 
 QtXmlToSphinx::QtXmlToSphinx(QtDocGenerator* generator, const QString& doc, const QString& context)
-        : m_context(context), m_generator(generator), m_insideBold(false), m_insideItalic(false)
+        : m_tableHasHeader(false), m_context(context), m_generator(generator), m_insideBold(false), m_insideItalic(false)
 {
     m_handlerMap.insert(QLatin1String("heading"), &QtXmlToSphinx::handleHeadingTag);
     m_handlerMap.insert(QLatin1String("brief"), &QtXmlToSphinx::handleParaTag);
@@ -1302,7 +1275,7 @@ bool QtXmlToSphinx::convertToRst(QtDocGenerator *generator,
     QFile sourceFile(sourceFileName);
     if (!sourceFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
         if (errorMessage)
-            *errorMessage = FileOut::msgCannotOpenForReading(sourceFile);
+            *errorMessage = msgCannotOpenForReading(sourceFile);
         return false;
     }
     const QString doc = QString::fromUtf8(sourceFile.readAll());
@@ -1325,7 +1298,13 @@ void QtXmlToSphinx::Table::normalize()
 
     //QDoc3 generates tables with wrong number of columns. We have to
     //check and if necessary, merge the last columns.
-    int maxCols = self.at(0).count();
+    int maxCols = -1;
+    for (const auto &row : qAsConst(self)) {
+        if (row.count() > maxCols)
+            maxCols = row.count();
+    }
+    if (maxCols <= 0)
+        return;
     // add col spans
     for (row = 0; row < count(); ++row) {
         for (col = 0; col < at(row).count(); ++col) {
@@ -1513,11 +1492,10 @@ QString QtDocGenerator::fileNameForContext(GeneratorContext &context) const
     const AbstractMetaClass *metaClass = context.metaClass();
     if (!context.forSmartPointer()) {
         return getClassTargetFullName(metaClass, false) + fileNameSuffix();
-    } else {
-        const AbstractMetaType *smartPointerType = context.preciseType();
-        QString fileNameBase = getFileNameBaseForSmartPointer(smartPointerType, metaClass);
-        return fileNameBase + fileNameSuffix();
     }
+    const AbstractMetaType *smartPointerType = context.preciseType();
+    QString fileNameBase = getFileNameBaseForSmartPointer(smartPointerType, metaClass);
+    return fileNameBase + fileNameSuffix();
 }
 
 void QtDocGenerator::writeFormattedText(QTextStream &s, const Documentation &doc,
@@ -1534,7 +1512,7 @@ void QtDocGenerator::writeFormattedText(QTextStream &s, const Documentation &doc
     } else {
         const QString &value = doc.value();
         const QVector<QStringRef> lines = value.splitRef(QLatin1Char('\n'));
-        int typesystemIndentation = std::numeric_limits<int>().max();
+        int typesystemIndentation = std::numeric_limits<int>::max();
         // check how many spaces must be removed from the beginning of each line
         for (const QStringRef &line : lines) {
             const auto it = std::find_if(line.cbegin(), line.cend(),
@@ -1542,7 +1520,7 @@ void QtDocGenerator::writeFormattedText(QTextStream &s, const Documentation &doc
             if (it != line.cend())
                 typesystemIndentation = qMin(typesystemIndentation, int(it - line.cbegin()));
         }
-        if (typesystemIndentation == std::numeric_limits<int>().max())
+        if (typesystemIndentation == std::numeric_limits<int>::max())
             typesystemIndentation = 0;
         for (const QStringRef &line : lines) {
             s << INDENT
@@ -1677,7 +1655,7 @@ void QtDocGenerator::writeFunctionList(QTextStream& s, const AbstractMetaClass*
             functionList << str;
     }
 
-    if ((functionList.size() > 0) || (staticFunctionList.size() > 0)) {
+    if (!functionList.isEmpty() || !staticFunctionList.isEmpty()) {
         QtXmlToSphinx::Table functionTable;
 
         s << endl
@@ -1694,7 +1672,7 @@ void QtDocGenerator::writeFunctionList(QTextStream& s, const AbstractMetaClass*
 
 void QtDocGenerator::writeFunctionBlock(QTextStream& s, const QString& title, QStringList& functions)
 {
-    if (functions.size() > 0) {
+    if (!functions.isEmpty()) {
         s << title << endl
           << QString(title.size(), QLatin1Char('^')) << endl;
 
@@ -1777,7 +1755,8 @@ void QtDocGenerator::writeConstructors(QTextStream& s, const AbstractMetaClass*
         writeFormattedText(s, func->documentation(), cppClass);
 }
 
-QString QtDocGenerator::parseArgDocStyle(const AbstractMetaClass* cppClass, const AbstractMetaFunction* func)
+QString QtDocGenerator::parseArgDocStyle(const AbstractMetaClass* /* cppClass */,
+                                         const AbstractMetaFunction* func)
 {
     QString ret;
     int optArgs = 0;
@@ -1859,8 +1838,7 @@ void QtDocGenerator::writeDocSnips(QTextStream &s,
                 if (row.trimmed().size() == 0) {
                     if (currenRow == 0)
                         continue;
-                    else
-                        s << endl;
+                    s << endl;
                 }
 
                 if (currenRow == 0) {
@@ -2124,7 +2102,7 @@ void QtDocGenerator::writeModuleDocumentation()
 
         s << ".. module:: " << it.key() << endl << endl;
 
-        QString title = it.key();
+        const QString &title = it.key();
         s << title << endl;
         s << Pad('*', title.length()) << endl << endl;
 
@@ -2201,7 +2179,7 @@ void QtDocGenerator::writeAdditionalDocumentation()
     QFile additionalDocumentationFile(m_additionalDocumentationList);
     if (!additionalDocumentationFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
         qCWarning(lcShiboken, "%s",
-                  qPrintable(FileOut::msgCannotOpenForReading(additionalDocumentationFile)));
+                  qPrintable(msgCannotOpenForReading(additionalDocumentationFile)));
         return;
     }
 
@@ -2261,32 +2239,28 @@ void QtDocGenerator::writeAdditionalDocumentation()
            successCount, count);
 }
 
-bool QtDocGenerator::doSetup(const QMap<QString, QString>& args)
-{
-    m_libSourceDir = args.value(QLatin1String("library-source-dir"));
-    m_docDataDir = args.value(QLatin1String("documentation-data-dir"));
 #ifdef __WIN32__
 #   define PATH_SEP ';'
 #else
 #   define PATH_SEP ':'
 #endif
-    m_codeSnippetDirs = args.value(QLatin1String("documentation-code-snippets-dir"), m_libSourceDir).split(QLatin1Char(PATH_SEP));
-    m_extraSectionDir = args.value(QLatin1String("documentation-extra-sections-dir"));
 
-    m_docParser = args.value(QLatin1String("doc-parser")) == QLatin1String("doxygen")
-        ? static_cast<DocParser*>(new DoxygenParser)
-        : static_cast<DocParser*>(new QtDocParser);
-    qCDebug(lcShiboken).noquote().nospace() << "doc-parser: " << args.value(QLatin1String("doc-parser"));
+bool QtDocGenerator::doSetup()
+{
+    if (m_codeSnippetDirs.isEmpty())
+        m_codeSnippetDirs = m_libSourceDir.split(QLatin1Char(PATH_SEP));
+
+    if (!m_docParser)
+        m_docParser = new QtDocParser;
 
     if (m_libSourceDir.isEmpty() || m_docDataDir.isEmpty()) {
         qCWarning(lcShiboken) << "Documentation data dir and/or Qt source dir not informed, "
                                  "documentation will not be extracted from Qt sources.";
         return false;
-    } else {
-        m_docParser->setDocumentationDataDirectory(m_docDataDir);
-        m_docParser->setLibrarySourceDirectory(m_libSourceDir);
     }
-    m_additionalDocumentationList = args.value(additionalDocumentationOption());
+
+    m_docParser->setDocumentationDataDirectory(m_docDataDir);
+    m_docParser->setLibrarySourceDirectory(m_libSourceDir);
     return true;
 }
 
@@ -2294,19 +2268,49 @@ bool QtDocGenerator::doSetup(const QMap<QString, QString>& args)
 Generator::OptionDescriptions QtDocGenerator::options() const
 {
     return OptionDescriptions()
-        << qMakePair(QLatin1String("doc-parser"),
+        << qMakePair(QLatin1String("doc-parser=<parser>"),
                      QLatin1String("The documentation parser used to interpret the documentation\n"
                                    "input files (qdoc|doxygen)"))
-        << qMakePair(QLatin1String("documentation-code-snippets-dir"),
+        << qMakePair(QLatin1String("documentation-code-snippets-dir=<dir>"),
                      QLatin1String("Directory used to search code snippets used by the documentation"))
-        << qMakePair(QLatin1String("documentation-data-dir"),
+        << qMakePair(QLatin1String("documentation-data-dir=<dir>"),
                      QLatin1String("Directory with XML files generated by documentation tool"))
-        << qMakePair(QLatin1String("documentation-extra-sections-dir"),
+        << qMakePair(QLatin1String("documentation-extra-sections-dir=<dir>"),
                      QLatin1String("Directory used to search for extra documentation sections"))
-        << qMakePair(QLatin1String("library-source-dir"),
+        << qMakePair(QLatin1String("library-source-dir=<dir>"),
                      QLatin1String("Directory where library source code is located"))
-        << qMakePair(additionalDocumentationOption(),
+        << qMakePair(additionalDocumentationOption() + QLatin1String("=<file>"),
                      QLatin1String("List of additional XML files to be converted to .rst files\n"
                                    "(for example, tutorials)."));
 }
 
+bool QtDocGenerator::handleOption(const QString &key, const QString &value)
+{
+    if (key == QLatin1String("library-source-dir")) {
+        m_libSourceDir = value;
+        return true;
+    }
+    if (key == QLatin1String("documentation-data-dir")) {
+        m_docDataDir = value;
+        return true;
+    }
+    if (key == QLatin1String("documentation-code-snippets-dir")) {
+        m_codeSnippetDirs = value.split(QLatin1Char(PATH_SEP));
+        return true;
+    }
+    if (key == QLatin1String("documentation-extra-sections-dir")) {
+        m_extraSectionDir = value;
+        return true;
+    }
+    if (key == QLatin1String("doc-parser")) {
+        qCDebug(lcShiboken).noquote().nospace() << "doc-parser: " << value;
+        if (value == QLatin1String("doxygen"))
+            m_docParser = new DoxygenParser;
+        return true;
+    }
+    if (key == additionalDocumentationOption()) {
+        m_additionalDocumentationList = value;
+        return true;
+    }
+    return false;
+}