From b2063fd70fa6955acb2b9f02507097d03e2011a7 Mon Sep 17 00:00:00 2001
From: Sebastian Holtermann <sebholt@xwmw.org>
Date: Wed, 15 Feb 2017 11:01:31 +0100
Subject: Autogen: Move method declarations; Remove comments

---
 Source/cmQtAutoGenerators.cxx |  6 +-----
 Source/cmQtAutoGenerators.h   | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 6896ba4..fcaf43d 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -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";
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index f14c7a7..e60320b 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -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;
-- 
cgit v0.12