The tree now builds up to the point of running swig.

Changes:
  1) Cleaned up the Schema definitions to match the wiki documentation for QMFv2
     a) Combined "argument" into "property" and eliminated "argument"
     b) Removed the distinction between ObjectClass and EventClass
        Event classes are now represented as Object classes without methods
  2) Removed old buffer-codec encode/decode for schema types and replaced them with
     map-based equivalents.



git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qmf-devel0.7@912022 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/qpid/cpp/src/qmf/engine/ObjectImpl.cpp b/qpid/cpp/src/qmf/engine/ObjectImpl.cpp
index 4256b9119e..353b16ee37 100644
--- a/qpid/cpp/src/qmf/engine/ObjectImpl.cpp
+++ b/qpid/cpp/src/qmf/engine/ObjectImpl.cpp
@@ -31,7 +31,7 @@ ObjectImpl::ObjectImpl() :
 }
 
 
-ObjectImpl::ObjectImpl(SchemaObjectClass* type) :
+ObjectImpl::ObjectImpl(SchemaClass* type) :
     objectClass(type), createTime(uint64_t(Duration(now()))), destroyTime(0), lastUpdatedTime(createTime)
 {
 }
@@ -54,13 +54,13 @@ void ObjectImpl::destroy()
 //==================================================================
 
 Object::Object() : impl(new ObjectImpl()) {}
-Object::Object(SchemaObjectClass* type) : impl(new ObjectImpl(type)) {}
+Object::Object(SchemaClass* type) : impl(new ObjectImpl(type)) {}
 Object::Object(const Object& from) : impl(new ObjectImpl(*(from.impl))) {}
 Object::~Object() { delete impl; }
 const Variant::Map& Object::getValues() const { return impl->getValues(); }
 Variant::Map& Object::getValues() { return impl->getValues(); }
-const SchemaObjectClass* Object::getSchema() const { return impl->getSchema(); }
-void Object::setSchema(SchemaObjectClass* schema) { impl->setSchema(schema); }
+const SchemaClass* Object::getSchema() const { return impl->getSchema(); }
+void Object::setSchema(SchemaClass* schema) { impl->setSchema(schema); }
 const char* Object::getKey() const { return impl->getKey(); }
 void Object::setKey(const char* key) { impl->setKey(key); }
 void Object::touch() { impl->touch(); }