BUG: some UNIX fixes for my m_ commit

5 files changed, 51 insertions, 51 deletions

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 057c453..05289d0 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -976,9 +976,9 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   if(shared)
     {
     defFlags += "-D";
-    if(const char* custothis->export_name = target.GetProperty("DEFINE_SYMBOL"))
+    if(const char* custom_export_name = target.GetProperty("DEFINE_SYMBOL"))
       {
-      defFlags += custothis->export_name;
+      defFlags += custom_export_name;
       }
     else
       {
@@ -1401,7 +1401,7 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   target->AddAttribute("dependencies", dependencies);
   target->AddAttribute("name", this->CreateString(productName.c_str()));
   target->AddAttribute("productName",this->CreateString(productName.c_str()));
-  target->SetcmTarget(&cmtarget);
+  target->SetTarget(&cmtarget);
   return target;
 }
 
@@ -1496,7 +1496,7 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmTarget& cmtarget,
                        this->CreateObjectReference(fileRef));
   target->AddAttribute("productType", 
                        this->CreateString(productTypeString.c_str()));
-  target->SetcmTarget(&cmtarget);
+  target->SetTarget(&cmtarget);
   return target;
 }
 
@@ -1511,7 +1511,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::FindXCodeTarget(cmTarget* t)
       i != this->XCodeObjects.end(); ++i)
     {
     cmXCodeObject* o = *i;
-    if(o->GetcmTarget() == t)
+    if(o->GetTarget() == t)
       {
       return o;
       }
@@ -1553,7 +1553,7 @@ void cmGlobalXCodeGenerator::AddDependTarget(cmXCodeObject* target,
                             this->CreateObjectReference(dependTarget));
     container->AddAttribute("remoteInfo", 
                             this->CreateString(
-                              dependTarget->GetcmTarget()->GetName()));
+                              dependTarget->GetTarget()->GetName()));
     targetdep = 
       this->CreateObject(cmXCodeObject::PBXTargetDependency);
     targetdep->SetComment("PBXTargetDependency");
@@ -1645,7 +1645,7 @@ void cmGlobalXCodeGenerator::AppendBuildSettingAttribute(cmXCodeObject* target,
 //----------------------------------------------------------------------------
 void cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target)
 {
-  cmTarget* cmtarget = target->GetcmTarget();
+  cmTarget* cmtarget = target->GetTarget();
   if(!cmtarget)
     {
     cmSystemTools::Error("Error no target on xobject\n");
@@ -1662,8 +1662,8 @@ void cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target)
     emitted.insert(cmtarget->GetName());
 
     // Loop over all library dependencies.
-    const cmTarget::LinkLibraries& tlibs = cmtarget->GetLinkLibraries();
-    for(cmTarget::LinkLibraries::const_iterator lib = tlibs.begin();
+    const cmTarget::LinkLibraryVectorType& tlibs = cmtarget->GetLinkLibraries();
+    for(cmTarget::LinkLibraryVectorType::const_iterator lib = tlibs.begin();
         lib != tlibs.end(); ++lib)
       {
       // Don't emit the same library twice for this target.
@@ -2064,7 +2064,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         i != targets.end(); ++i)
       {
       cmXCodeObject* target = *i;
-      cmTarget* t =target->GetcmTarget();
+      cmTarget* t =target->GetTarget();
       if(t->GetType() == cmTarget::EXECUTABLE ||
          t->GetType() == cmTarget::SHARED_LIBRARY ||
          t->GetType() == cmTarget::MODULE_LIBRARY)
@@ -2120,7 +2120,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         i != targets.end(); ++i)
       {
       cmXCodeObject* target = *i;
-      cmTarget* t =target->GetcmTarget();
+      cmTarget* t =target->GetTarget();
       if(t->GetType() == cmTarget::EXECUTABLE ||
          t->GetType() == cmTarget::SHARED_LIBRARY ||
          t->GetType() == cmTarget::MODULE_LIBRARY)
@@ -2363,7 +2363,7 @@ std::string cmGlobalXCodeGenerator::LookupFlags(const char* varNamePrefix,
     varName += varNameLang;
     varName += varNameSuffix;
     if(const char* varValue =
-       m_CurrentMakefile->GetDefinition(varName.c_str()))
+       this->CurrentMakefile->GetDefinition(varName.c_str()))
       {
       if(*varValue)
         {
diff --git a/Source/cmMakeDepend.cxx b/Source/cmMakeDepend.cxx
index 31b4d9c..d0e0827 100644
--- a/Source/cmMakeDepend.cxx
+++ b/Source/cmMakeDepend.cxx
@@ -113,11 +113,11 @@ void cmMakeDepend::GenerateDependInformation(cmDependInformation* info)
 
   // See if the cmSourceFile for it has any files specified as
   // dependency hints.
-  if(info->cmSourceFile != 0)
+  if(info->SourceFile != 0)
     {
 
     // Get the cmSourceFile corresponding to this.
-    const cmSourceFile& cFile = *(info->cmSourceFile);
+    const cmSourceFile& cFile = *(info->SourceFile);
     // See if there are any hints for finding dependencies for the missing
     // file.
     if(!cFile.GetDepends().empty())
@@ -280,7 +280,7 @@ void cmMakeDepend::GenerateMakefileDependencies()
         cmDependInformation* info =
           this->GetDependInformation((*i)->GetFullPath().c_str(),0);
         this->AddFileToSearchPath(info->FullPath.c_str());
-        info->cmSourceFile = *i;
+        info->SourceFile = *i;
         this->GenerateDependInformation(info);
         }
       }
@@ -389,7 +389,7 @@ cmMakeDepend::GetDependInformationForSourceFile(const cmSourceFile &sf) const
       i != this->DependInformationMap.end(); ++i)
     {
     const cmDependInformation* info = i->second;
-    if(info->cmSourceFile == &sf)
+    if(info->SourceFile == &sf)
       {
       return info;
       }
diff --git a/Source/cmMakeDepend.h b/Source/cmMakeDepend.h
index 2bf7adf..8426dfa 100644
--- a/Source/cmMakeDepend.h
+++ b/Source/cmMakeDepend.h
@@ -34,7 +34,7 @@ public:
    * Construct with dependency generation marked not done; instance
    * not placed in cmMakefile's list.
    */
-  cmDependInformation(): DependDone(false), cmSourceFile(0) {}
+  cmDependInformation(): DependDone(false), SourceFile(0) {}
 
   /**
    * The set of files on which this one depends.
@@ -52,7 +52,7 @@ public:
    * If this object corresponds to a cmSourceFile instance, this points
    * to it.
    */
-  const cmSourceFile *cmSourceFile;
+  const cmSourceFile *SourceFile;
   
   /**
    * Full path to this file.
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index da6bcfb..6f9af35 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -23,8 +23,8 @@ cmXCodeObject::~cmXCodeObject()
 cmXCodeObject::cmXCodeObject(PBXType ptype, Type type)
 {
   this->Version = 15;
-  this->PBXTargetDependency = 0;
-  this->cmTarget = 0;
+  this->PBXTargetDependencyValue = 0;
+  this->Target = 0;
   this->Object =0;
   
   this->IsA = ptype;
@@ -50,8 +50,8 @@ cmXCodeObject::cmXCodeObject(PBXType ptype, Type type)
       this->Id += "0";
       }
     }
-  this->Type = type;
-  if(this->Type == OBJECT)
+  this->TypeValue = type;
+  if(this->TypeValue == OBJECT)
     {
     this->AddAttribute("isa", 0);
     }
@@ -79,7 +79,7 @@ void cmXCodeObject::Print(std::ostream& out)
     }
   cmXCodeObject::Indent(2*indentFactor, out);
   out << this->Id << " ";
-  if(!(this->this->IsA == PBXGroup && this->this->Comment.size() == 0))
+  if(!(this->IsA == PBXGroup && this->Comment.size() == 0))
     {
     this->PrintComment(out);
     }
@@ -102,20 +102,20 @@ void cmXCodeObject::Print(std::ostream& out)
       {
       continue;
       }
-    if(object->this->Type == OBJECT_LIST)
+    if(object->TypeValue == OBJECT_LIST)
       {
       out << i->first << " = (" << separator;
-      for(unsigned int k = 0; k < i->second->this->List.size(); k++)
+      for(unsigned int k = 0; k < i->second->List.size(); k++)
         {
         cmXCodeObject::Indent(4*indentFactor, out);
-        out << i->second->this->List[k]->this->Id << " ";
-        i->second->this->List[k]->PrintComment(out);
+        out << i->second->List[k]->Id << " ";
+        i->second->List[k]->PrintComment(out);
         out << "," << separator;
         } 
       cmXCodeObject::Indent(3*indentFactor, out);
       out << ");" << separator;
       }
-    else if(object->this->Type == ATTRIBUTE_GROUP)
+    else if(object->TypeValue == ATTRIBUTE_GROUP)
       {
       std::map<cmStdString, cmXCodeObject*>::iterator j;
       out << i->first << " = {" << separator;
@@ -123,25 +123,25 @@ void cmXCodeObject::Print(std::ostream& out)
             object->ObjectAttributes.end(); ++j)
         {
         cmXCodeObject::Indent(4 *indentFactor, out);
-        out << j->first << " = " << j->second->this->String << ";";
+        out << j->first << " = " << j->second->String << ";";
         out << separator;
         }
       cmXCodeObject::Indent(3 *indentFactor, out);
       out << "};" << separator;
       }
-    else if(object->this->Type == OBJECT_REF)
+    else if(object->TypeValue == OBJECT_REF)
       {
-      out << i->first << " = " << object->this->Object->this->Id;
-      if(object->this->Object->HasComment() && i->first != "remoteGlobalIDString")
+      out << i->first << " = " << object->Object->Id;
+      if(object->Object->HasComment() && i->first != "remoteGlobalIDString")
         {
         out << " ";
-        object->this->Object->PrintComment(out);
+        object->Object->PrintComment(out);
         }
       out << ";" << separator;
       }
-    else if(object->this->Type == STRING)
+    else if(object->TypeValue == STRING)
       {
-      out << i->first << " = " << object->this->String << ";" << separator;
+      out << i->first << " = " << object->String << ";" << separator;
       }
     else
       {
@@ -160,7 +160,7 @@ void cmXCodeObject::PrintList(std::vector<cmXCodeObject*> const& objs,
   out << "objects = {\n";
   for(unsigned int i = 0; i < objs.size(); ++i)
     {
-    if(objs[i]->this->Type == OBJECT)
+    if(objs[i]->TypeValue == OBJECT)
       {
       objs[i]->Print(out);
       }
@@ -172,10 +172,10 @@ void cmXCodeObject::PrintList(std::vector<cmXCodeObject*> const& objs,
 
 void cmXCodeObject::CopyAttributes(cmXCodeObject* copy)
 {
-  this->this->ObjectAttributes = copy->this->ObjectAttributes;
-  this->this->List = copy->this->List;
-  this->this->String = copy->this->String;
-  this->this->Object = copy->this->Object;
+  this->ObjectAttributes = copy->ObjectAttributes;
+  this->List = copy->List;
+  this->String = copy->String;
+  this->Object = copy->Object;
 }
 
 void cmXCodeObject::SetString(const char* s)
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index e564c6f..8db8f45 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -22,7 +22,7 @@ public:
   static const char* PBXTypeNames[];
   virtual ~cmXCodeObject();
   cmXCodeObject(PBXType ptype, Type type);
-  Type GetType() { return this->Type;}
+  Type GetType() { return this->TypeValue;}
   PBXType GetIsA() { return this->IsA;}
 
   void SetString(const char* s);
@@ -68,13 +68,13 @@ public:
     {
       return this->Id.c_str();
     }
-  cmTarget* GetcmTarget()
+  cmTarget* GetTarget()
     {
-      return this->cmTarget;
+      return this->Target;
     }
-  void SetcmTarget(cmTarget* t)
+  void SetTarget(cmTarget* t)
     {
-      this->cmTarget = t;
+      this->Target = t;
     }
   const char* GetComment() {return this->Comment.c_str();}
   bool HasComment() { return (this->Comment.size() !=  0);}
@@ -93,7 +93,7 @@ public:
           i != this->List.end(); ++i)
         {
         cmXCodeObject* o = *i;
-        if(o->this->IsA == t)
+        if(o->IsA == t)
           {
           return o;
           }
@@ -103,11 +103,11 @@ public:
   
   cmXCodeObject* GetPBXTargetDependency()
     {
-      return this->PBXTargetDependency;
+      return this->PBXTargetDependencyValue;
     }
   void SetPBXTargetDependency(cmXCodeObject* d)
     {
-      this->PBXTargetDependency = d;
+      this->PBXTargetDependencyValue = d;
     }
   void CopyAttributes(cmXCodeObject* );
   
@@ -127,15 +127,15 @@ public:
   std::vector<cmXCodeObject*> const& GetObjectList() { return this->List;}
   void SetComment(const char* c) { this->Comment = c;}
 protected:
-  cmTarget* cmTarget;
-  Type Type;
+  cmTarget* Target;
+  Type TypeValue;
   cmStdString Id;
   PBXType IsA;
   int Version;
   cmStdString Comment;
   cmStdString String;
   cmXCodeObject* Object;
-  cmXCodeObject* PBXTargetDependency;
+  cmXCodeObject* PBXTargetDependencyValue;
   std::vector<cmXCodeObject*> List;
   std::map<cmStdString, StringVec> DependLibraries;
   std::map<cmStdString, cmXCodeObject*> ObjectAttributes;