From dfb7562b7e607f0ae077a6a436966203029df56d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- akregator/src/mk4storage/metakit/CHANGES | 2 +- akregator/src/mk4storage/metakit/src/column.cpp | 14 +++++++------- akregator/src/mk4storage/metakit/src/field.cpp | 4 ++-- akregator/src/mk4storage/metakit/src/handler.cpp | 6 +++--- akregator/src/mk4storage/metakit/tests/regress.cpp | 4 ++-- akregator/src/mk4storage/mk4confwidgetbase.ui | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'akregator/src/mk4storage') diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 1729b493a..e5d4aad17 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -203,7 +203,7 @@ Modify some recent patches that were Python 2.2 only so they would still work with 2.1. Add a view.properties() method (returning a - dict of propname -> Property) for cases where a property is tqmasked + dict of propname -> Property) for cases where a property is masked by a method name. 2003-03-01 Reverted changes in Mk4py/scxx, avoid Mk4tcl warning diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp index 0873ac835..dda916abd 100644 --- a/akregator/src/mk4storage/metakit/src/column.cpp +++ b/akregator/src/mk4storage/metakit/src/column.cpp @@ -1398,30 +1398,30 @@ void c4_ColOfInts::ResizeData(int index_, int count_, bool clear_) /* _currwidth 1: 2: 4: * shiftPos 3 2 1 shift the offset right this much - * tqmaskPos 7 3 1 tqmask the offset with this + * maskPos 7 3 1 tqmask the offset with this */ const int shiftPos = _currWidth == 4 ? 1 : 4 - _currWidth; - const int tqmaskPos = (1 << shiftPos) - 1; + const int maskPos = (1 << shiftPos) - 1; // the following code is similar to c4_Column::Resize, but at bit level // turn insertion into deletion by inserting entire bytes if (count_ > 0) { unsigned off = (unsigned) index_ >> shiftPos; - int gapBytes = (count_ + tqmaskPos) >> shiftPos; + int gapBytes = (count_ + maskPos) >> shiftPos; InsertData(off, gapBytes, clear_); // oops, we might have inserted too low by a few entries - const int bits = (index_ & tqmaskPos) * _currWidth; + const int bits = (index_ & maskPos) * _currWidth; if (bits) { - const int tqmaskLow = (1 << bits) - 1; + const int maskLow = (1 << bits) - 1; // move the first few bits to start of inserted range t4_byte* p = CopyNow(off + gapBytes); - t4_byte one = *p & tqmaskLow; - *p &= ~tqmaskLow; + t4_byte one = *p & maskLow; + *p &= ~maskLow; * CopyNow(off) = one; } diff --git a/akregator/src/mk4storage/metakit/src/field.cpp b/akregator/src/mk4storage/metakit/src/field.cpp index ed5a45738..3867d6b5c 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* tqparent_) +c4_Field::c4_Field (const char*& description_, c4_Field* parent_) : _type (0) { _indirect = this; @@ -47,7 +47,7 @@ c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_) if (*description_ == '^') { ++description_; - _indirect = tqparent_; + _indirect = parent_; d4_assert(*description_ == ']'); } diff --git a/akregator/src/mk4storage/metakit/src/handler.cpp b/akregator/src/mk4storage/metakit/src/handler.cpp index fab473722..9bacfc9f8 100644 --- a/akregator/src/mk4storage/metakit/src/handler.cpp +++ b/akregator/src/mk4storage/metakit/src/handler.cpp @@ -397,7 +397,7 @@ 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 tqparents + // adjust the parents t1._tqparent = this; t2._tqparent = &dst_; @@ -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 tqparent_, int colnum_, c4_View& meta_, +void c4_HandlerSeq::BuildMeta(int parent_, 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 [tqparent_] + pC [colnum_]); + int n = meta_.Add(pP [parent_] + pC [colnum_]); c4_View fields = pF (meta_[n]); for (int i = 0; i < field_.NumSubFields(); ++i) { diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp index 4e210444f..2cd5f0841 100644 --- a/akregator/src/mk4storage/metakit/tests/regress.cpp +++ b/akregator/src/mk4storage/metakit/tests/regress.cpp @@ -219,9 +219,9 @@ void FailExpr(const char* expr) Fail(buffer); } -int StartTest(int tqmask_, const char* name_, const char* desc_) +int StartTest(int mask_, const char* name_, const char* desc_) { - if (tqmask_) + if (mask_) { #if q4_MFC && defined(_DEBUG) TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_); diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui index bc898e15a..e2b8c63a3 100644 --- a/akregator/src/mk4storage/mk4confwidgetbase.ui +++ b/akregator/src/mk4storage/mk4confwidgetbase.ui @@ -169,7 +169,7 @@ <No) - + kurlrequester.h klineedit.h -- cgit v1.2.1