1 files changed, 10 insertions, 69 deletions

diff --git a/sources/shiboken2/ApiExtractor/docparser.cpp b/sources/shiboken2/ApiExtractor/docparser.cpp
index 9305332ba..99921e7d3 100644
--- a/sources/shiboken2/ApiExtractor/docparser.cpp
+++ b/sources/shiboken2/ApiExtractor/docparser.cpp
@@ -27,6 +27,7 @@
 ****************************************************************************/
 #include "docparser.h"
 #include "abstractmetalang.h"
+#include "messages.h"
 #include "reporthandler.h"
 #include "typesystem.h"
 #include <QtCore/QDebug>
@@ -50,9 +51,7 @@ DocParser::DocParser()
 #endif
 }
 
-DocParser::~DocParser()
-{
-}
+DocParser::~DocParser() = default;
 
 QString DocParser::getDocumentation(QXmlQuery& xquery, const QString& query,
                                     const DocModificationList& mods) const
@@ -109,58 +108,21 @@ AbstractMetaFunctionList DocParser::documentableFunctions(const AbstractMetaClas
     return result;
 }
 
-QString DocParser::msgCannotFindDocumentation(const QString &fileName,
-                                          const char *what, const QString &name,
-                                          const QString &query)
-{
-    QString result;
-    QTextStream(&result) << "Cannot find documentation for " << what
-        << ' ' << name << " in:\n    " << QDir::toNativeSeparators(fileName)
-        << "\n  using query:\n    " << query;
-    return result;
-}
-
-QString DocParser::msgCannotFindDocumentation(const QString &fileName,
-                                              const AbstractMetaClass *metaClass,
-                                              const AbstractMetaFunction *function,
-                                              const QString &query)
-{
-    const QString name = metaClass->name() + QLatin1String("::")
-        + function->minimalSignature();
-    return msgCannotFindDocumentation(fileName, "function", name, query);
-}
-
-QString DocParser::msgCannotFindDocumentation(const QString &fileName,
-                                              const AbstractMetaClass *metaClass,
-                                              const AbstractMetaEnum *e,
-                                              const QString &query)
-{
-    return msgCannotFindDocumentation(fileName, "enum",
-                                      metaClass->name() + QLatin1String("::") + e->name(),
-                                      query);
-}
-
-QString DocParser::msgCannotFindDocumentation(const QString &fileName,
-                                              const AbstractMetaClass *metaClass,
-                                              const AbstractMetaField *f,
-                                              const QString &query)
-{
-    return msgCannotFindDocumentation(fileName, "field",
-                                      metaClass->name() + QLatin1String("::") + f->name(),
-                                      query);
-}
 
 #ifdef HAVE_LIBXSLT
 namespace
 {
 
-struct XslResources
+class XslResources
 {
-    xmlDocPtr xmlDoc;
-    xsltStylesheetPtr xslt;
-    xmlDocPtr xslResult;
+    Q_DISABLE_COPY(XslResources)
+
+public:
+    xmlDocPtr xmlDoc = nullptr;
+    xsltStylesheetPtr xslt = nullptr;
+    xmlDocPtr xslResult = nullptr;
 
-    XslResources() : xmlDoc(0), xslt(0), xslResult(0) {}
+    XslResources() = default;
 
     ~XslResources()
     {
@@ -186,27 +148,6 @@ static inline bool isXpathDocModification(const DocModification &mod)
     return mod.mode() == TypeSystem::DocModificationXPathReplace;
 }
 
-QString msgXpathDocModificationError(const DocModificationList& mods,
-                                     const QString &what)
-{
-    QString result;
-    QTextStream str(&result);
-    str << "Error when applying modifications (";
-    for (const DocModification &mod : mods) {
-        if (isXpathDocModification(mod)) {
-            str << '"' << mod.xpath() << "\" -> \"";
-            const QString simplified = mod.code().simplified();
-            if (simplified.size() > 20)
-                str << simplified.leftRef(20) << "...";
-            else
-                str << simplified;
-            str << '"';
-        }
-    }
-    str << "): " << what;
-    return result;
-}
-
 QString DocParser::applyDocModifications(const DocModificationList& mods, const QString& xml) const
 {
     if (mods.isEmpty() || xml.isEmpty()