ENH: fix line length style stuff

18 files changed, 73 insertions, 35 deletions

diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index a6773b5f58..2a2a71c9df 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -31,7 +31,8 @@ class cmCacheManager
 public:
   class CacheIterator;
   friend class cmCacheManager::CacheIterator;
-  enum CacheEntryType{ BOOL=0, PATH, FILEPATH, STRING, INTERNAL,STATIC, UNINITIALIZED };
+  enum CacheEntryType{ BOOL=0, PATH, FILEPATH, STRING, INTERNAL,STATIC, 
+                       UNINITIALIZED };
 
 private:
   struct CacheEntry
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 2f5c3237f9..13ff3df976 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -110,7 +110,8 @@ private:
                        const char* output,
                        const char* extraFlags);
 
-  void WriteGroup(const cmSourceGroup *sg, cmTarget target, std::ostream &fout, const char *libName, std::vector<std::string> *configs);
+  void WriteGroup(const cmSourceGroup *sg, cmTarget target, std::ostream &fout, 
+                  const char *libName, std::vector<std::string> *configs);
   virtual std::string GetTargetDirectory(cmTarget&);
 
   std::vector<std::string> m_CreatedProjectNames;
diff --git a/Source/cmMakeDepend.h b/Source/cmMakeDepend.h
index 2a2e719638..1ac529f728 100644
--- a/Source/cmMakeDepend.h
+++ b/Source/cmMakeDepend.h
@@ -99,7 +99,8 @@ public:
   /** 
    * Get the depend info struct for a source file
    */
-  const cmDependInformation *GetDependInformationForSourceFile(const cmSourceFile &sf) const;
+  const cmDependInformation 
+  *GetDependInformationForSourceFile(const cmSourceFile &sf) const;
 
   /**
    * Add a directory to the search path for include files.
@@ -144,7 +145,8 @@ protected:
    * Get an instance of cmDependInformation corresponding to the given file
    * name.
    */
-  cmDependInformation* GetDependInformation(const char* file, const char *extraPath);  
+  cmDependInformation* GetDependInformation(const char* file, 
+                                            const char *extraPath);  
   
   /** 
    * Find the full path name for the given file name.
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 6095cdba3e..8dd916344f 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -217,7 +217,8 @@ public:
   /**
    * Add a subdirectory to the build.
    */
-  void AddSubDirectory(const char*, bool includeTopLevel=true, bool preorder = false);
+  void AddSubDirectory(const char*, bool includeTopLevel=true, 
+                       bool preorder = false);
   void AddSubDirectory(const char* fullSrcDir,const char *fullBinDir, 
                        bool includeTopLevel, bool preorder,
                        bool immediate);
@@ -277,7 +278,8 @@ public:
   /**
    * Add a source group for consideration when adding a new source.
    */
-  void AddSourceGroup(const char* name, const char* regex=0, const char* parent=0);
+  void AddSourceGroup(const char* name, const char* regex=0, 
+                      const char* parent=0);
   
   /**
    * Add an auxiliary directory to the build.
@@ -576,7 +578,7 @@ public:
    */
   void AddCommand(cmCommand* );
 
-  ///! Enable support for the named language, if null then all languages are enabled.
+  ///! Enable support for named language, if nil then all languages are enabled.
   void EnableLanguage(std::vector<std::string>const& languages);
 
   /**
@@ -713,8 +715,10 @@ private:
   void ReadSources(std::ifstream& fin, bool t);
   friend class cmMakeDepend;    // make depend needs direct access 
                                 // to the m_Sources array 
-  void PrintStringVector(const char* s, const std::vector<std::pair<cmStdString, bool> >& v) const;
-  void PrintStringVector(const char* s, const std::vector<std::string>& v) const;
+  void PrintStringVector(const char* s, const 
+                         std::vector<std::pair<cmStdString, bool> >& v) const;
+  void PrintStringVector(const char* s, 
+                         const std::vector<std::string>& v) const;
   void AddDefaultDefinitions();
   std::list<cmFunctionBlocker *> m_FunctionBlockers;
 
diff --git a/Source/cmOutputRequiredFilesCommand.h b/Source/cmOutputRequiredFilesCommand.h
index 88225bf1b4..3df2aced14 100644
--- a/Source/cmOutputRequiredFilesCommand.h
+++ b/Source/cmOutputRequiredFilesCommand.h
@@ -64,7 +64,10 @@ public:
     {
     return
       "  OUTPUT_REQUIRED_FILES(srcfile outputfile)\n"
-      "Outputs a list of all the source files that are required by the specified srcfile. This list is written into outputfile. This is similar to writing out the dependencies for srcfile except that it jumps from .h files into .cxx, .c and .cpp files if possible.";
+      "Outputs a list of all the source files that are required by the "
+      "specified srcfile. This list is written into outputfile. This is "
+      "similar to writing out the dependencies for srcfile except that it "
+      "jumps from .h files into .cxx, .c and .cpp files if possible.";
     }
   
   cmTypeMacro(cmOutputRequiredFilesCommand, cmCommand);
diff --git a/Source/cmProjectCommand.h b/Source/cmProjectCommand.h
index dd4ae746af..bd5aa205c0 100644
--- a/Source/cmProjectCommand.h
+++ b/Source/cmProjectCommand.h
@@ -65,9 +65,11 @@ public:
     return
       "  PROJECT(projectname [CXX] [C] [Java])\n"
       "Sets the name of the project.  "
-      "This creates the variables projectname_BINARY_DIR and projectname_SOURCE_DIR.  "
+      "This creates the variables projectname_BINARY_DIR and "
+      "projectname_SOURCE_DIR.  "
       "Optionally you can specify which languages your project supports.  "
-      "By default all languages are supported.  If you do not have a C++ compiler, but want" 
+      "By default all languages are supported.  If you do not have a "
+      "C++ compiler, but want" 
       " to build a c program with cmake, then use this option.";
     }
   
diff --git a/Source/cmRemoveDefinitionsCommand.h b/Source/cmRemoveDefinitionsCommand.h
index 531c223b66..278fdb8e5a 100644
--- a/Source/cmRemoveDefinitionsCommand.h
+++ b/Source/cmRemoveDefinitionsCommand.h
@@ -22,7 +22,8 @@
 /** \class cmRemoveDefinitionsCommand
  * \brief Specify a list of compiler defines
  *
- * cmRemoveDefinitionsCommand specifies a list of compiler defines. These defines will
+ * cmRemoveDefinitionsCommand specifies a list of compiler defines. 
+ * These defines will
  * be removed from the compile command.  
  */
 class cmRemoveDefinitionsCommand : public cmCommand
@@ -52,7 +53,8 @@ public:
    */
   virtual const char* GetTerseDocumentation() 
     {
-    return "Removes -D define flags to the command line of C and C++ compilers.";
+    return 
+      "Removes -D define flags to the command line of C and C++ compilers.";
     }
   
   /**
diff --git a/Source/cmSetTestsPropertiesCommand.h b/Source/cmSetTestsPropertiesCommand.h
index c5bf5faea3..e1bc069a73 100644
--- a/Source/cmSetTestsPropertiesCommand.h
+++ b/Source/cmSetTestsPropertiesCommand.h
@@ -52,12 +52,15 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  SET_TESTS_PROPERTIES(test1 [test2...] PROPERTIES prop1 value1 prop2 value2)\n"
+      "  SET_TESTS_PROPERTIES(test1 [test2...] PROPERTIES prop1 value1 prop2"
+      " value2)\n"
       "Set a property for the tests. If the property is not found, CMake will "
       "report an error. The properties include:\n"
-      "WILL_FAIL: If set to true, this will invert the pass/fail flag of the test.\n"
+      "WILL_FAIL: If set to true, this will invert the pass/fail flag of the"
+      " test.\n"
       "PASS_REGULAR_EXPRESSION: If set, the test output will be checked "
-      "against the specified regular expressions and at least one of the regular "
+      "against the specified regular expressions and at least one of the"
+      " regular "
       "expressions has to match, otherwise the test will fail.\n"
       "  Example: PASS_REGULAR_EXPRESSION \"TestPassed;All ok\"\n"
       "FAIL_REGULAR_EXPRESSION: If set, if the output will match to one of "
diff --git a/Source/cmSourceGroup.h b/Source/cmSourceGroup.h
index 6b76bacb0b..854d174700 100644
--- a/Source/cmSourceGroup.h
+++ b/Source/cmSourceGroup.h
@@ -74,7 +74,8 @@ public:
   bool MatchesFiles(const char* name);
 
   /**
-   * Check if the given name matches this group's explicit file list in children.
+   * Check if the given name matches this group's explicit file list
+   * in children.
    */
   cmSourceGroup *MatchChildrenFiles(const char *name);
 
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 1dfe4b137c..4fda856211 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -320,7 +320,8 @@ public:
 # pragma reset woff 1375 /* base class destructor not virtual */
 #endif
 
-// All subclasses of cmCommand or cmCTestGenericHandler should invoke this macro.
+// All subclasses of cmCommand or cmCTestGenericHandler should 
+// invoke this macro.
 #define cmTypeMacro(thisClass,superclass) \
 virtual const char* GetNameOfClass() { return #thisClass; } \
 typedef superclass Superclass; \
diff --git a/Source/cmStringCommand.h b/Source/cmStringCommand.h
index 3b71c25508..523162d72a 100644
--- a/Source/cmStringCommand.h
+++ b/Source/cmStringCommand.h
@@ -119,7 +119,8 @@ protected:
   bool RegexMatch(std::vector<std::string> const& args);
   bool RegexMatchAll(std::vector<std::string> const& args);
   bool RegexReplace(std::vector<std::string> const& args);
-  bool HandleToUpperLowerCommand(std::vector<std::string> const& args, bool toUpper);
+  bool HandleToUpperLowerCommand(std::vector<std::string> const& args,
+                                 bool toUpper);
   bool HandleCompareCommand(std::vector<std::string> const& args);
   bool HandleReplaceCommand(std::vector<std::string> const& args);
   bool HandleLengthCommand(std::vector<std::string> const& args);
diff --git a/Source/cmSubdirCommand.h b/Source/cmSubdirCommand.h
index 2fb8bd04f2..73b5bceb0a 100644
--- a/Source/cmSubdirCommand.h
+++ b/Source/cmSubdirCommand.h
@@ -62,7 +62,8 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "  SUBDIRS(dir1 dir2 ...[EXCLUDE_FROM_ALL exclude_dir1 exclude_dir2 ...] [PREORDER] )\n"
+      "  SUBDIRS(dir1 dir2 ...[EXCLUDE_FROM_ALL exclude_dir1 exclude_dir2 ...]"
+      " [PREORDER] )\n"
       "Add a list of subdirectories to the build. The ADD_SUBDIRECTORY "
       "command should be used instead of SUBDIRS although SUBDIRS will "
       "still work. "
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 264eaf837b..fb40e544d2 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -91,7 +91,8 @@ public:
   ///! Return true if there was an error at any point.
   static bool GetErrorOccuredFlag() 
     {
-      return cmSystemTools::s_ErrorOccured || cmSystemTools::s_FatalErrorOccured;
+      return cmSystemTools::s_ErrorOccured || 
+        cmSystemTools::s_FatalErrorOccured;
     }
   ///! If this is set to true, cmake stops processing commands.
   static void SetFatalErrorOccured()
@@ -152,7 +153,8 @@ public:
    * want to find. 0 means all files, -1 means directories, 1 means
    * files only. This method returns true if search was succesfull.
    */
-  static bool SimpleGlob(const cmStdString& glob, std::vector<cmStdString>& files, 
+  static bool SimpleGlob(const cmStdString& glob, 
+                         std::vector<cmStdString>& files, 
                          int type = 0);
   
   ///! Copy a file.
@@ -198,7 +200,9 @@ public:
    * escaped for this to with spaces.  
    */
   static bool RunSingleCommand(const char* command, std::string* output = 0,
-    int* retVal = 0, const char* dir = 0, bool verbose = true, double timeout = 0.0);
+                               int* retVal = 0, const char* dir = 0, 
+                               bool verbose = true,
+                               double timeout = 0.0);
 
   /**
    * Parse arguments out of a single string command
@@ -298,9 +302,14 @@ public:
   static std::string MakeXMLSafe(const char* str);
 
   /** Create tar */
-  static bool ListTar(const char* outFileName, std::vector<cmStdString>& files, bool gzip, bool verbose);
-  static bool CreateTar(const char* outFileName, const std::vector<cmStdString>& files, bool gzip, bool verbose);
-  static bool ExtractTar(const char* inFileName, const std::vector<cmStdString>& files, bool gzip, bool verbose);
+  static bool ListTar(const char* outFileName,
+                      std::vector<cmStdString>& files, bool gzip, bool verbose);
+  static bool CreateTar(const char* outFileName,
+                        const std::vector<cmStdString>& files, bool gzip,
+                        bool verbose);
+  static bool ExtractTar(const char* inFileName,
+                         const std::vector<cmStdString>& files, bool gzip, 
+                         bool verbose);
 private:
   static bool s_ForceUnixPaths;
   static bool s_RunCommandHideConsole;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index d22df65c55..fce361d482 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -95,7 +95,8 @@ public:
   enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
   typedef std::vector<std::pair<std::string,LinkLibraryType> > LinkLibraries;
   const LinkLibraries &GetLinkLibraries() {return m_LinkLibraries;}
-  const LinkLibraries &GetOriginalLinkLibraries() {return m_OriginalLinkLibraries;}
+  const LinkLibraries &GetOriginalLinkLibraries() 
+    {return m_OriginalLinkLibraries;}
 
   /**
    * Clear the dependency information recorded for this target, if any.
@@ -111,7 +112,8 @@ public:
   void AddLinkLibrary(const std::string& lib, 
                       LinkLibraryType llt);
 
-  void MergeLinkLibraries( cmMakefile& mf, const char* selfname, const LinkLibraries& libs );
+  void MergeLinkLibraries( cmMakefile& mf, const char* selfname,
+                           const LinkLibraries& libs );
 
   const std::vector<std::string>& GetLinkDirectories();
 
@@ -251,7 +253,8 @@ private:
   /**
    * Maps a library name to its internal structure
    */
-  typedef std::map< cmStdString, std::pair<cmStdString,LinkLibraryType> > LibTypeMap;
+  typedef std::map< cmStdString, std::pair<cmStdString,LinkLibraryType> >
+  LibTypeMap;
 
   /**
    * Inserts \a dep at the end of the dependency list of \a lib.
diff --git a/Source/cmTryCompileCommand.h b/Source/cmTryCompileCommand.h
index 55774fb5bd..8ff2b78406 100644
--- a/Source/cmTryCompileCommand.h
+++ b/Source/cmTryCompileCommand.h
@@ -89,7 +89,8 @@ public:
       "extra flags that can be included are,  "
       "INCLUDE_DIRECTORIES, LINK_DIRECTORIES, and LINK_LIBRARIES.  "
       "COMPILE_DEFINITIONS are -Ddefinition that will be passed to the "
-      "compile line. If srcfile is specified the files in bindir/CMakeFiles/CMakeTmp "
+      "compile line. If srcfile is specified the files in "
+      "bindir/CMakeFiles/CMakeTmp "
       "are cleaned automatically. If OUTPUT_VARIABLE is specified, then the "
       "output from the build process is stored in the given variable. "
       "TRY_COMPILE creates a CMakeList.txt "
diff --git a/Source/cmVariableWatch.h b/Source/cmVariableWatch.h
index 4b01c7a56b..45854920af 100644
--- a/Source/cmVariableWatch.h
+++ b/Source/cmVariableWatch.h
@@ -27,7 +27,8 @@
 class cmVariableWatch
 {
 public:
-  typedef void (*WatchMethod)(const std::string& variable, int access_type, void* client_data);
+  typedef void (*WatchMethod)(const std::string& variable, int access_type,
+                              void* client_data);
 
   cmVariableWatch();
   ~cmVariableWatch();
diff --git a/Source/cmXCode21Object.h b/Source/cmXCode21Object.h
index caa316b7d8..7467dac74a 100644
--- a/Source/cmXCode21Object.h
+++ b/Source/cmXCode21Object.h
@@ -8,7 +8,8 @@ class cmXCode21Object : public cmXCodeObject
 public:
   cmXCode21Object(PBXType ptype, Type type);
   virtual void PrintComment(std::ostream&);
-  static void PrintList(std::vector<cmXCodeObject*> const&, std::ostream& out, PBXType t);
+  static void PrintList(std::vector<cmXCodeObject*> const&, std::ostream& out,
+                        PBXType t);
   static void PrintList(std::vector<cmXCodeObject*> const&, std::ostream& out);
 };
 #endif
diff --git a/Source/cmake.h b/Source/cmake.h
index 8c4eaaf434..691158897f 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -277,7 +277,8 @@ class cmake
 
 protected:
   typedef cmGlobalGenerator* (*CreateGeneratorFunctionType)();
-  typedef std::map<cmStdString, CreateGeneratorFunctionType> RegisteredGeneratorsMap;
+  typedef std::map<cmStdString,
+                   CreateGeneratorFunctionType> RegisteredGeneratorsMap;
   RegisteredCommandsMap m_Commands;
   RegisteredGeneratorsMap m_Generators;
   void AddDefaultCommands();
@@ -362,7 +363,7 @@ private:
   {0, \
    "CMake is a cross-platform build system generator.  Projects " \
    "specify their build process with platform-independent CMake listfiles " \
-   "included in each directory of a source tree with the name CMakeLists.txt.  " \
+   "included in each directory of a source tree with the name CMakeLists.txt. "\
    "Users build a project by using CMake to generate a build system " \
    "for a native tool on their platform.", 0}
 #endif