ENH: a warning fix and some more cleanup

7 files changed, 13 insertions, 24 deletions

diff --git a/Source/cmAddTestCommand.h b/Source/cmAddTestCommand.h
index add8ecb..229c32c 100644
--- a/Source/cmAddTestCommand.h
+++ b/Source/cmAddTestCommand.h
@@ -74,8 +74,6 @@ public:
   
   cmTypeMacro(cmAddTestCommand, cmCommand);
 
-private:
-  std::string m_Test;
 };
 
 
diff --git a/Source/cmData.h b/Source/cmData.h
index b5a1e91..8045296 100644
--- a/Source/cmData.h
+++ b/Source/cmData.h
@@ -31,13 +31,13 @@
 class cmData
 {
 public:
-  cmData(const char* name): m_Name(name) {}
+  cmData(const char* name): Name(name) {}
   virtual ~cmData() {}
   
   const std::string& GetName() const
-    { return m_Name; }
+    { return this->Name; }
 protected:
-  std::string m_Name;
+  std::string Name;
 };
 
 #endif
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index b21d1de..2e198ee 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -38,7 +38,7 @@ cmDependsC::cmDependsC(std::vector<std::string> const& includes,
   IncludeRegexScan(scanRegex),
   IncludeRegexComplain(complainRegex),
   GeneratedFiles(&generatedFiles),
-  cacheFileName(cacheFileName)
+  CacheFileName(cacheFileName)
 {
   this->ReadCacheFile();
 }
@@ -212,11 +212,11 @@ bool cmDependsC::WriteDependencies(const char *src, const char *obj,
 //----------------------------------------------------------------------------
 void cmDependsC::ReadCacheFile()
 {
-  if(this->cacheFileName.size() == 0)
+  if(this->CacheFileName.size() == 0)
     {
     return;
     }
-  std::ifstream fin(this->cacheFileName.c_str());
+  std::ifstream fin(this->CacheFileName.c_str());
   if(!fin)
     {
     return;
@@ -240,7 +240,7 @@ void cmDependsC::ReadCacheFile()
       haveFileName=true;
       int newer=0;
       cmFileTimeComparison comp;
-      bool res=comp.FileTimeCompare(this->cacheFileName.c_str(), 
+      bool res=comp.FileTimeCompare(this->CacheFileName.c_str(), 
                                     line.c_str(), &newer);
       
       if ((res==true) && (newer==1)) //cache is newer than the parsed file
@@ -268,11 +268,11 @@ void cmDependsC::ReadCacheFile()
 //----------------------------------------------------------------------------
 void cmDependsC::WriteCacheFile() const
 {
-  if(this->cacheFileName.size() == 0)
+  if(this->CacheFileName.size() == 0)
     {
     return;
     }
-  std::ofstream cacheOut(this->cacheFileName.c_str());
+  std::ofstream cacheOut(this->CacheFileName.c_str());
   if(!cacheOut)
     {
     return;
diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h
index 3fb3906..f618b18 100644
--- a/Source/cmDependsC.h
+++ b/Source/cmDependsC.h
@@ -93,7 +93,7 @@ protected:
 
   std::map<cmStdString, cmIncludeLines *> fileCache;
 
-  cmStdString cacheFileName;
+  cmStdString CacheFileName;
 
   void WriteCacheFile() const;
   void ReadCacheFile();
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 4fda856..f40945c 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -240,11 +240,11 @@ private:
 class cmOStrStreamCleanup
 {
 public:
-  cmOStrStreamCleanup(std::ostrstream& ostr): m_OStrStream(ostr) {}
-  ~cmOStrStreamCleanup() { m_OStrStream.rdbuf()->freeze(0); }
+  cmOStrStreamCleanup(std::ostrstream& ostr): OStrStream(ostr) {}
+  ~cmOStrStreamCleanup() { this->OStrStream.rdbuf()->freeze(0); }
   static void IgnoreUnusedVariable(const cmOStrStreamCleanup&) {}
 protected:
-  std::ostrstream& m_OStrStream;
+  std::ostrstream& OStrStream;
 };
 
 class cmOStringStream: public std::ostrstream
diff --git a/Source/cmUseMangledMesaCommand.h b/Source/cmUseMangledMesaCommand.h
index 83d4e96..4fb68fa 100644
--- a/Source/cmUseMangledMesaCommand.h
+++ b/Source/cmUseMangledMesaCommand.h
@@ -75,12 +75,6 @@ public:
 protected:
   void CopyAndFullPathMesaHeader(const char* source,
                                  const char* outdir);
-private:
-  std::vector<cmSourceFile> m_WrapClasses;
-  std::vector<std::string> m_WrapHeaders;
-  std::string m_LibraryName;
-  std::string m_SourceList;
-  std::vector<std::string> m_Commands;
 };
 
 
diff --git a/Source/cmVariableRequiresCommand.h b/Source/cmVariableRequiresCommand.h
index 9a74514..becd108 100644
--- a/Source/cmVariableRequiresCommand.h
+++ b/Source/cmVariableRequiresCommand.h
@@ -73,9 +73,6 @@ public:
     }
   
   cmTypeMacro(cmVariableRequiresCommand, cmCommand);
-private:
-  std::string m_ErrorMessage;
-  bool m_RequirementsMet;
 };