From 8d685184f341e66e26284165c14ccfc045a074d8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 29 Apr 2009 08:46:21 -0400 Subject: [PATCH] ENH: Simplify construction of cmFileInstaller This cleans up the cmFileInstaller constructor signature. --- Source/cmFileCommand.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index f2565daa8..d988f305f 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -909,8 +909,9 @@ struct cmFileInstaller bool always); // All instances need the file command and makefile using them. - cmFileInstaller(cmFileCommand* fc, cmMakefile* mf): - FileCommand(fc), Makefile(mf), DestDirLength(0), MatchlessFiles(true) + cmFileInstaller(cmFileCommand* command): + FileCommand(command), Makefile(command->GetMakefile()), + DestDirLength(0), MatchlessFiles(true) { // Get the current manifest. this->Manifest = @@ -1725,7 +1726,7 @@ bool cmFileCommand::HandleInstallCommand(std::vector const& args) } // Construct a file installer object. - cmFileInstaller installer(this, this->Makefile); + cmFileInstaller installer(this); std::string rename = ""; std::string destination = "";