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/cmQTWrapCPPCommand.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/cmQTWrapCPPCommand.cxx')
-rw-r--r-- | Source/cmQTWrapCPPCommand.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx index 4a3fd8a..0ddf382 100644 --- a/Source/cmQTWrapCPPCommand.cxx +++ b/Source/cmQTWrapCPPCommand.cxx @@ -25,19 +25,19 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn) return false; } std::vector<std::string> args; - m_Makefile->ExpandSourceListArguments(argsIn, args, 2); + this->Makefile->ExpandSourceListArguments(argsIn, args, 2); // what is the current source dir - std::string cdir = m_Makefile->GetCurrentDirectory(); + std::string cdir = this->Makefile->GetCurrentDirectory(); // keep the library name - m_LibraryName = args[0]; - m_SourceList = args[1]; + this->LibraryName = args[0]; + this->SourceList = args[1]; std::string sourceListValue; // was the list already populated - const char *def = m_Makefile->GetDefinition(m_SourceList.c_str()); + const char *def = this->Makefile->GetDefinition(this->SourceList.c_str()); if (def) { sourceListValue = def; @@ -47,7 +47,7 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn) for(std::vector<std::string>::iterator j = (args.begin() + 2); j != args.end(); ++j) { - cmSourceFile *curr = m_Makefile->GetSource(j->c_str()); + cmSourceFile *curr = this->Makefile->GetSource(j->c_str()); // if we should wrap the class if (!curr || !curr->GetPropertyAsBool("WRAP_EXCLUDE")) @@ -59,7 +59,7 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn) } std::string srcName = cmSystemTools::GetFilenameWithoutLastExtension(*j); std::string newName = "moc_" + srcName; - file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(), + file.SetName(newName.c_str(), this->Makefile->GetCurrentOutputDirectory(), "cxx",false); std::string hname; if ( (*j)[0] == '/' || (*j)[1] == ':' ) @@ -70,17 +70,17 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn) { if ( curr && curr->GetPropertyAsBool("GENERATED") ) { - hname = std::string( m_Makefile->GetCurrentOutputDirectory() ) + "/" + *j; + hname = std::string( this->Makefile->GetCurrentOutputDirectory() ) + "/" + *j; } else { hname = cdir + "/" + *j; } } - m_WrapHeaders.push_back(hname); + this->WrapHeaders.push_back(hname); // add starting depends file.GetDepends().push_back(hname); - m_WrapClasses.push_back(file); + this->WrapClasses.push_back(file); if (sourceListValue.size() > 0) { sourceListValue += ";"; @@ -89,7 +89,7 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn) } } - m_Makefile->AddDefinition(m_SourceList.c_str(), sourceListValue.c_str()); + this->Makefile->AddDefinition(this->SourceList.c_str(), sourceListValue.c_str()); return true; } @@ -97,9 +97,9 @@ void cmQTWrapCPPCommand::FinalPass() { // first we add the rules for all the .h to Moc files - size_t lastClass = m_WrapClasses.size(); + size_t lastClass = this->WrapClasses.size(); std::vector<std::string> depends; - const char* moc_exe = m_Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE"); + const char* moc_exe = this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE"); // wrap all the .h files depends.push_back(moc_exe); @@ -107,28 +107,28 @@ void cmQTWrapCPPCommand::FinalPass() for(size_t classNum = 0; classNum < lastClass; classNum++) { // Add output to build list - m_Makefile->AddSource(m_WrapClasses[classNum]); + this->Makefile->AddSource(this->WrapClasses[classNum]); // set up moc command - std::string res = m_Makefile->GetCurrentOutputDirectory(); + std::string res = this->Makefile->GetCurrentOutputDirectory(); res += "/"; - res += m_WrapClasses[classNum].GetSourceName() + ".cxx"; + res += this->WrapClasses[classNum].GetSourceName() + ".cxx"; cmCustomCommandLine commandLine; commandLine.push_back(moc_exe); commandLine.push_back("-o"); commandLine.push_back(res); - commandLine.push_back(m_WrapHeaders[classNum]); + commandLine.push_back(this->WrapHeaders[classNum]); cmCustomCommandLines commandLines; commandLines.push_back(commandLine); std::vector<std::string> realdepends = depends; - realdepends.push_back(m_WrapHeaders[classNum]); + realdepends.push_back(this->WrapHeaders[classNum]); const char* no_main_dependency = 0; const char* no_working_dir = 0; - m_Makefile->AddCustomCommandToOutput(res.c_str(), + this->Makefile->AddCustomCommandToOutput(res.c_str(), realdepends, no_main_dependency, commandLines, |