feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use better context and simplify macro expander translations

Browse Source 
Change-Id: Ia05936f6c461b1b8208481588f1a2ac114c32ec9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
hjk
2014-11-05 13:26:34 +01:00
parent df6ace109e
commit d302d40ec4
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/macroexpander.cpp
View File

@@ -349,19 +349,19 @@ void MacroExpander::registerFileVariables(const QByteArray &prefix,
const QString &heading, const StringFunction &base) const QString &heading, const StringFunction &base)
{ {
registerVariable(prefix + kFilePathPostfix, 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(); }); [base]() -> QString { QString tmp = base(); return tmp.isEmpty() ? QString() : QFileInfo(tmp).filePath(); });
registerVariable(prefix + kPathPostfix, 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(); }); [base]() -> QString { QString tmp = base(); return tmp.isEmpty() ? QString() : QFileInfo(tmp).path(); });
registerVariable(prefix + kFileNamePostfix, 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(); }); [base]() -> QString { QString tmp = base(); return tmp.isEmpty() ? QString() : QFileInfo(tmp).fileName(); });
registerVariable(prefix + kFileBaseNamePostfix, 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(); }); [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 class GlobalMacroExpander : public MacroExpander
{ {
Q_DECLARE_TR_FUNCTIONS(Utils::MacroExpander)
public: public:
GlobalMacroExpander() GlobalMacroExpander()
{ {
setDisplayName(tr("Global variables")); setDisplayName(MacroExpander::tr("Global variables"));
registerPrefix("Env", tr("Access environment variables."), registerPrefix("Env", tr("Access environment variables."),
[](const QString &value) { return QString::fromLocal8Bit(qgetenv(value.toLocal8Bit())); }); [](const QString &value) { return QString::fromLocal8Bit(qgetenv(value.toLocal8Bit())); });
} }

2
src/libs/utils/macroexpander.h
View File

@@ -49,7 +49,7 @@ typedef QVector<MacroExpander *> MacroExpanders;
class QTCREATOR_UTILS_EXPORT MacroExpander class QTCREATOR_UTILS_EXPORT MacroExpander
{ {
Q_DECLARE_TR_FUNCTIONS("MacroExpander") Q_DECLARE_TR_FUNCTIONS(Utils::MacroExpander)
Q_DISABLE_COPY(MacroExpander) Q_DISABLE_COPY(MacroExpander)
public: public: