From 9d8537412856a2c07f59ae629f5732265678498f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Tue, 8 Mar 2011 12:36:12 +0100 Subject: [PATCH] Valgrind: Fix breakage caused by tr()-fix. Breakage introduced by 5c3596e935f045c610653ea299c9ae23ced99f9d. --- src/plugins/analyzerbase/analyzeroptionspage.cpp | 2 +- src/plugins/memcheck/memcheckerrorview.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/analyzerbase/analyzeroptionspage.cpp b/src/plugins/analyzerbase/analyzeroptionspage.cpp index 127ca8de6ff..1c2631e6f47 100644 --- a/src/plugins/analyzerbase/analyzeroptionspage.cpp +++ b/src/plugins/analyzerbase/analyzeroptionspage.cpp @@ -72,7 +72,7 @@ QString AnalyzerOptionsPage::category() const QString AnalyzerOptionsPage::displayCategory() const { - return QCoreApplication::tr("Analyzer", Constants::ANALYZER_SETTINGS_TR_CATEGORY); + return QCoreApplication::translate("Analyzer", Constants::ANALYZER_SETTINGS_TR_CATEGORY); } QIcon AnalyzerOptionsPage::categoryIcon() const diff --git a/src/plugins/memcheck/memcheckerrorview.cpp b/src/plugins/memcheck/memcheckerrorview.cpp index 3565baebfcf..d5c262cc813 100644 --- a/src/plugins/memcheck/memcheckerrorview.cpp +++ b/src/plugins/memcheck/memcheckerrorview.cpp @@ -152,7 +152,7 @@ static QString makeFrameName(const Frame &frame, const QString &relativeTo, } if (!fn.isEmpty()) - return QCoreApplication::tr("Analyzer::Internal", "%1 in %2").arg(Qt::escape(fn), path); + return QCoreApplication::translate("Analyzer::Internal", "%1 in %2").arg(Qt::escape(fn), path); else if (!path.isEmpty()) return path; else @@ -183,7 +183,7 @@ QString errorLocation(const QModelIndex &index, const Error &error, }; QTC_ASSERT(model, return QString()); - return QCoreApplication::tr("Analyzer::Internal", "in %1"). + return QCoreApplication::translate("Analyzer::Internal", "in %1"). arg(makeFrameName(model->findRelevantFrame(error), relativeToPath(), link, linkAttr)); } -- GitLab