mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 21:58:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Autogen: Move method declarations; Remove comments

Browse Source
This commit is contained in:
Sebastian Holtermann
2017-02-15 11:01:31 +01:00
parent 10beb4a034
commit b2063fd70f
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmQtAutoGenerators.cxx
+1 -5
View File
@@ -688,7 +688,6 @@ bool cmQtAutoGenerators::MocRequired(const std::string& text,
*/
bool cmQtAutoGenerators::MocSkip(const std::string& absFilename)
{
// Test if moc scanning is enabled
if (this->MocEnabled()) {
// Test if the file name is on the skip list
if (!ListContains(this->MocSkipList, absFilename)) {
@@ -703,7 +702,6 @@ bool cmQtAutoGenerators::MocSkip(const std::string& absFilename)
*/
bool cmQtAutoGenerators::UicSkip(const std::string& absFilename)
{
// Test if uic scanning is enabled
if (this->UicEnabled()) {
// Test if the file name is on the skip list
if (!ListContains(this->UicSkipList, absFilename)) {
@@ -747,7 +745,6 @@ void cmQtAutoGenerators::ParseContentForUic(
const std::string& absFilename, const std::string& contentsString,
std::map<std::string, std::vector<std::string> >& includedUis)
{
// Process
if (this->Verbose) {
std::ostringstream err;
err << "AutoUic: Checking " << absFilename << "\n";
@@ -777,7 +774,6 @@ bool cmQtAutoGenerators::ParseContentForMoc(
const std::vector<std::string>& headerExtensions,
std::map<std::string, std::string>& includedMocs, bool relaxed)
{
// Process
if (this->Verbose) {
std::ostringstream err;
err << "AutoMoc: Checking " << absFilename << "\n";
@@ -1019,7 +1015,7 @@ void cmQtAutoGenerators::ParseHeaders(
// Parse header content for MOC
if ((absHeadersMoc.find(headerName) != absHeadersMoc.end()) &&
(includedMocs.find(headerName) == includedMocs.end())) {
// Process
// Log
if (this->Verbose) {
std::ostringstream err;
err << "AutoMoc: Checking " << headerName << "\n";
Source/cmQtAutoGenerators.h
+10 -10
View File
@@ -27,11 +27,21 @@ private:
const std::string& targetDirectory,
const std::string& config);
bool MocEnabled() const { return !this->MocExecutable.empty(); }
bool UicEnabled() const { return !this->UicExecutable.empty(); }
bool RccEnabled() const { return !this->RccExecutable.empty(); }
// - Settings file
void SettingsFileRead(cmMakefile* makefile,
const std::string& targetDirectory);
bool SettingsFileWrite(const std::string& targetDirectory);
bool GenerateAllAny() const
{
return (this->GenerateAllMoc || this->GenerateAllRcc ||
this->GenerateAllUic);
}
// - Init and run
void Init();
bool RunAutogen(cmMakefile* makefile);
@@ -110,16 +120,6 @@ private:
const char* baseSuffix) const;
bool MakeParentDirectory(const std::string& filename);
bool MocEnabled() const { return !this->MocExecutable.empty(); }
bool UicEnabled() const { return !this->UicExecutable.empty(); }
bool RccEnabled() const { return !this->RccExecutable.empty(); }
bool GenerateAllAny() const
{
return (this->GenerateAllMoc || this->GenerateAllRcc ||
this->GenerateAllUic);
}
// - Target names
std::string OriginTargetName;
std::string AutogenTargetName;