Browse Source

Fix line-too-long style violations

Commit 8a0eb78f (Constify many getters of cmGlobalGenerator, 2011-03-26)
added const qualifiers to many cmGlobalGenerator methods but left the
resulting lines beyond our style's limit of 79 characters.
Brad King 14 years ago
parent
commit
32f8437bbf
2 changed files with 16 additions and 15 deletions
  1. 4 3
      Source/cmGlobalGenerator.h
  2. 12 12
      Source/cmGlobalUnixMakefileGenerator3.h

+ 4 - 3
Source/cmGlobalGenerator.h

@@ -220,7 +220,8 @@ public:
 
   /** Get the manifest of all targets that will be built for each
       configuration.  This is valid during generation only.  */
-  cmTargetManifest const& GetTargetManifest() const { return this->TargetManifest; }
+  cmTargetManifest const& GetTargetManifest() const
+  { return this->TargetManifest; }
 
   /** Get the content of a directory.  Directory listings are loaded
       from disk at most once and cached.  During the generation step
@@ -231,12 +232,12 @@ public:
 
   void AddTarget(cmTargets::value_type &v);
 
-  virtual const char* GetAllTargetName()           const { return "ALL_BUILD"; }
+  virtual const char* GetAllTargetName()         const { return "ALL_BUILD"; }
   virtual const char* GetInstallTargetName()       const { return "INSTALL"; }
   virtual const char* GetInstallLocalTargetName()  const { return 0; }
   virtual const char* GetInstallStripTargetName()  const { return 0; }
   virtual const char* GetPreinstallTargetName()    const { return 0; }
-  virtual const char* GetTestTargetName()          const { return "RUN_TESTS"; }
+  virtual const char* GetTestTargetName()        const { return "RUN_TESTS"; }
   virtual const char* GetPackageTargetName()       const { return "PACKAGE"; }
   virtual const char* GetPackageSourceTargetName() const { return 0; }
   virtual const char* GetEditCacheTargetName()     const { return 0; }

+ 12 - 12
Source/cmGlobalUnixMakefileGenerator3.h

@@ -136,18 +136,18 @@ protected:
   // does this generator need a requires step for any of its targets
   bool NeedRequiresStep(cmTarget const&);
 
-  // Setup target names
-  virtual const char* GetAllTargetName()           const { return "all"; }
-  virtual const char* GetInstallTargetName()       const { return "install"; }
-  virtual const char* GetInstallLocalTargetName()  const { return "install/local"; }
-  virtual const char* GetInstallStripTargetName()  const { return "install/strip"; }
-  virtual const char* GetPreinstallTargetName()    const { return "preinstall"; }
-  virtual const char* GetTestTargetName()          const { return "test"; }
-  virtual const char* GetPackageTargetName()       const { return "package"; }
-  virtual const char* GetPackageSourceTargetName() const { return "package_source"; }
-  virtual const char* GetEditCacheTargetName()     const { return "edit_cache"; }
-  virtual const char* GetRebuildCacheTargetName()  const { return "rebuild_cache"; }
-  virtual const char* GetCleanTargetName()         const { return "clean"; }
+  // Target name hooks for superclass.
+  const char* GetAllTargetName()           const { return "all"; }
+  const char* GetInstallTargetName()       const { return "install"; }
+  const char* GetInstallLocalTargetName()  const { return "install/local"; }
+  const char* GetInstallStripTargetName()  const { return "install/strip"; }
+  const char* GetPreinstallTargetName()    const { return "preinstall"; }
+  const char* GetTestTargetName()          const { return "test"; }
+  const char* GetPackageTargetName()       const { return "package"; }
+  const char* GetPackageSourceTargetName() const { return "package_source"; }
+  const char* GetEditCacheTargetName()     const { return "edit_cache"; }
+  const char* GetRebuildCacheTargetName()  const { return "rebuild_cache"; }
+  const char* GetCleanTargetName()         const { return "clean"; }
 
   virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() { return true; }