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

Replace some genitive of lifeless things

Browse Source 
Despite the trend to use it for geographic names and organizations...

Change-Id: If135e78d1777f3f7d6c1688e9007969082bf3545
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
This commit is contained in:
hjk
2014-10-27 13:50:54 +01:00
parent 7150a615b1
commit 9c72b69d71
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/kit.cpp
View File

@@ -102,13 +102,13 @@ public:
// This provides the same global fall back as the global expander // This provides the same global fall back as the global expander
// without relying on the currentKit() discovery process there. // without relying on the currentKit() discovery process there.
m_macroExpander.registerVariable(Constants::VAR_CURRENTKIT_NAME, m_macroExpander.registerVariable(Constants::VAR_CURRENTKIT_NAME,
tr("The currently active kit's name."), tr("The name of the currently active kit."),
[kit] { return kit->displayName(); }); [kit] { return kit->displayName(); });
m_macroExpander.registerVariable(Constants::VAR_CURRENTKIT_FILESYSTEMNAME, m_macroExpander.registerVariable(Constants::VAR_CURRENTKIT_FILESYSTEMNAME,
tr("The currently active kit's name in a filesystem friendly version."), tr("The name of the currently active kit in a filesystem friendly version."),
[kit] { return kit->fileSystemFriendlyName(); }); [kit] { return kit->fileSystemFriendlyName(); });
m_macroExpander.registerVariable(Constants::VAR_CURRENTKIT_ID, m_macroExpander.registerVariable(Constants::VAR_CURRENTKIT_ID,
tr("The currently active kit's id."), tr("The id of the currently active kit."),
[kit] { return kit->id().toString(); }); [kit] { return kit->id().toString(); });
} }

8
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -1145,28 +1145,28 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
}); });
expander->registerVariable(Constants::VAR_CURRENTPROJECT_NAME, expander->registerVariable(Constants::VAR_CURRENTPROJECT_NAME,
tr("The current project's name."), tr("The name of the current project."),
[this]() -> QString { [this]() -> QString {
Project *project = ProjectExplorerPlugin::currentProject(); Project *project = ProjectExplorerPlugin::currentProject();
return project ? project->displayName() : QString(); return project ? project->displayName() : QString();
}); });
expander->registerVariable(Constants::VAR_CURRENTKIT_NAME, expander->registerVariable(Constants::VAR_CURRENTKIT_NAME,
tr("The currently active kit's name."), tr("The name of the currently active kit."),
[]() -> QString { []() -> QString {
Kit *kit = currentKit(); Kit *kit = currentKit();
return kit ? kit->displayName() : QString(); return kit ? kit->displayName() : QString();
}); });
expander->registerVariable(Constants::VAR_CURRENTKIT_FILESYSTEMNAME, expander->registerVariable(Constants::VAR_CURRENTKIT_FILESYSTEMNAME,
tr("The currently active kit's name in a filesystem friendly version."), tr("The name of the currently active kit in a filesystem friendly version."),
[]() -> QString { []() -> QString {
Kit *kit = currentKit(); Kit *kit = currentKit();
return kit ? kit->fileSystemFriendlyName() : QString(); return kit ? kit->fileSystemFriendlyName() : QString();
}); });
expander->registerVariable(Constants::VAR_CURRENTKIT_ID, expander->registerVariable(Constants::VAR_CURRENTKIT_ID,
tr("The currently active kit's id."), tr("The id of the currently active kit."),
[]() -> QString { []() -> QString {
Kit *kit = currentKit(); Kit *kit = currentKit();
return kit ? kit->id().toString() : QString(); return kit ? kit->id().toString() : QString();