NO-JIRA: Rename generated event PACKAGE_NAME, clashes with #defines.

PACKAGE_NAME is a common name for #define macros in legacy code.
Replaced public PACKAGE_NAME, EVENT_NAME with private camelCase members
and added static getFullName()

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1404665 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 13 insertions, 11 deletions

diff --git a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
index 46720e683e..a6043ffa15 100644
--- a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
@@ -35,8 +35,8 @@ using           qpid::management::Args;
 using           qpid::management::Mutex;
 using           std::string;
 
-string  Event/*MGEN:Event.NameCap*/::PACKAGE_NAME  = string ("/*MGEN:Event.NamePackageLower*/");
-string  Event/*MGEN:Event.NameCap*/::EVENT_NAME    = string ("/*MGEN:Event.Name*/");
+string  Event/*MGEN:Event.NameCap*/::packageName  = string ("/*MGEN:Event.NamePackageLower*/");
+string  Event/*MGEN:Event.NameCap*/::eventName    = string ("/*MGEN:Event.Name*/");
 uint8_t Event/*MGEN:Event.NameCap*/::md5Sum[16]   =
     {/*MGEN:Event.SchemaMD5*/};
 
@@ -54,7 +54,7 @@ namespace {
 
 void Event/*MGEN:Event.NameCap*/::registerSelf(ManagementAgent* agent)
 {
-    agent->registerEvent(PACKAGE_NAME, EVENT_NAME, md5Sum, writeSchema);
+    agent->registerEvent(packageName, eventName, md5Sum, writeSchema);
 }
 
 void Event/*MGEN:Event.NameCap*/::writeSchema (std::string& schema)
@@ -66,8 +66,8 @@ void Event/*MGEN:Event.NameCap*/::writeSchema (std::string& schema)
 
     // Schema class header:
     buf.putOctet       (CLASS_KIND_EVENT);
-    buf.putShortString (PACKAGE_NAME); // Package Name
-    buf.putShortString (EVENT_NAME);   // Event Name
+    buf.putShortString (packageName); // Package Name
+    buf.putShortString (eventName);   // Event Name
     buf.putBin128      (md5Sum);      // Schema Hash
     buf.putShort       (/*MGEN:Event.ArgCount*/); // Argument Count
 
@@ -102,5 +102,5 @@ void Event/*MGEN:Event.NameCap*/::mapEncode(::qpid::types::Variant::Map& map) co
 
 bool Event/*MGEN:Event.NameCap*/::match(const std::string& evt, const std::string& pkg)
 {
-    return EVENT_NAME == evt && PACKAGE_NAME == pkg;
+    return eventName == evt && packageName == pkg;
 }
diff --git a/qpid/cpp/managementgen/qmfgen/templates/Event.h b/qpid/cpp/managementgen/qmfgen/templates/Event.h
index e971ffb976..98fd98d44d 100644
--- a/qpid/cpp/managementgen/qmfgen/templates/Event.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Event.h
@@ -34,27 +34,29 @@ QPID_BROKER_CLASS_EXTERN class Event/*MGEN:Event.NameCap*/ : public ::qpid::mana
   private:
     static void writeSchema (std::string& schema);
     static uint8_t md5Sum[MD5_LEN];
+    static std::string packageName;
+    static std::string eventName;
 
 /*MGEN:Event.ArgDeclarations*/
 
   public:
-    QPID_BROKER_EXTERN static std::string PACKAGE_NAME;
-    QPID_BROKER_EXTERN static std::string EVENT_NAME;
-
     writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; }
 
     QPID_BROKER_EXTERN Event/*MGEN:Event.NameCap*/(/*MGEN:Event.ConstructorArgs*/);
     QPID_BROKER_EXTERN ~Event/*MGEN:Event.NameCap*/() {};
 
     static void registerSelf(::qpid::management::ManagementAgent* agent);
-    std::string& getPackageName() const { return PACKAGE_NAME; }
-    std::string& getEventName() const { return EVENT_NAME; }
+    std::string& getPackageName() const { return packageName; }
+    std::string& getEventName() const { return eventName; }
     uint8_t* getMd5Sum() const { return md5Sum; }
     uint8_t getSeverity() const { return /*MGEN:Event.Severity*/; }
     QPID_BROKER_EXTERN void encode(std::string& buffer) const;
     QPID_BROKER_EXTERN void mapEncode(::qpid::types::Variant::Map& map) const;
 
     QPID_BROKER_EXTERN static bool match(const std::string& evt, const std::string& pkg);
+    static std::pair<std::string,std::string> getFullName() {
+        return std::make_pair(packageName, eventName);
+    }
 };
 
 }/*MGEN:Event.CloseNamespaces*/