shiboken: Centralize most msg* functions in a separate file

This makes it easier to maintain a consistent style,
unclutters the source and allows for re-using formatting helpers.

Change-Id: I4f29637a22afb457f629272e2d86f14bedb36008
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 3 insertions, 30 deletions

diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
index 9a69c21b1..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
@@ -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());
@@ -2206,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;
     }