INTEGRATION: CWS configrefactor01 (1.3.84); FILE MERGED

2007/01/16 12:18:26 mmeeks 1.3.84.1: Submitted by: mmeeks
Kill 'memory::Segment' - no longer needed.
Bin some other (empty / redundant) headers.
This commit is contained in:
Ivo Hinkelmann 2007-11-23 13:45:57 +00:00
parent 056044e1c9
commit 6e4738b5f2
2 changed files with 5 additions and 16 deletions

View file

@ -4,9 +4,9 @@
*
* $RCSfile: directview.hxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2005-09-08 04:29:14 $
* last change: $Author: ihi $ $Date: 2007-11-23 14:42:13 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -66,11 +66,6 @@ namespace configmgr
virtual bool doHasChanges(Node const& _aNode) const;
virtual void doMarkChanged(Node const& _aNode);
// direct data access
virtual void doReleaseDataSegment() { m_aTreeSegment.clear(); }
virtual memory::Segment const * doGetDataSegment() const { return m_aTreeSegment.getSegment(); }
virtual memory::Segment * doGetDataSegmentForUpdate() { return m_aTreeSegment.getSegment(); }
// common attributes
virtual node::Attributes doAdjustAttributes(node::Attributes const& _aAttributes) const;

View file

@ -4,9 +4,9 @@
*
* $RCSfile: readonlyview.hxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: rt $ $Date: 2005-09-08 04:33:00 $
* last change: $Author: ihi $ $Date: 2007-11-23 14:45:57 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -51,12 +51,9 @@ namespace configmgr
class ReadOnlyViewStrategy : public ViewStrategy
{
memory::Segment const * m_pSegment;
public:
explicit
ReadOnlyViewStrategy(memory::Segment const * _pSegment)
: m_pSegment(_pSegment)
{}
ReadOnlyViewStrategy() {}
protected:
// change handling -required
@ -73,9 +70,6 @@ namespace configmgr
virtual void doInsertElement(SetNode const& _aNode, Name const& aName, SetNodeEntry const& aNewEntry);
virtual void doRemoveElement(SetNode const& _aNode, Name const& aName);
virtual void doReleaseDataSegment() { m_pSegment = NULL; }
virtual memory::Segment const * doGetDataSegment() const { return m_pSegment; }
virtual NodeFactory& doGetNodeFactory();
private:
void failReadOnly() const;