From 9c438240661c68da7c0b09b2d08a1facc4fe1dcc Mon Sep 17 00:00:00 2001
From: Eric NOULARD <eric.noulard@gmail.com>
Date: Fri, 1 Apr 2011 19:21:51 +0200
Subject: [PATCH] Fix KWStyle warnings

---
 Source/CPack/cmCPackArchiveGenerator.cxx |  3 ++-
 Source/CPack/cmCPackDebGenerator.cxx     |  3 ++-
 Source/CPack/cmCPackGenerator.cxx        | 19 ++++++++++---------
 Source/CPack/cmCPackGenerator.h          |  6 ++++--
 Source/CPack/cmCPackRPMGenerator.cxx     |  3 ++-
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index 5b4625b06..0ce5b0126 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -254,7 +254,8 @@ int cmCPackArchiveGenerator::PackageFiles()
     // in this case you'll get 1 package for each component.
     else
       {
-      return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT);
+      return PackageComponents(componentPackageMethod ==
+                               ONE_PACKAGE_PER_COMPONENT);
       }
   }
 
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 582f3e678..566540483 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -250,7 +250,8 @@ int cmCPackDebGenerator::PackageFiles()
     // in this case you'll get 1 package for each component.
     else
       {
-      return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT);
+      return PackageComponents(componentPackageMethod ==
+                               ONE_PACKAGE_PER_COMPONENT);
       }
   }
   // CASE 3 : NON COMPONENT package.
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 6d71ad2f6..c8a77d191 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -1307,10 +1307,10 @@ int cmCPackGenerator::PrepareGroupingKind()
     else
       {
       cmCPackLogger(cmCPackLog::LOG_WARNING, "["
-              << this->Name << "]"
-              << " requested component grouping type <"<< groupingType
-              << "> UNKNOWN not in (ALL_COMPONENTS_IN_ONE,IGNORE,ONE_PER_GROUP)"
-              << std::endl);
+          << this->Name << "]"
+          << " requested component grouping type <"<< groupingType
+          << "> UNKNOWN not in (ALL_COMPONENTS_IN_ONE,IGNORE,ONE_PER_GROUP)"
+          << std::endl);
       }
     }
 
@@ -1328,10 +1328,10 @@ int cmCPackGenerator::PrepareGroupingKind()
       method = ONE_PACKAGE_PER_COMPONENT;
       }
     cmCPackLogger(cmCPackLog::LOG_WARNING, "["
-              << this->Name << "]"
-              << " One package per component group requested, but NO component groups exist:"
-              << " Ignoring component group."
-              << std::endl);
+         << this->Name << "]"
+         << " One package per component group requested, "
+         << "but NO component groups exist: Ignoring component group."
+         << std::endl);
     }
 
   // if user specified packaging method, override the default packaging method
@@ -1349,7 +1349,8 @@ int cmCPackGenerator::PrepareGroupingKind()
 
   cmCPackLogger(cmCPackLog::LOG_VERBOSE,  "["
         << this->Name << "]"
-        << " requested component grouping = " << method_names[componentPackageMethod]
+        << " requested component grouping = "
+        << method_names[componentPackageMethod]
         << std::endl);
 
   return 1;
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index f09c2a761..05d95b874 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -248,14 +248,16 @@ protected:
     ONE_PACKAGE,
     /* one package for each component */
     ONE_PACKAGE_PER_COMPONENT,
-    /* one package for each group, with left over components in their own package */
+    /* one package for each group,
+     * with left over components in their own package */
     ONE_PACKAGE_PER_GROUP,
     UNKNOWN_COMPONENT_PACKAGE_METHOD
   };
 
   /**
    * The component package method
-   * The default is ONE_PACKAGE_PER_GROUP, and generators may override the default
+   * The default is ONE_PACKAGE_PER_GROUP,
+   * and generators may override the default
    * before PrepareGroupingKind() is called.
    */
   ComponentPackageMethod componentPackageMethod;
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx
index 9f55d23cc..1a6c3bef4 100644
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@@ -215,7 +215,8 @@ int cmCPackRPMGenerator::PackageFiles()
     // in this case you'll get 1 package for each component.
     else
       {
-      return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT);
+      return PackageComponents(componentPackageMethod ==
+                               ONE_PACKAGE_PER_COMPONENT);
       }
   }
   // CASE 3 : NON COMPONENT package.