diff options
Diffstat (limited to 'akregator/src/mk4storage/metakit/src/handler.cpp')
-rw-r--r-- | akregator/src/mk4storage/metakit/src/handler.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/akregator/src/mk4storage/metakit/src/handler.cpp b/akregator/src/mk4storage/metakit/src/handler.cpp index 9bacfc9f..6c68c5c3 100644 --- a/akregator/src/mk4storage/metakit/src/handler.cpp +++ b/akregator/src/mk4storage/metakit/src/handler.cpp @@ -78,13 +78,13 @@ void c4_Handler::Move(int from_, int to_) // c4_HandlerSeq c4_HandlerSeq::c4_HandlerSeq (c4_Persist* persist_) - : _persist (persist_), _field (0), _tqparent (0), _numRows (0) + : _persist (persist_), _field (0), _parent (0), _numRows (0) { } c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_) : _persist (owner_.Persist()), _field (owner_.FindField(handler_)), - _tqparent (&owner_), _numRows (0) + _parent (&owner_), _numRows (0) { for (int i = 0; i < NumFields(); ++i) { c4_Field& field = Field(i); @@ -98,7 +98,7 @@ c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_) c4_HandlerSeq::~c4_HandlerSeq () { - const bool rootLevel = _tqparent == this; + const bool rootLevel = _parent == this; c4_Persist* pers = _persist; if (rootLevel && pers != 0) @@ -129,7 +129,7 @@ c4_Persist* c4_HandlerSeq::Persist() const void c4_HandlerSeq::DefineRoot() { d4_assert(_field == 0); - d4_assert(_tqparent == 0); + d4_assert(_parent == 0); SetNumRows(1); @@ -137,7 +137,7 @@ void c4_HandlerSeq::DefineRoot() _field = d4_new c4_Field (desc); d4_assert(!*desc); - _tqparent = this; + _parent = this; } c4_Handler* c4_HandlerSeq::CreateHandler(const c4_Property& prop_) @@ -162,7 +162,7 @@ void c4_HandlerSeq::DetachFromParent() _field = 0; } - _tqparent = 0; + _parent = 0; } void c4_HandlerSeq::DetachFromStorage(bool full_) @@ -293,7 +293,7 @@ void c4_HandlerSeq::Restructure(c4_Field& field_, bool remove_) } } - if (_tqparent == this) + if (_parent == this) delete ofld; // the root table owns its field structure tree } @@ -398,8 +398,8 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_); // adjust the parents - t1._tqparent = this; - t2._tqparent = &dst_; + t1._parent = this; + t2._parent = &dst_; // reattach the proper field structures t1.Restructure(Field(col), false); |