ENH: Added cable class-set expansion and tagging for alternate name generation. This should make the generated wrappers much easier to setup and use.

1 files changed, 13 insertions, 5 deletions

diff --git a/Source/cmCableClassSet.h b/Source/cmCableClassSet.h
index 4263952..a21fa83 100644
--- a/Source/cmCableClassSet.h
+++ b/Source/cmCableClassSet.h
@@ -53,14 +53,23 @@ class cmCableClass
 {
 public:
   typedef std::set<std::string> Sources;
+  cmCableClass() {}
+  cmCableClass(const std::string& tag): m_Tag(tag) {}
   
   void AddSources(const Sources& sources);
   void AddSource(const char*);
 
   Sources::const_iterator SourcesBegin() const { return m_Sources.begin(); }
   Sources::const_iterator SourcesEnd() const { return m_Sources.end(); }
+
+  const std::string& GetTag() const { return m_Tag; }
+  
+private:  
+  /**
+   * The tag name of this class.
+   */
+  std::string m_Tag;
   
-private:
   /**
    * Store the set of source files (headers) needed to define this class.
    */
@@ -75,22 +84,21 @@ class cmCableClassSet: public cmData
 {
 public:
   cmCableClassSet(const char* name): cmData(name) {}
-  virtual ~cmCableClassSet() {}
+  virtual ~cmCableClassSet();
 
   /**
    * The set is stored internally as a map from class name to cmCableClass
    * instance.
    */
-  typedef std::map<std::string, cmCableClass> CableClassMap;
+  typedef std::map<std::string, cmCableClass*> CableClassMap;
   
-  void AddClass(const char*, const cmCableClass&);
+  void AddClass(const char*, cmCableClass*);
   void AddSource(const char* name);
   unsigned int Size() const;
   CableClassMap::const_iterator Begin() const;
   CableClassMap::const_iterator End() const;
 
   void ParseAndAddElement(const char*, cmMakefile*);
-  void AddCableClassSet(const cmCableClassSet&, const cmCableClass::Sources&);
   
 private:
   /**