diff options
Diffstat (limited to 'akregator/src/mk4storage/metakit/src')
-rw-r--r-- | akregator/src/mk4storage/metakit/src/custom.cpp | 128 | ||||
-rw-r--r-- | akregator/src/mk4storage/metakit/src/field.cpp | 4 | ||||
-rw-r--r-- | akregator/src/mk4storage/metakit/src/field.h | 2 | ||||
-rw-r--r-- | akregator/src/mk4storage/metakit/src/format.cpp | 2 | ||||
-rw-r--r-- | akregator/src/mk4storage/metakit/src/handler.cpp | 24 | ||||
-rw-r--r-- | akregator/src/mk4storage/metakit/src/handler.h | 4 | ||||
-rw-r--r-- | akregator/src/mk4storage/metakit/src/handler.inl | 2 | ||||
-rw-r--r-- | akregator/src/mk4storage/metakit/src/persist.cpp | 4 | ||||
-rw-r--r-- | akregator/src/mk4storage/metakit/src/remap.cpp | 8 | ||||
-rw-r--r-- | akregator/src/mk4storage/metakit/src/store.cpp | 4 | ||||
-rw-r--r-- | akregator/src/mk4storage/metakit/src/view.cpp | 2 |
11 files changed, 92 insertions, 92 deletions
diff --git a/akregator/src/mk4storage/metakit/src/custom.cpp b/akregator/src/mk4storage/metakit/src/custom.cpp index a6275cea..6ed1d5ab 100644 --- a/akregator/src/mk4storage/metakit/src/custom.cpp +++ b/akregator/src/mk4storage/metakit/src/custom.cpp @@ -233,7 +233,7 @@ bool c4_CustomViewer::RemoveRows(int, int) class c4_SliceViewer : public c4_CustomViewer { - c4_View _parent; + c4_View _tqparent; int _first, _limit, _step; public: @@ -249,7 +249,7 @@ public: }; c4_SliceViewer::c4_SliceViewer (c4_Sequence& seq_, int first_, int limit_, int step_) - : _parent (&seq_), _first (first_), _limit (limit_), _step (step_) + : _tqparent (&seq_), _first (first_), _limit (limit_), _step (step_) { d4_assert(_step != 0); } @@ -260,12 +260,12 @@ c4_SliceViewer::~c4_SliceViewer () c4_View c4_SliceViewer::GetTemplate() { - return _parent.Clone(); // could probably return _parent just as well + return _tqparent.Clone(); // could probably return _tqparent just as well } int c4_SliceViewer::GetSize() { - int n = _limit >= 0 ? _limit : _parent.GetSize(); + int n = _limit >= 0 ? _limit : _tqparent.GetSize(); if (n < _first) n = _first; @@ -277,14 +277,14 @@ bool c4_SliceViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1); - return _parent.GetItem(row_, col_, buf_); + return _tqparent.GetItem(row_, col_, buf_); } bool c4_SliceViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1); - _parent.SetItem(row_, col_, buf_); + _tqparent.SetItem(row_, col_, buf_); return true; } @@ -297,7 +297,7 @@ bool c4_SliceViewer::InsertRows(int pos_, c4_Cursor value_, int count_) if (_limit >= 0) _limit += count_; - _parent.InsertAt(pos_, *value_, count_); + _tqparent.InsertAt(pos_, *value_, count_); return true; } @@ -310,7 +310,7 @@ bool c4_SliceViewer::RemoveRows(int pos_, int count_) if (_limit >= 0) _limit -= count_; - _parent.RemoveAt(pos_, count_); + _tqparent.RemoveAt(pos_, count_); return true; } @@ -323,7 +323,7 @@ c4_CustomViewer* f4_CustSlice(c4_Sequence& seq_, int first_, int limit_, int ste class c4_ProductViewer : public c4_CustomViewer { - c4_View _parent, _argView, _template; + c4_View _tqparent, _argView, _template; public: c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_); @@ -335,7 +335,7 @@ public: }; c4_ProductViewer::c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_) - : _parent (&seq_), _argView (view_), _template (_parent.Clone()) + : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone()) { for (int i = 0; i < _argView.NumProperties(); ++i) _template.AddProperty(_argView.NthProperty(i)); @@ -352,12 +352,12 @@ c4_View c4_ProductViewer::GetTemplate() int c4_ProductViewer::GetSize() { - return _parent.GetSize() * _argView.GetSize(); + return _tqparent.GetSize() * _argView.GetSize(); } bool c4_ProductViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; if (col_ < v.NumProperties()) { @@ -384,7 +384,7 @@ c4_CustomViewer* f4_CustProduct(c4_Sequence& seq_, const c4_View& view_) class c4_RemapWithViewer : public c4_CustomViewer { - c4_View _parent, _argView; + c4_View _tqparent, _argView; public: c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_); @@ -397,7 +397,7 @@ public: }; c4_RemapWithViewer::c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_) - : _parent (&seq_), _argView (view_) + : _tqparent (&seq_), _argView (view_) { } @@ -407,7 +407,7 @@ c4_RemapWithViewer::~c4_RemapWithViewer () c4_View c4_RemapWithViewer::GetTemplate() { - return _parent.Clone(); // could probably return _parent just as well + return _tqparent.Clone(); // could probably return _tqparent just as well } int c4_RemapWithViewer::GetSize() @@ -422,7 +422,7 @@ bool c4_RemapWithViewer::GetItem(int row_, int col_, c4_Bytes& buf_) row_ = ((const c4_IntProp&) map) (_argView[row_]); - return _parent.GetItem(row_, col_, buf_); + return _tqparent.GetItem(row_, col_, buf_); } bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) @@ -432,7 +432,7 @@ bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) row_ = ((const c4_IntProp&) map) (_argView[row_]); - _parent.SetItem(row_, col_, buf_); + _tqparent.SetItem(row_, col_, buf_); return true; } @@ -445,7 +445,7 @@ c4_CustomViewer* f4_CustRemapWith(c4_Sequence& seq_, const c4_View& view_) class c4_PairViewer : public c4_CustomViewer { - c4_View _parent, _argView, _template; + c4_View _tqparent, _argView, _template; public: c4_PairViewer (c4_Sequence& seq_, const c4_View& view_); @@ -460,7 +460,7 @@ public: }; c4_PairViewer::c4_PairViewer (c4_Sequence& seq_, const c4_View& view_) - : _parent (&seq_), _argView (view_), _template (_parent.Clone()) + : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone()) { for (int i = 0; i < _argView.NumProperties(); ++i) _template.AddProperty(_argView.NthProperty(i)); @@ -477,12 +477,12 @@ c4_View c4_PairViewer::GetTemplate() int c4_PairViewer::GetSize() { - return _parent.GetSize(); + return _tqparent.GetSize(); } bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; if (col_ >= v.NumProperties()) { @@ -496,7 +496,7 @@ bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_) bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; if (col_ >= v.NumProperties()) { @@ -511,14 +511,14 @@ bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) bool c4_PairViewer::InsertRows(int pos_, c4_Cursor value_, int count_) { - _parent.InsertAt(pos_, *value_, count_); + _tqparent.InsertAt(pos_, *value_, count_); _argView.InsertAt(pos_, *value_, count_); return true; } bool c4_PairViewer::RemoveRows(int pos_, int count_) { - _parent.RemoveAt(pos_, count_); + _tqparent.RemoveAt(pos_, count_); _argView.RemoveAt(pos_, count_); return true; } @@ -532,7 +532,7 @@ c4_CustomViewer* f4_CustPair(c4_Sequence& seq_, const c4_View& view_) class c4_ConcatViewer : public c4_CustomViewer { - c4_View _parent, _argView; + c4_View _tqparent, _argView; public: c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_); @@ -545,7 +545,7 @@ public: }; c4_ConcatViewer::c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_) - : _parent (&seq_), _argView (view_) + : _tqparent (&seq_), _argView (view_) { } @@ -555,23 +555,23 @@ c4_ConcatViewer::~c4_ConcatViewer () c4_View c4_ConcatViewer::GetTemplate() { - return _parent.Clone(); // could probably return _parent just as well + return _tqparent.Clone(); // could probably return _tqparent just as well } int c4_ConcatViewer::GetSize() { - return _parent.GetSize() + _argView.GetSize(); + return _tqparent.GetSize() + _argView.GetSize(); } bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; - if (row_ >= _parent.GetSize()) + if (row_ >= _tqparent.GetSize()) { v = _argView; - row_ -= _parent.GetSize(); - col_ = v.FindProperty(_parent.NthProperty(col_).GetId()); + row_ -= _tqparent.GetSize(); + col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId()); if (col_ < 0) return false; @@ -582,13 +582,13 @@ bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_) bool c4_ConcatViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; - if (row_ >= _parent.GetSize()) + if (row_ >= _tqparent.GetSize()) { v = _argView; - row_ -= _parent.GetSize(); - col_ = v.FindProperty(_parent.NthProperty(col_).GetId()); + row_ -= _tqparent.GetSize(); + col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId()); d4_assert(col_ >= 0); } @@ -605,7 +605,7 @@ c4_CustomViewer* f4_CustConcat(c4_Sequence& seq_, const c4_View& view_) class c4_RenameViewer : public c4_CustomViewer { - c4_View _parent, _template; + c4_View _tqparent, _template; public: c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_, @@ -622,11 +622,11 @@ public: c4_RenameViewer::c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_, const c4_Property& new_) - : _parent (&seq_) + : _tqparent (&seq_) { - for (int i = 0; i < _parent.NumProperties(); ++i) + for (int i = 0; i < _tqparent.NumProperties(); ++i) { - const c4_Property& prop = _parent.NthProperty(i); + const c4_Property& prop = _tqparent.NthProperty(i); _template.AddProperty(prop.GetId() == old_.GetId() ? new_ : prop); } } @@ -642,17 +642,17 @@ c4_View c4_RenameViewer::GetTemplate() int c4_RenameViewer::GetSize() { - return _parent.GetSize(); + return _tqparent.GetSize(); } bool c4_RenameViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - return _parent.GetItem(row_, col_, buf_); + return _tqparent.GetItem(row_, col_, buf_); } bool c4_RenameViewer::SetItem(int row_, int col_, const c4_Bytes& buf_) { - _parent.SetItem(row_, col_, buf_); + _tqparent.SetItem(row_, col_, buf_); return true; } @@ -666,7 +666,7 @@ c4_CustomViewer* f4_CustRename(c4_Sequence& seq_, const c4_Property& old_, class c4_GroupByViewer : public c4_CustomViewer { - c4_View _parent, _keys, _sorted, _temp; + c4_View _tqparent, _keys, _sorted, _temp; c4_Property _result; c4_DWordArray _map; @@ -685,9 +685,9 @@ public: c4_GroupByViewer::c4_GroupByViewer (c4_Sequence& seq_, const c4_View& keys_, const c4_Property& result_) - : _parent (&seq_), _keys (keys_), _result (result_) + : _tqparent (&seq_), _keys (keys_), _result (result_) { - _sorted = _parent.SortOn(_keys); + _sorted = _tqparent.SortOn(_keys); int n = _sorted.GetSize(); c4_Bytes temp; @@ -804,7 +804,7 @@ c4_CustomViewer* f4_CustGroupBy(c4_Sequence& seq_, const c4_View& template_, class c4_JoinPropViewer : public c4_CustomViewer { - c4_View _parent, _template; + c4_View _tqparent, _template; c4_ViewProp _sub; int _subPos, _subWidth; c4_DWordArray _base, _offset; @@ -820,20 +820,20 @@ public: c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_, const c4_ViewProp& sub_, bool outer_) - : _parent (&seq_), - _sub (sub_), _subPos (_parent.FindProperty(sub_.GetId())), _subWidth (0) + : _tqparent (&seq_), + _sub (sub_), _subPos (_tqparent.FindProperty(sub_.GetId())), _subWidth (0) { d4_assert(_subPos >= 0); - for (int k = 0; k < _parent.NumProperties(); ++k) + for (int k = 0; k < _tqparent.NumProperties(); ++k) { if (k != _subPos) - _template.AddProperty(_parent.NthProperty(k)); + _template.AddProperty(_tqparent.NthProperty(k)); else // if there are no rows, then this join does very little anyway //! OOPS: if this is an unattached view, then the subviews can differ - if (_parent.GetSize() > 0) + if (_tqparent.GetSize() > 0) { - c4_View view = sub_ (_parent[0]); + c4_View view = sub_ (_tqparent[0]); for (int l = 0; l < view.NumProperties(); ++l) { _template.AddProperty(view.NthProperty(l)); @@ -845,9 +845,9 @@ c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_, _base.SetSize(0, 5); _offset.SetSize(0, 5); - for (int i = 0; i < _parent.GetSize(); ++i) + for (int i = 0; i < _tqparent.GetSize(); ++i) { - c4_View v = _sub (_parent[i]); + c4_View v = _sub (_tqparent[i]); int n = v.GetSize(); if (n == 0 && outer_) @@ -880,7 +880,7 @@ int c4_JoinPropViewer::GetSize() bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; int r = _base.GetAt(row_); if (col_ >= _subPos) @@ -890,7 +890,7 @@ bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_) } else { - v = _sub (_parent[r]); + v = _sub (_tqparent[r]); r = _offset.GetAt(row_); if (r < 0) return false; // if this is a null row in an outer join @@ -913,7 +913,7 @@ c4_CustomViewer* f4_CustJoinProp(c4_Sequence& seq_, class c4_JoinViewer : public c4_CustomViewer { - c4_View _parent, _argView, _template; + c4_View _tqparent, _argView, _template; c4_DWordArray _base, _offset; public: @@ -928,14 +928,14 @@ public: c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_, const c4_View& view_, bool outer_) - : _parent (&seq_), _argView (view_.SortOn(keys_)) + : _tqparent (&seq_), _argView (view_.SortOn(keys_)) { // why not in GetTemplate, since we don't need to know this... - _template = _parent.Clone(); + _template = _tqparent.Clone(); for (int l = 0; l < _argView.NumProperties(); ++l) _template.AddProperty(_argView.NthProperty(l)); - c4_View sorted = _parent.SortOn(keys_).Project(keys_); + c4_View sorted = _tqparent.SortOn(keys_).Project(keys_); c4_View temp = _argView.Project(keys_); _base.SetSize(0, 5); @@ -945,7 +945,7 @@ c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_, for (int i = 0; i < sorted.GetSize(); ++i) { - int orig = _parent.GetIndexOf(sorted[i]); + int orig = _tqparent.GetIndexOf(sorted[i]); d4_assert(orig >= 0); if (i > 0 && sorted[i] == sorted[i-1]) @@ -1009,7 +1009,7 @@ int c4_JoinViewer::GetSize() bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; int r = _base.GetAt(row_); if (col_ >= v.NumProperties()) @@ -1030,7 +1030,7 @@ bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_) #if 0 bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_) { - c4_View v = _parent; + c4_View v = _tqparent; int o = 0; int r = _offset.GetAt(row_); diff --git a/akregator/src/mk4storage/metakit/src/field.cpp b/akregator/src/mk4storage/metakit/src/field.cpp index 3867d6b5..ed5a4573 100644 --- a/akregator/src/mk4storage/metakit/src/field.cpp +++ b/akregator/src/mk4storage/metakit/src/field.cpp @@ -23,7 +23,7 @@ ///////////////////////////////////////////////////////////////////////////// // c4_Field -c4_Field::c4_Field (const char*& description_, c4_Field* parent_) +c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_) : _type (0) { _indirect = this; @@ -47,7 +47,7 @@ c4_Field::c4_Field (const char*& description_, c4_Field* parent_) if (*description_ == '^') { ++description_; - _indirect = parent_; + _indirect = tqparent_; d4_assert(*description_ == ']'); } diff --git a/akregator/src/mk4storage/metakit/src/field.h b/akregator/src/mk4storage/metakit/src/field.h index 8bf3dc8c..5dfc2573 100644 --- a/akregator/src/mk4storage/metakit/src/field.h +++ b/akregator/src/mk4storage/metakit/src/field.h @@ -34,7 +34,7 @@ public: c4_Field& SubField(int) const; //: Returns the description of each subfield. bool IsRepeating() const; - //: Returns true if this field tqcontains subtables. + //: Returns true if this field contains subtables. /* Field name and description */ const c4_String& Name() const; diff --git a/akregator/src/mk4storage/metakit/src/format.cpp b/akregator/src/mk4storage/metakit/src/format.cpp index 49c45bce..aa23e739 100644 --- a/akregator/src/mk4storage/metakit/src/format.cpp +++ b/akregator/src/mk4storage/metakit/src/format.cpp @@ -1036,7 +1036,7 @@ void c4_FormatV::SetupAllSubviews() void c4_FormatV::Define(int rows_, const t4_byte** ptr_) { if (_inited) { - // big oops: a root handler already tqcontains data + // big oops: a root handler already contains data for (int i = 0; i < _subSeqs.GetSize(); ++i) ForgetSubview(i); diff --git a/akregator/src/mk4storage/metakit/src/handler.cpp b/akregator/src/mk4storage/metakit/src/handler.cpp index 6c68c5c3..fab47372 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), _parent (0), _numRows (0) + : _persist (persist_), _field (0), _tqparent (0), _numRows (0) { } c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_) : _persist (owner_.Persist()), _field (owner_.FindField(handler_)), - _parent (&owner_), _numRows (0) + _tqparent (&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 = _parent == this; + const bool rootLevel = _tqparent == 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(_parent == 0); + d4_assert(_tqparent == 0); SetNumRows(1); @@ -137,7 +137,7 @@ void c4_HandlerSeq::DefineRoot() _field = d4_new c4_Field (desc); d4_assert(!*desc); - _parent = this; + _tqparent = this; } c4_Handler* c4_HandlerSeq::CreateHandler(const c4_Property& prop_) @@ -162,7 +162,7 @@ void c4_HandlerSeq::DetachFromParent() _field = 0; } - _parent = 0; + _tqparent = 0; } void c4_HandlerSeq::DetachFromStorage(bool full_) @@ -293,7 +293,7 @@ void c4_HandlerSeq::Restructure(c4_Field& field_, bool remove_) } } - if (_parent == this) + if (_tqparent == this) delete ofld; // the root table owns its field structure tree } @@ -397,9 +397,9 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos c4_HandlerSeq& t1 = SubEntry(col, srcPos_); c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_); - // adjust the parents - t1._parent = this; - t2._parent = &dst_; + // adjust the tqparents + t1._tqparent = this; + t2._tqparent = &dst_; // reattach the proper field structures t1.Restructure(Field(col), false); @@ -478,14 +478,14 @@ void c4_HandlerSeq::UnmappedAll() // construct meta view from a pre-parsed field tree structure // this will one day be converted to directly parse the description string -void c4_HandlerSeq::BuildMeta(int parent_, int colnum_, c4_View& meta_, +void c4_HandlerSeq::BuildMeta(int tqparent_, int colnum_, c4_View& meta_, const c4_Field& field_) { c4_IntProp pP ("P"), pC ("C"); c4_ViewProp pF ("F"); c4_StringProp pN ("N"), pT ("T"); - int n = meta_.Add(pP [parent_] + pC [colnum_]); + int n = meta_.Add(pP [tqparent_] + pC [colnum_]); c4_View fields = pF (meta_[n]); for (int i = 0; i < field_.NumSubFields(); ++i) { diff --git a/akregator/src/mk4storage/metakit/src/handler.h b/akregator/src/mk4storage/metakit/src/handler.h index 353d0517..7cf2efdf 100644 --- a/akregator/src/mk4storage/metakit/src/handler.h +++ b/akregator/src/mk4storage/metakit/src/handler.h @@ -52,7 +52,7 @@ public: virtual int ItemSize(int index_) = 0; //: Return width of specified data item. void GetBytes(int index_, c4_Bytes& buf_, bool copySmall_ =false); - //: Used for backward compatibility, should probably be tqreplaced. + //: Used for backward compatibility, should probably be replaced. virtual const void* Get(int index_, int& length_) = 0; //: Retrieves the data item at the specified index. virtual void Set(int index_, const c4_Bytes& buf_) = 0; @@ -88,7 +88,7 @@ class c4_HandlerSeq : public c4_Sequence c4_PtrArray _handlers; c4_Persist* _persist; c4_Field* _field; - c4_HandlerSeq* _parent; + c4_HandlerSeq* _tqparent; int _numRows; public: diff --git a/akregator/src/mk4storage/metakit/src/handler.inl b/akregator/src/mk4storage/metakit/src/handler.inl index 75321f9c..10d45f3c 100644 --- a/akregator/src/mk4storage/metakit/src/handler.inl +++ b/akregator/src/mk4storage/metakit/src/handler.inl @@ -84,7 +84,7 @@ d4_inline const c4_Sequence* c4_HandlerSeq::HandlerContext(int) const d4_inline c4_HandlerSeq& c4_HandlerSeq::Parent() const { - return *_parent; + return *_tqparent; } ///////////////////////////////////////////////////////////////////////////// diff --git a/akregator/src/mk4storage/metakit/src/persist.cpp b/akregator/src/mk4storage/metakit/src/persist.cpp index 743f4757..65a9e94e 100644 --- a/akregator/src/mk4storage/metakit/src/persist.cpp +++ b/akregator/src/mk4storage/metakit/src/persist.cpp @@ -144,7 +144,7 @@ private: // other hand, the allocator does not know the size of used slots. // * Alternate function allows marking a specific range as occupied. // * Allocator can be initialized as either all free or all in-use. -// * Allocation info tqcontains only integers, it could be stored. +// * Allocation info contains only integers, it could be stored. // * To extend allocated slots: "occupy" extra bytes at the end. // * Generic: can be used for memory, disk files, and array entries. @@ -767,7 +767,7 @@ void c4_SaveContext::SaveIt(c4_HandlerSeq& root_, c4_Allocator** spacePtr_, * write new skip + commit "tails" at limit (no visible effect on file) * overwrite commit tail at end with a skip to this new one (equivalent) - * tqreplace header with one pointing to that internal new one (equivalent) + * replace header with one pointing to that internal new one (equivalent) * flush (now the file is valid both truncated and not-yet-truncated end = limit; diff --git a/akregator/src/mk4storage/metakit/src/remap.cpp b/akregator/src/mk4storage/metakit/src/remap.cpp index 243eca04..9bc9b440 100644 --- a/akregator/src/mk4storage/metakit/src/remap.cpp +++ b/akregator/src/mk4storage/metakit/src/remap.cpp @@ -79,7 +79,7 @@ public: }; ///////////////////////////////////////////////////////////////////////////// -// The following tqcontains code derived froms Python's dictionaries, hence: +// The following contains code derived froms Python's dictionaries, hence: // Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, // The Netherlands. // Reduced and turned into a fast C++ class by Christian Tismer, hence: @@ -434,7 +434,7 @@ bool c4_HashViewer::InsertRows(int pos_, c4_Cursor value_, int count_) int i = Lookup(value_, n); if (i >= 0 && n > 0) { - _base.SetAt(i, *value_); // tqreplace existing + _base.SetAt(i, *value_); // replace existing return true; } @@ -944,7 +944,7 @@ bool c4_OrderedViewer::InsertRows(int, c4_Cursor value_, int count_) else { d4_assert(i < _base.GetSize()); - _base.SetAt(i, *value_); // tqreplace existing + _base.SetAt(i, *value_); // replace existing } return true; @@ -1099,7 +1099,7 @@ bool c4_IndexedViewer::InsertRows(int, c4_Cursor value_, int count_) else { d4_assert(i < _base.GetSize()); - _base.SetAt(i, *value_); // tqreplace existing + _base.SetAt(i, *value_); // replace existing } return true; diff --git a/akregator/src/mk4storage/metakit/src/store.cpp b/akregator/src/mk4storage/metakit/src/store.cpp index f43bc0e3..3a458337 100644 --- a/akregator/src/mk4storage/metakit/src/store.cpp +++ b/akregator/src/mk4storage/metakit/src/store.cpp @@ -366,7 +366,7 @@ bool c4_Storage::SetAside(c4_Storage& aside_) { c4_Persist* pers = Persist(); bool f = pers->SetAside(aside_); - // adjust our copy when the root view has been tqreplaced + // adjust our copy when the root view has been replaced *(c4_View*) this = &pers->Root(); return f; } @@ -391,7 +391,7 @@ bool c4_Storage::Rollback(bool full_) { c4_Persist* pers = Persist(); bool f = Strategy().IsValid() && pers->Rollback(full_); - // adjust our copy when the root view has been tqreplaced + // adjust our copy when the root view has been replaced *(c4_View*) this = &pers->Root(); return f; } diff --git a/akregator/src/mk4storage/metakit/src/view.cpp b/akregator/src/mk4storage/metakit/src/view.cpp index 11e384ee..af2fc9fa 100644 --- a/akregator/src/mk4storage/metakit/src/view.cpp +++ b/akregator/src/mk4storage/metakit/src/view.cpp @@ -44,7 +44,7 @@ public: * On Win32, use a critical section to protect the global symbol table. * Also uses special thread-safe calls to inc/dec all reference counts. * - * This implementation tqreplaces the previous use of TLS, which cannot + * This implementation replaces the previous use of TLS, which cannot * be used without special tricks in dynamically loaded DLL's, as is * required for OCX/ActiveX use (which uses LoadLibrary). * |