From d302d40ec44837f79492acc99949a5d9b1b445a9 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 5 Nov 2014 13:26:34 +0100 Subject: [PATCH] Use better context and simplify macro expander translations Change-Id: Ia05936f6c461b1b8208481588f1a2ac114c32ec9 Reviewed-by: Eike Ziller --- src/libs/utils/macroexpander.cpp | 12 +++++------- src/libs/utils/macroexpander.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp index 41cf66bf65e..067bd97dcc8 100644 --- a/src/libs/utils/macroexpander.cpp +++ b/src/libs/utils/macroexpander.cpp @@ -349,19 +349,19 @@ void MacroExpander::registerFileVariables(const QByteArray &prefix, const QString &heading, const StringFunction &base) { registerVariable(prefix + kFilePathPostfix, - QCoreApplication::translate("Utils::MacroExpander", "%1: Full path including file name.").arg(heading), + tr("%1: Full path including file name.").arg(heading), [base]() -> QString { QString tmp = base(); return tmp.isEmpty() ? QString() : QFileInfo(tmp).filePath(); }); registerVariable(prefix + kPathPostfix, - QCoreApplication::translate("Utils::MacroExpander", "%1: Full path excluding file name.").arg(heading), + tr("%1: Full path excluding file name.").arg(heading), [base]() -> QString { QString tmp = base(); return tmp.isEmpty() ? QString() : QFileInfo(tmp).path(); }); registerVariable(prefix + kFileNamePostfix, - QCoreApplication::translate("Utils::MacroExpander", "%1: File name without path.").arg(heading), + tr("%1: File name without path.").arg(heading), [base]() -> QString { QString tmp = base(); return tmp.isEmpty() ? QString() : QFileInfo(tmp).fileName(); }); registerVariable(prefix + kFileBaseNamePostfix, - QCoreApplication::translate("Utils::MacroExpander", "%1: File base name without path and suffix.").arg(heading), + tr("%1: File base name without path and suffix.").arg(heading), [base]() -> QString { QString tmp = base(); return tmp.isEmpty() ? QString() : QFileInfo(tmp).baseName(); }); } @@ -438,12 +438,10 @@ void MacroExpander::setAccumulating(bool on) class GlobalMacroExpander : public MacroExpander { - Q_DECLARE_TR_FUNCTIONS(Utils::MacroExpander) - public: GlobalMacroExpander() { - setDisplayName(tr("Global variables")); + setDisplayName(MacroExpander::tr("Global variables")); registerPrefix("Env", tr("Access environment variables."), [](const QString &value) { return QString::fromLocal8Bit(qgetenv(value.toLocal8Bit())); }); } diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h index 305646d1e1b..b2d87fc21e2 100644 --- a/src/libs/utils/macroexpander.h +++ b/src/libs/utils/macroexpander.h @@ -49,7 +49,7 @@ typedef QVector MacroExpanders; class QTCREATOR_UTILS_EXPORT MacroExpander { - Q_DECLARE_TR_FUNCTIONS("MacroExpander") + Q_DECLARE_TR_FUNCTIONS(Utils::MacroExpander) Q_DISABLE_COPY(MacroExpander) public: