diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:27:05 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:27:05 +0000 |
| commit | 66c0bd6f437d24287ad78b28ec8cb5fd88203dba (patch) | |
| tree | b028159edba7ab0807d9abf5ed4b50dc8f57903a /configmgr/source/inc | |
| parent | 19c1f433b94675192e091b309a2150379103825f (diff) | |
INTEGRATION: CWS configrefactor01 (1.5.84); FILE MERGED
2007/01/11 10:35:32 mmeeks 1.5.84.2: Submitted by: mmeeks
Large scale re-factoring, remove fine-grained locking in favor of a simple,
single global lock (still in progress).
Identify and fix various hot-spots.
Remove otherwise empty / non-compiled files.
Kill UpdateAccessor
2007/01/08 20:48:57 mmeeks 1.5.84.1: Issue number:
Submitted by: mmeeks
Substantial configmgr re-factoring #1 ...
+ remove endless typedef chains
+ remove custom allocator & associated complexity
+ remove Pointer, and 'Address' classes
Diffstat (limited to 'configmgr/source/inc')
| -rw-r--r-- | configmgr/source/inc/updatehelper.hxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/configmgr/source/inc/updatehelper.hxx b/configmgr/source/inc/updatehelper.hxx index 0eeaed00048b..f138638d9388 100644 --- a/configmgr/source/inc/updatehelper.hxx +++ b/configmgr/source/inc/updatehelper.hxx @@ -4,9 +4,9 @@ * * $RCSfile: updatehelper.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 04:01:35 $ + * last change: $Author: ihi $ $Date: 2007-11-23 14:27:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,29 +40,27 @@ #include "change.hxx" #endif +#include "nodeaccess.hxx" + //.......................................................................... namespace configmgr { //.......................................................................... - namespace memory { class UpdateAccessor; } - namespace data { class NodeAddress; class NodeAccessRef; } - -//.......................................................................... // adjust a set of changes to the target tree, return true, if there are changes left - bool adjustUpdateToTree(SubtreeChange & _rUpdateTree, data::NodeAccessRef const & _aRootNode); + bool adjustUpdateToTree(SubtreeChange & _rUpdateTree, data::NodeAccess const & _aRootNode); // adjust a set of changes to the target tree, return true, if there are changes left - bool adjustUpdateToTree(SubtreeChange & _rUpdateTree, memory::UpdateAccessor& _anUpdateAccess, data::NodeAddress _aRootNode); + bool adjustUpdateToTree(SubtreeChange & _rUpdateTree, data::NodeAddress _aRootNode); // apply a already matching set of changes to the target tree - void applyUpdateToTree(SubtreeChange& _anUpdateTree, memory::UpdateAccessor& _anUpdateAccess, data::NodeAddress _aRootNode); + void applyUpdateToTree(SubtreeChange& _anUpdateTree, data::NodeAddress _aRootNode); // apply a set of changes to the target tree - void applyUpdateWithAdjustmentToTree(SubtreeChange& _anUpdateTree, memory::UpdateAccessor& _anUpdateAccess, data::NodeAddress _aRootNode); + void applyUpdateWithAdjustmentToTree(SubtreeChange& _anUpdateTree, data::NodeAddress _aRootNode); // apply a set of changes to the target tree, return true, if there are changes found - bool createUpdateFromDifference(SubtreeChange& _rResultingUpdateTree, data::NodeAccessRef const & _aExistingData, ISubtree const & _aNewData); + bool createUpdateFromDifference(SubtreeChange& _rResultingUpdateTree, data::NodeAccess const & _aExistingData, ISubtree const & _aNewData); //.......................................................................... } // namespace configmgr |