diff options
| author | Brad King <brad.king@kitware.com> | 2010-08-11 20:17:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-08-11 20:17:09 (GMT) |
| commit | 31a313d47043923bc722554175912e75a03a13f6 (patch) | |
| tree | 0ff5155324150c40c1fcb95d553cdc38df0b5ad6 /Source/CPack/cmCPackDragNDropGenerator.cxx | |
| parent | cd7b8a03f5403603da44432470f177601b5bf42b (diff) | |
| download | CMake-31a313d47043923bc722554175912e75a03a13f6.zip CMake-31a313d47043923bc722554175912e75a03a13f6.tar.gz CMake-31a313d47043923bc722554175912e75a03a13f6.tar.bz2 | |
CPack: Avoid member shadowing after API refactor
After converting method arguments to members we need to avoid use of the
same names as local variables and other method arguments.
Diffstat (limited to 'Source/CPack/cmCPackDragNDropGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackDragNDropGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index e12c98c..e9ce76c 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -107,7 +107,7 @@ const char* cmCPackDragNDropGenerator::GetOutputExtension() int cmCPackDragNDropGenerator::PackageFiles() { - return this->CreateDMG(toplevel, packageFileNames[0]); + return this->CreateDMG(); } //---------------------------------------------------------------------- @@ -159,8 +159,7 @@ bool cmCPackDragNDropGenerator::RunCommand(cmOStringStream& command, } //---------------------------------------------------------------------- -int cmCPackDragNDropGenerator::CreateDMG(const std::string& toplevel, - const std::string& outFileName) +int cmCPackDragNDropGenerator::CreateDMG() { // Get optional arguments ... const std::string cpack_package_icon = this->GetOption("CPACK_PACKAGE_ICON") @@ -473,7 +472,7 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& toplevel, final_image_command << cpack_dmg_format; final_image_command << " -imagekey"; final_image_command << " zlib-level=9"; - final_image_command << " -o \"" << outFileName << "\""; + final_image_command << " -o \"" << packageFileNames[0] << "\""; if(!this->RunCommand(final_image_command)) { |