diff options
author | Ken Martin <ken.martin@kitware.com> | 2006-03-15 16:02:08 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2006-03-15 16:02:08 (GMT) |
commit | 3d96e522617647665d7e99919ba71d34b1db870c (patch) | |
tree | 2ec6cf41cc61aad79b94cff9b2aa321f2c8b686e /Source/cmConfigureFileCommand.cxx | |
parent | 609af5c969be6edf087498f983ccd7d3ac818a48 (diff) | |
download | CMake-3d96e522617647665d7e99919ba71d34b1db870c.zip CMake-3d96e522617647665d7e99919ba71d34b1db870c.tar.gz CMake-3d96e522617647665d7e99919ba71d34b1db870c.tar.bz2 |
STYLE: some m_ to this-> cleanup
Diffstat (limited to 'Source/cmConfigureFileCommand.cxx')
-rw-r--r-- | Source/cmConfigureFileCommand.cxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/Source/cmConfigureFileCommand.cxx b/Source/cmConfigureFileCommand.cxx index ec9527d..a3cf1dd 100644 --- a/Source/cmConfigureFileCommand.cxx +++ b/Source/cmConfigureFileCommand.cxx @@ -26,47 +26,47 @@ bool cmConfigureFileCommand::InitialPass(std::vector<std::string> const& args) this->SetError("called with incorrect number of arguments, expected 2"); return false; } - m_InputFile = args[0]; - m_OuputFile = args[1]; - m_CopyOnly = false; - m_EscapeQuotes = false; + this->InputFile = args[0]; + this->OuputFile = args[1]; + this->CopyOnly = false; + this->EscapeQuotes = false; // for CMake 2.0 and earlier CONFIGURE_FILE defaults to the FinalPass, // after 2.0 it only does InitialPass - m_Immediate = false; + this->Immediate = false; const char* versionValue - = m_Makefile->GetRequiredDefinition("CMAKE_BACKWARDS_COMPATIBILITY"); + = this->Makefile->GetRequiredDefinition("CMAKE_BACKWARDS_COMPATIBILITY"); if (atof(versionValue) > 2.0) { - m_Immediate = true; + this->Immediate = true; } - m_AtOnly = false; + this->AtOnly = false; for(unsigned int i=2;i < args.size();++i) { if(args[i] == "COPYONLY") { - m_CopyOnly = true; + this->CopyOnly = true; } else if(args[i] == "ESCAPE_QUOTES") { - m_EscapeQuotes = true; + this->EscapeQuotes = true; } else if(args[i] == "@ONLY") { - m_AtOnly = true; + this->AtOnly = true; } else if(args[i] == "IMMEDIATE") { - m_Immediate = true; + this->Immediate = true; } } // If we were told to copy the file immediately, then do it on the // first pass (now). - if(m_Immediate) + if(this->Immediate) { if ( !this->ConfigureFile() ) { @@ -80,7 +80,7 @@ bool cmConfigureFileCommand::InitialPass(std::vector<std::string> const& args) void cmConfigureFileCommand::FinalPass() { - if(!m_Immediate) + if(!this->Immediate) { this->ConfigureFile(); } @@ -88,18 +88,18 @@ void cmConfigureFileCommand::FinalPass() int cmConfigureFileCommand::ConfigureFile() { - std::string inFile = m_InputFile; + std::string inFile = this->InputFile; if (!cmSystemTools::FileIsFullPath(inFile.c_str())) { - inFile = m_Makefile->GetStartDirectory(); + inFile = this->Makefile->GetStartDirectory(); inFile += "/"; - inFile += m_InputFile; + inFile += this->InputFile; } - return m_Makefile->ConfigureFile(inFile.c_str(), - m_OuputFile.c_str(), - m_CopyOnly, - m_AtOnly, - m_EscapeQuotes); + return this->Makefile->ConfigureFile(inFile.c_str(), + this->OuputFile.c_str(), + this->CopyOnly, + this->AtOnly, + this->EscapeQuotes); } |