QPID-1174 - Management updates for remote agents

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

2 files changed, 6 insertions, 6 deletions

diff --git a/qpid/cpp/managementgen/schema.py b/qpid/cpp/managementgen/schema.py
index eb0b066b62..25284a14f7 100755
--- a/qpid/cpp/managementgen/schema.py
+++ b/qpid/cpp/managementgen/schema.py
@@ -577,7 +577,7 @@ class SchemaMethod:
     return self.name
 
   def getFullName (self):
-    return self.parent.getName().capitalize() + self.name[0:1].upper() +\
+    return capitalize(self.parent.getName()) + self.name[0:1].upper() +\
            self.name[1:]
 
   def getArgCount (self):
@@ -644,7 +644,7 @@ class SchemaEvent:
     return self.name
 
   def getFullName (self):
-    return self.parent.getName ().capitalize() + self.name.capitalize ()
+    return capitalize(self.parent.getName()) + capitalize(self.name)
 
   def getArgCount (self):
     return len (self.args)
@@ -938,7 +938,7 @@ class SchemaClass:
       method.genSchema (stream, variables)
 
   def genNameCap (self, stream, variables):
-    stream.write (self.name.capitalize ())
+    stream.write (capitalize(self.name))
 
   def genNameLower (self, stream, variables):
     stream.write (self.name.lower ())
diff --git a/qpid/cpp/managementgen/templates/Class.h b/qpid/cpp/managementgen/templates/Class.h
index 8a4dc1006a..fac63d5d55 100644
--- a/qpid/cpp/managementgen/templates/Class.h
+++ b/qpid/cpp/managementgen/templates/Class.h
@@ -86,9 +86,9 @@ class /*MGEN:Class.NameCap*/ : public ManagementObject
 
     /*MGEN:Class.SetGeneralReferenceDeclaration*/
 
-    std::string getPackageName (void) { return packageName; }
-    std::string getClassName   (void) { return className; }
-    uint8_t*    getMd5Sum      (void) { return md5Sum; }
+    std::string& getPackageName (void) { return packageName; }
+    std::string& getClassName   (void) { return className; }
+    uint8_t*     getMd5Sum      (void) { return md5Sum; }
 
     // Method IDs
 /*MGEN:Class.MethodIdDeclarations*/