reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-01-19 01:42:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Autogen: Generators: Rename requiresMocing method

Browse Source
This commit is contained in:
Sebastian Holtermann 2017-01-12 23:54:20 +01:00
parent f24e1d37ce
commit 3f86032bda
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmQtAutoGenerators.cxx
View File

@ -683,8 +683,8 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
* @brief Tests if the C++ content requires moc processing
* @return True if moc is required
*/
bool cmQtAutoGenerators::requiresMocing(const std::string& text,
std::string& macroName)
bool cmQtAutoGenerators::MocRequired(const std::string& text,
std::string& macroName)
{
// Run a simple check before an expensive regular expression check
if (strstr(text.c_str(), "Q_OBJECT") != CM_NULLPTR) {
@ -812,7 +812,7 @@ bool cmQtAutoGenerators::ParseContentForMoc(
cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
std::string macroName;
const bool requiresMoc = this->requiresMocing(contentsString, macroName);
const bool requiresMoc = this->MocRequired(contentsString, macroName);
bool ownDotMocIncluded = false;
bool ownMocUnderscoreIncluded = false;
std::string ownMocUnderscoreFile;
@ -1053,7 +1053,7 @@ void cmQtAutoGenerators::ParseHeaders(
this->LogInfo(err.str());
}
std::string macroName;
if (this->requiresMocing(contents, macroName)) {
if (this->MocRequired(contents, macroName)) {
notIncludedMocs[headerName] = fpathCheckSum.getPart(headerName) +
"/moc_" +
cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName) +

2
Source/cmQtAutoGenerators.h
View File

@ -39,7 +39,7 @@ private:
bool RunAutogen(cmMakefile* makefile);
// - Content analysis
bool requiresMocing(const std::string& text, std::string& macroName);
bool MocRequired(const std::string& text, std::string& macroName);
bool MocSkipTest(const std::string& absFilename);
bool UicSkipTest(const std::string& absFilename);