From 6c80018430ffb1c3e72c70f406544a812c22309a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 2 Sep 2013 16:46:10 +0200 Subject: [PATCH] remove dead code for printing parser/evaluator warnings we print only errors anyway. amends 3d960a16dc9 Change-Id: Iac1c69e1ae94229e3702d7e67163f9a60d04decc Reviewed-by: hjk Reviewed-by: Oswald Buddenhagen --- src/linguist/lrelease/main.cpp | 12 +++++------- src/linguist/lupdate/main.cpp | 13 ++++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp index 8116616..3239d47 100644 --- a/src/linguist/lrelease/main.cpp +++ b/src/linguist/lrelease/main.cpp @@ -191,16 +191,14 @@ static bool releaseTsFile(const QString& tsFileName, return releaseTranslator(tor, qmFileName, cd, removeIdentical); } -static void print(const QString &fileName, int lineNo, int type, const QString &msg) +static void print(const QString &fileName, int lineNo, const QString &msg) { - QString pfx = ((type & QMakeHandler::CategoryMask) == QMakeHandler::WarningMessage) - ? QString::fromLatin1("WARNING: ") : QString(); if (lineNo > 0) - printErr(QString::fromLatin1("%1%2:%3: %4\n").arg(pfx, fileName, QString::number(lineNo), msg)); + printErr(QString::fromLatin1("%1:%2: %3\n").arg(fileName, QString::number(lineNo), msg)); else if (lineNo) - printErr(QString::fromLatin1("%1%2: %3\n").arg(pfx, fileName, msg)); + printErr(QString::fromLatin1("%1: %2\n").arg(fileName, msg)); else - printErr(QString::fromLatin1("%1%2\n").arg(pfx, msg)); + printErr(QString::fromLatin1("%1\n").arg(msg)); } class EvalHandler : public QMakeHandler { @@ -208,7 +206,7 @@ public: virtual void message(int type, const QString &msg, const QString &fileName, int lineNo) { if (verbose && (type & CategoryMask) == ErrorMessage) - print(fileName, lineNo, type, msg); + print(fileName, lineNo, msg); } virtual void fileMessage(const QString &) {} diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp index c6902c4..74eab78 100644 --- a/src/linguist/lupdate/main.cpp +++ b/src/linguist/lupdate/main.cpp @@ -233,24 +233,23 @@ static void updateTsFiles(const Translator &fetchedTor, const QStringList &tsFil } } -static void print(const QString &fileName, int lineNo, int type, const QString &msg) +static void print(const QString &fileName, int lineNo, const QString &msg) { - QString pfx = ((type & QMakeHandler::CategoryMask) == QMakeHandler::WarningMessage) - ? QString::fromLatin1("WARNING: ") : QString(); if (lineNo > 0) - printErr(QString::fromLatin1("%1%2:%3: %4\n").arg(pfx, fileName, QString::number(lineNo), msg)); + printErr(QString::fromLatin1("%1:%2: %3\n").arg(fileName, QString::number(lineNo), msg)); else if (lineNo) - printErr(QString::fromLatin1("%1%2: %3\n").arg(pfx, fileName, msg)); + printErr(QString::fromLatin1("%1: %2\n").arg(fileName, msg)); else - printErr(QString::fromLatin1("%1%2\n").arg(pfx, msg)); + printErr(QString::fromLatin1("%1\n").arg(msg)); } + class EvalHandler : public QMakeHandler { public: virtual void message(int type, const QString &msg, const QString &fileName, int lineNo) { if (verbose && (type & CategoryMask) == ErrorMessage) - print(fileName, lineNo, type, msg); + print(fileName, lineNo, msg); } virtual void fileMessage(const QString &) {} -- 2.7.4