BMessageFieldHeaderNode{Child} -> BMessageFieldNode{Child}

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42355 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent
2011-07-01 02:40:16 +00:00
parent 698ad09748
commit fd47185941
2 changed files with 33 additions and 33 deletions
@@ -331,8 +331,8 @@ BMessageValueNode::CreateChildren()
i++) { i++) {
// TODO: split FieldHeaderNode into two variants in order to // TODO: split FieldHeaderNode into two variants in order to
// present fields with a count of 1 without subindices. // present fields with a count of 1 without subindices.
BMessageFieldHeaderNodeChild* node = new(std::nothrow) BMessageFieldNodeChild* node = new(std::nothrow)
BMessageFieldHeaderNodeChild(this, name, type, count); BMessageFieldNodeChild(this, name, type, count);
if (node == NULL) if (node == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -361,10 +361,10 @@ BMessageValueNode::ChildAt(int32 index) const
} }
// #pragma mark - BMessageValueNode::BMessageFieldHeaderNode // #pragma mark - BMessageValueNode::BMessageFieldNode
BMessageValueNode::BMessageFieldHeaderNode::BMessageFieldHeaderNode( BMessageValueNode::BMessageFieldNode::BMessageFieldNode(
BMessageFieldHeaderNodeChild *child, BMessageValueNode* parent, BMessageFieldNodeChild *child, BMessageValueNode* parent,
const BString &name, type_code type, int32 count) const BString &name, type_code type, int32 count)
: :
ValueNode(child), ValueNode(child),
@@ -379,7 +379,7 @@ BMessageValueNode::BMessageFieldHeaderNode::BMessageFieldHeaderNode(
} }
BMessageValueNode::BMessageFieldHeaderNode::~BMessageFieldHeaderNode() BMessageValueNode::BMessageFieldNode::~BMessageFieldNode()
{ {
fParent->ReleaseReference(); fParent->ReleaseReference();
fType->ReleaseReference(); fType->ReleaseReference();
@@ -387,34 +387,34 @@ BMessageValueNode::BMessageFieldHeaderNode::~BMessageFieldHeaderNode()
Type* Type*
BMessageValueNode::BMessageFieldHeaderNode::GetType() const BMessageValueNode::BMessageFieldNode::GetType() const
{ {
return fType; return fType;
} }
status_t status_t
BMessageValueNode::BMessageFieldHeaderNode::CreateChildren() BMessageValueNode::BMessageFieldNode::CreateChildren()
{ {
return B_OK; return B_OK;
} }
int32 int32
BMessageValueNode::BMessageFieldHeaderNode::CountChildren() const BMessageValueNode::BMessageFieldNode::CountChildren() const
{ {
return 0; return 0;
} }
ValueNodeChild* ValueNodeChild*
BMessageValueNode::BMessageFieldHeaderNode::ChildAt(int32 index) const BMessageValueNode::BMessageFieldNode::ChildAt(int32 index) const
{ {
return NULL; return NULL;
} }
status_t status_t
BMessageValueNode::BMessageFieldHeaderNode::ResolvedLocationAndValue( BMessageValueNode::BMessageFieldNode::ResolvedLocationAndValue(
ValueLoader* loader, ValueLocation *& _location, Value*& _value) ValueLoader* loader, ValueLocation *& _location, Value*& _value)
{ {
_location = fParent->Location(); _location = fParent->Location();
@@ -424,10 +424,10 @@ BMessageValueNode::BMessageFieldHeaderNode::ResolvedLocationAndValue(
} }
// #pragma mark - BMessageValueNode::BMessageFieldHeaderNodeChild // #pragma mark - BMessageValueNode::BMessageFieldNodeChild
BMessageValueNode::BMessageFieldHeaderNodeChild::BMessageFieldHeaderNodeChild( BMessageValueNode::BMessageFieldNodeChild::BMessageFieldNodeChild(
BMessageValueNode* parent, const BString &name, type_code type, BMessageValueNode* parent, const BString &name, type_code type,
int32 count) int32 count)
: :
@@ -443,7 +443,7 @@ BMessageValueNode::BMessageFieldHeaderNodeChild::BMessageFieldHeaderNodeChild(
} }
BMessageValueNode::BMessageFieldHeaderNodeChild::~BMessageFieldHeaderNodeChild() BMessageValueNode::BMessageFieldNodeChild::~BMessageFieldNodeChild()
{ {
fParent->ReleaseReference(); fParent->ReleaseReference();
fType->ReleaseReference(); fType->ReleaseReference();
@@ -451,39 +451,39 @@ BMessageValueNode::BMessageFieldHeaderNodeChild::~BMessageFieldHeaderNodeChild()
const BString& const BString&
BMessageValueNode::BMessageFieldHeaderNodeChild::Name() const BMessageValueNode::BMessageFieldNodeChild::Name() const
{ {
return fName; return fName;
} }
Type* Type*
BMessageValueNode::BMessageFieldHeaderNodeChild::GetType() const BMessageValueNode::BMessageFieldNodeChild::GetType() const
{ {
return fType; return fType;
} }
ValueNode* ValueNode*
BMessageValueNode::BMessageFieldHeaderNodeChild::Parent() const BMessageValueNode::BMessageFieldNodeChild::Parent() const
{ {
return fParent; return fParent;
} }
bool bool
BMessageValueNode::BMessageFieldHeaderNodeChild::IsInternal() const BMessageValueNode::BMessageFieldNodeChild::IsInternal() const
{ {
return true; return true;
} }
status_t status_t
BMessageValueNode::BMessageFieldHeaderNodeChild::CreateInternalNode( BMessageValueNode::BMessageFieldNodeChild::CreateInternalNode(
ValueNode*& _node) ValueNode*& _node)
{ {
BMessageFieldHeaderNode* node = new(std::nothrow) BMessageFieldNode* node = new(std::nothrow)
BMessageFieldHeaderNode(this, fParent, fName, fFieldType, fFieldCount); BMessageFieldNode(this, fParent, fName, fFieldType, fFieldCount);
if (node == NULL) if (node == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -493,7 +493,7 @@ BMessageValueNode::BMessageFieldHeaderNodeChild::CreateInternalNode(
status_t status_t
BMessageValueNode::BMessageFieldHeaderNodeChild::ResolveLocation( BMessageValueNode::BMessageFieldNodeChild::ResolveLocation(
ValueLoader* valueLoader, ValueLocation*& _location) ValueLoader* valueLoader, ValueLocation*& _location)
{ {
_location = fParent->Location(); _location = fParent->Location();
@@ -36,12 +36,12 @@ public:
{ return fMessageType; } { return fMessageType; }
private: private:
class BMessageFieldHeaderNode; class BMessageFieldNode;
class BMessageFieldHeaderNodeChild; class BMessageFieldNodeChild;
// for GCC2 // for GCC2
friend class BMessageFieldHeaderNode; friend class BMessageFieldNode;
friend class BMessageFieldHeaderNodeChild; friend class BMessageFieldNodeChild;
typedef BObjectList<ValueNodeChild> ChildNodeList; typedef BObjectList<ValueNodeChild> ChildNodeList;
@@ -53,15 +53,15 @@ private:
}; };
class BMessageValueNode::BMessageFieldHeaderNode : public ValueNode { class BMessageValueNode::BMessageFieldNode : public ValueNode {
public: public:
BMessageFieldHeaderNode( BMessageFieldNode(
BMessageFieldHeaderNodeChild *child, BMessageFieldNodeChild *child,
BMessageValueNode* parent, BMessageValueNode* parent,
const BString& name, const BString& name,
type_code type, int32 count); type_code type, int32 count);
virtual ~BMessageFieldHeaderNode(); virtual ~BMessageFieldNode();
virtual Type* GetType() const; virtual Type* GetType() const;
@@ -83,14 +83,14 @@ private:
}; };
class BMessageValueNode::BMessageFieldHeaderNodeChild : public ValueNodeChild { class BMessageValueNode::BMessageFieldNodeChild : public ValueNodeChild {
public: public:
BMessageFieldHeaderNodeChild( BMessageFieldNodeChild(
BMessageValueNode* parent, BMessageValueNode* parent,
const BString &name, const BString &name,
type_code type, int32 count); type_code type, int32 count);
virtual ~BMessageFieldHeaderNodeChild(); virtual ~BMessageFieldNodeChild();
virtual const BString& Name() const; virtual const BString& Name() const;
virtual Type* GetType() const; virtual Type* GetType() const;