Updates to the V2-style qmf-generation templates:

  1) Added include directives in the .h template for convenience
  2) Moved the schema-registration out of the class constructor and into a method.


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

2 files changed, 5 insertions, 3 deletions

diff --git a/cpp/managementgen/qmfgen/templates/V2Package.cpp b/cpp/managementgen/qmfgen/templates/V2Package.cpp
index 2c87805bdb..2b6e231fe9 100644
--- a/cpp/managementgen/qmfgen/templates/V2Package.cpp
+++ b/cpp/managementgen/qmfgen/templates/V2Package.cpp
@@ -29,7 +29,7 @@
 using namespace std;
 using namespace qmf::/*MGEN:Schema.Namespace*/;
 
-PackageDefinition::PackageDefinition(::qmf::AgentSession& session)
+void PackageDefinition::configure(::qmf::AgentSession& session)
 {
     string package("/*MGEN:Schema.PackageName*/");
 /*MGEN:Schema.V2ClassDefines*/
diff --git a/cpp/managementgen/qmfgen/templates/V2Package.h b/cpp/managementgen/qmfgen/templates/V2Package.h
index 663a69ac86..1d4f907ab3 100644
--- a/cpp/managementgen/qmfgen/templates/V2Package.h
+++ b/cpp/managementgen/qmfgen/templates/V2Package.h
@@ -25,6 +25,8 @@
 
 #include <qmf/AgentSession.h>
 #include <qmf/Schema.h>
+#include <qmf/Data.h>
+#include <qmf/DataAddr.h>
 
 namespace qmf {
 /*MGEN:Class.OpenNamespaces*/
@@ -32,8 +34,8 @@ namespace qmf {
 class PackageDefinition
 {
   public:
-    PackageDefinition (::qmf::AgentSession& session);
-    ~PackageDefinition () {}
+    ~PackageDefinition() {}
+    void configure(::qmf::AgentSession& session);
 
 /*MGEN:Schema.V2ClassMembers*/
 };