[cmake-commits] king committed cmCPluginAPI.cxx 1.36 1.37 cmFLTKWrapUICommand.cxx 1.34 1.35 cmQTWrapCPPCommand.cxx 1.23 1.24 cmQTWrapUICommand.cxx 1.23 1.24 cmSourceFile.h 1.19 1.20

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv12413

Modified Files:
	cmCPluginAPI.cxx cmFLTKWrapUICommand.cxx 
	cmQTWrapCPPCommand.cxx cmQTWrapUICommand.cxx cmSourceFile.h 
Log Message:
ENH: Made cmSourceFile::GetDepends return reference to const so dependencies can be added only by an access method in cmSourceFile.


Index: cmQTWrapUICommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmQTWrapUICommand.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cmQTWrapUICommand.cxx	12 May 2006 17:44:15 -0000	1.23
+++ cmQTWrapUICommand.cxx	28 May 2007 14:11:44 -0000	1.24
@@ -86,10 +86,10 @@
       std::string hname = header_file.GetFullPath();
       this->WrapUserInterface.push_back(origname);
       // add starting depends
-      moc_file.GetDepends().push_back(hname);
-      source_file.GetDepends().push_back(hname);
-      source_file.GetDepends().push_back(origname);
-      header_file.GetDepends().push_back(origname);
+      moc_file.AddDepend(hname.c_str());
+      source_file.AddDepend(hname.c_str());
+      source_file.AddDepend(origname.c_str());
+      header_file.AddDepend(origname.c_str());
       this->WrapHeadersClasses.push_back(header_file);
       this->WrapSourcesClasses.push_back(source_file);
       this->WrapMocClasses.push_back(moc_file);

Index: cmFLTKWrapUICommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFLTKWrapUICommand.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- cmFLTKWrapUICommand.cxx	28 May 2007 13:59:08 -0000	1.34
+++ cmFLTKWrapUICommand.cxx	28 May 2007 14:11:44 -0000	1.35
@@ -94,8 +94,8 @@
                                            no_working_dir);
 
       cmSourceFile *sf = this->Makefile->GetSource(cxxres.c_str());
-      sf->GetDepends().push_back(hname);
-      sf->GetDepends().push_back(origname);
+      sf->AddDepend(hname.c_str());
+      sf->AddDepend(origname.c_str());
       this->GeneratedSourcesClasses.push_back(sf);
       }
     }

Index: cmCPluginAPI.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCPluginAPI.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- cmCPluginAPI.cxx	13 Mar 2007 19:18:27 -0000	1.36
+++ cmCPluginAPI.cxx	28 May 2007 14:11:44 -0000	1.37
@@ -555,7 +555,7 @@
 void CCONV cmSourceFileAddDepend(void *arg, const char *depend)
 {
   cmSourceFile *sf = static_cast<cmSourceFile *>(arg);
-  sf->GetDepends().push_back(depend);
+  sf->AddDepend(depend);
 }
 
 void CCONV cmSourceFileSetName(void *arg, const char* name, const char* dir,

Index: cmSourceFile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSourceFile.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cmSourceFile.h	13 Dec 2006 17:19:59 -0000	1.19
+++ cmSourceFile.h	28 May 2007 14:11:44 -0000	1.20
@@ -102,7 +102,7 @@
    * Return the vector that holds the list of dependencies
    */
   const std::vector<std::string> &GetDepends() const {return this->Depends;}
-  std::vector<std::string> &GetDepends() {return this->Depends;}
+  void AddDepend(const char* d) { this->Depends.push_back(d); }
 
   /**
    * Get the source name without last extension

Index: cmQTWrapCPPCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmQTWrapCPPCommand.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cmQTWrapCPPCommand.cxx	12 May 2006 17:44:15 -0000	1.23
+++ cmQTWrapCPPCommand.cxx	28 May 2007 14:11:44 -0000	1.24
@@ -82,7 +82,7 @@
         }
       this->WrapHeaders.push_back(hname);
       // add starting depends
-      file.GetDepends().push_back(hname);
+      file.AddDepend(hname.c_str());
       this->WrapClasses.push_back(file);
       if (sourceListValue.size() > 0)
         {