From 0f1f324b0dd7147850f923ab266873bd8a4a4353 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 11 Apr 2015 12:45:12 +0200 Subject: cmake: Rename oddly named variables. --- Source/cmake.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/cmake.cxx b/Source/cmake.cxx index b27fefa..f22989d 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -228,14 +228,14 @@ bool cmake::CommandExists(const std::string& name) const cmCommand *cmake::GetCommand(const std::string& name) const { - cmCommand* rm = 0; + cmCommand* command = 0; std::string sName = cmSystemTools::LowerCase(name); RegisteredCommandsMap::const_iterator pos = this->Commands.find(sName); if (pos != this->Commands.end()) { - rm = (*pos).second; + command = (*pos).second; } - return rm; + return command; } void cmake::RenameCommand(const std::string& oldName, @@ -273,9 +273,9 @@ void cmake::RemoveCommand(const std::string& name) } } -void cmake::AddCommand(cmCommand* wg) +void cmake::AddCommand(cmCommand* command) { - std::string name = cmSystemTools::LowerCase(wg->GetName()); + std::string name = cmSystemTools::LowerCase(command->GetName()); // if the command already exists, free the old one RegisteredCommandsMap::iterator pos = this->Commands.find(name); if (pos != this->Commands.end()) @@ -283,7 +283,7 @@ void cmake::AddCommand(cmCommand* wg) delete pos->second; this->Commands.erase(pos); } - this->Commands.insert(std::make_pair(name, wg)); + this->Commands.insert(std::make_pair(name, command)); } -- cgit v0.12 no change in the underlying codebase, while still being a native application with native capabilities and speed.
summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-03-15 08:20:19 (GMT)
committeraavit <qt-info@nokia.com>2011-03-15 08:20:19 (GMT)
commit3c20b3ed8e89e351f1fb459e6ff5439f30958141 (patch)
tree2cae81c1eaa9f38de997a09aca5340978734ee07 /tools
parent25a30c8e258df642a1aa2ffcfb162633611e7259 (diff)
parentc0cd8db0498daaa8151d1f80143b6849016bdc7c (diff)
downloadQt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.zip
Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.tar.gz
Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.tar.bz2
Merge remote branch 'qt-mainline/master'