diff options
Diffstat (limited to 'khtml/rendering')
51 files changed, 863 insertions, 863 deletions
diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp index 515c9bfbb..bd010047a 100644 --- a/khtml/rendering/bidi.cpp +++ b/khtml/rendering/bidi.cpp @@ -61,8 +61,8 @@ struct BidiIterator }; -struct BiditqStatus { - BiditqStatus() : eor(TQChar::DirON), lastStrong(TQChar::DirON), last(TQChar::DirON) {} +struct BidiStatus { + BidiStatus() : eor(TQChar::DirON), lastStrong(TQChar::DirON), last(TQChar::DirON) {} TQChar::Direction eor; TQChar::Direction lastStrong; @@ -77,7 +77,7 @@ struct BidiState { BidiIterator last; BidiIterator current; BidiContext *context; - BiditqStatus status; + BidiStatus status; }; // Used to track a list of chained bidi runs. @@ -156,7 +156,7 @@ void BidiRun::operator delete(void* ptr, size_t sz) { assert(inBidiRunDetach); - // Stash size where detach can tqfind it. + // Stash size where detach can find it. *(size_t*)ptr = sz; } @@ -181,7 +181,7 @@ static void deleteBidiRuns(RenderArena* arena) /* a small helper class used internally to resolve Bidi embedding levels. Each line of text caches the embedding level at the start of the line for faster - retqlayouting + relayouting */ BidiContext::BidiContext(unsigned char l, TQChar::Direction e, BidiContext *p, bool o) : level(l) , override(o), dir(e) @@ -242,7 +242,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B if (!oldEndOfInline && !current->isFloating() && !current->isReplaced() && !current->isPositioned()) { next = current->firstChild(); if ( next && adjustEmbedding ) { - EUnicodeBidi ub = next->style()->tqunicodeBidi(); + EUnicodeBidi ub = next->style()->unicodeBidi(); if ( ub != UBNormal && !emptyRun ) { EDirection dir = next->style()->direction(); TQChar::Direction d = ( ub == Embed ? ( dir == RTL ? TQChar::DirRLE : TQChar::DirLRE ) @@ -261,7 +261,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B while (current && current != par) { next = current->nextSibling(); if (next) break; - if ( adjustEmbedding && current->style()->tqunicodeBidi() != UBNormal && !emptyRun ) { + if ( adjustEmbedding && current->style()->unicodeBidi() != UBNormal && !emptyRun ) { embed( TQChar::DirPDF, bidi ); } current = current->parent(); @@ -454,7 +454,7 @@ static void checkMidpoints(BidiIterator& lBreak, BidiState &bidi) // Don't shave a character off the endpoint if it was from a soft hyphen. RenderText* textObj = static_cast<RenderText*>(endpoint.obj); if (endpoint.pos+1 < textObj->length() && - textObj->text()[endpoint.pos+1].tqunicode() == SOFT_HYPHEN) + textObj->text()[endpoint.pos+1].unicode() == SOFT_HYPHEN) return; } endpoint.pos--; @@ -795,7 +795,7 @@ void RenderBlock::computeVerticalPositionsForLine(InlineFlowBox* lineBox) bool beforeContent = true; - // Now make sure we place tqreplaced render objects correctly. + // Now make sure we place replaced render objects correctly. for (BidiRun* r = sFirstBidiRun; r; r = r->nextRun) { // For positioned placeholders, cache the static Y position an object with non-inline display would have. @@ -806,7 +806,7 @@ void RenderBlock::computeVerticalPositionsForLine(InlineFlowBox* lineBox) else if (beforeContent) beforeContent = false; - // Position is used to properly position both tqreplaced elements and + // Position is used to properly position both replaced elements and // to update the static normal flow x/y of positioned elements. r->obj->position(r->box, r->start, r->stop - r->start, r->level%2); } @@ -1241,7 +1241,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator } // this causes the operator ++ to open and close embedding levels as needed - // for the CSS tqunicode-bidi property + // for the CSS unicode-bidi property adjustEmbedding = true; bidi.current.increment( bidi ); adjustEmbedding = false; @@ -1264,7 +1264,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator // reorder line according to run structure... - // first tqfind highest and lowest levels + // first find highest and lowest levels uchar levelLow = 128; uchar levelHigh = 0; BidiRun *r = sFirstBidiRun; @@ -1323,17 +1323,17 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator #endif } -void RenderBlock::tqlayoutInlineChildren(bool retqlayoutChildren, int breakBeforeLine) +void RenderBlock::layoutInlineChildren(bool relayoutChildren, int breakBeforeLine) { BidiState bidi; m_overflowHeight = 0; - tqinvalidateVerticalPositions(); + invalidateVerticalPositions(); #ifdef DEBUG_LAYOUT TQTime qt; qt.start(); - kdDebug( 6040 ) << renderName() << " tqlayoutInlineChildren( " << this <<" )" << endl; + kdDebug( 6040 ) << renderName() << " layoutInlineChildren( " << this <<" )" << endl; #endif #if BIDI_DEBUG > 1 || defined( DEBUG_LINEBREAKS ) kdDebug(6041) << " ------- bidi start " << this << " -------" << endl; @@ -1356,11 +1356,11 @@ void RenderBlock::tqlayoutInlineChildren(bool retqlayoutChildren, int breakBefor deleteEllipsisLineBoxes(); if (firstChild()) { - // tqlayout tqreplaced elements + // layout replaced elements RenderObject *o = first( this, bidi, false ); while ( o ) { if (o->markedForRepaint()) { - o->tqrepaintDuringLayout(); + o->repaintDuringLayout(); o->setMarkedForRepaint(false); } if (o->isReplaced() || o->isFloating() || o->isPositioned()) { @@ -1368,13 +1368,13 @@ void RenderBlock::tqlayoutInlineChildren(bool retqlayoutChildren, int breakBefor if (o->isBox()) static_cast<RenderBox*>(o)->RenderBox::deleteInlineBoxes(); - //kdDebug(6041) << "tqlayouting tqreplaced or floating child" << endl; - if (retqlayoutChildren || o->style()->width().isPercent() || o->style()->height().isPercent()) + //kdDebug(6041) << "layouting replaced or floating child" << endl; + if (relayoutChildren || o->style()->width().isPercent() || o->style()->height().isPercent()) o->setChildNeedsLayout(true, false); if (o->isPositioned()) o->containingBlock()->insertPositionedObject(o); else - o->tqlayoutIfNeeded(); + o->layoutIfNeeded(); } else { o->deleteInlineBoxes(); @@ -1437,7 +1437,7 @@ void RenderBlock::tqlayoutInlineChildren(bool retqlayoutChildren, int breakBefor pagebreakHint = true; } redo_linebreak: - end = tqfindNextLineBreak(start, bidi); + end = findNextLineBreak(start, bidi); if( start.atEnd() ) break; if (!isLineEmpty) { bidiReorderLine(start, end, bidi); @@ -1496,13 +1496,13 @@ redo_linebreak: sNumMidpoints = 0; sCurrMidpoint = 0; - // If we violate widows page-breaking rules, we set a hint and retqlayout. + // If we violate widows page-breaking rules, we set a hint and relayout. // Note that the widows rule might still be violated afterwards if the lines have become wider - if (canvas()->pagedMode() && tqcontainsPageBreak() && breakBeforeLine == 0) + if (canvas()->pagedMode() && containsPageBreak() && breakBeforeLine == 0) { int orphans = 0; int widows = 0; - // tqfind breaking line + // find breaking line InlineRunBox* lineBox = firstLineBox(); while (lineBox) { if (lineBox->isInlineFlowBox()) { @@ -1527,15 +1527,15 @@ redo_linebreak: int newOrphans = orphans - (style()->widows() - widows); if (newOrphans < style()->orphans()) { if (parent()->canClear(this,PageBreakHarder)) { - // Retqlayout to remove incorrect page-break + // Relayout to remove incorrect page-break setNeedsPageClear(true); setContainsPageBreak(false); - tqlayoutInlineChildren(retqlayoutChildren, -1); + layoutInlineChildren(relayoutChildren, -1); return; } } else { // Set hint and try again - tqlayoutInlineChildren(retqlayoutChildren, newOrphans+1); + layoutInlineChildren(relayoutChildren, newOrphans+1); return; } } @@ -1564,7 +1564,7 @@ redo_linebreak: #if BIDI_DEBUG > 1 kdDebug(6041) << " ------- bidi end " << this << " -------" << endl; #endif - //kdDebug() << "RenderBlock::tqlayoutInlineChildren time used " << qt.elapsed() << endl; + //kdDebug() << "RenderBlock::layoutInlineChildren time used " << qt.elapsed() << endl; //kdDebug(6040) << "height = " << m_height <<endl; } @@ -1593,13 +1593,13 @@ static void setStaticPosition( RenderBlock* p, RenderObject *o, bool *needToSetS if (needToSetStaticY) *needToSetStaticY = nssy; } -BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bidi) +BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi) { int width = lineWidth(m_height); int w = 0; int tmpW = 0; #ifdef DEBUG_LINEBREAKS - kdDebug(6041) << "tqfindNextLineBreak: line at " << m_height << " line width " << width << endl; + kdDebug(6041) << "findNextLineBreak: line at " << m_height << " line width " << width << endl; kdDebug(6041) << "sol: " << start.obj << " " << start.pos << endl; #endif @@ -1611,11 +1611,11 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi // be skipped. while (!start.atEnd() && (start.obj->isInlineFlow() || (!start.obj->style()->preserveWS() && !start.obj->isBR() && #ifndef QT_NO_UNICODETABLES - ( (start.current().tqunicode() == (ushort)0x0020) || // ASCII space - (start.current().tqunicode() == (ushort)0x0009) || // ASCII tab - (start.current().tqunicode() == (ushort)0x000A) || // ASCII line feed - (start.current().tqunicode() == (ushort)0x000C) || // ASCII form feed - (start.current().tqunicode() == (ushort)0x200B) || // Zero-width space + ( (start.current().unicode() == (ushort)0x0020) || // ASCII space + (start.current().unicode() == (ushort)0x0009) || // ASCII tab + (start.current().unicode() == (ushort)0x000A) || // ASCII line feed + (start.current().unicode() == (ushort)0x000C) || // ASCII form feed + (start.current().unicode() == (ushort)0x200B) || // Zero-width space start.obj->isFloatingOrPositioned() ) #else ( start.current() == ' ' || start.current() == '\n' || start.obj->isFloatingOrPositioned() ) @@ -1710,7 +1710,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi // only check the clear status for non-empty lines. EClear clear = o->style()->clear(); if(clear != CNONE) - m_cleartqStatus = (EClear) (m_cleartqStatus | clear); + m_clearStatus = (EClear) (m_clearStatus | clear); } } goto end; @@ -1771,7 +1771,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi if (lastIt.current->isHTMLMarquee() && lastIt.current->layer() && lastIt.current->layer()->marquee()) lastWS = lastIt.current->layer()->marquee()->whiteSpace(); - // Break on tqreplaced elements if either has normal white-space. + // Break on replaced elements if either has normal white-space. if (currWS == NORMAL || lastWS == NORMAL) { w += tmpW; tmpW = 0; @@ -1824,7 +1824,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi isLineEmpty = false; // Check for soft hyphens. Go ahead and ignore them. - if (c.tqunicode() == SOFT_HYPHEN && pos > 0) { + if (c.unicode() == SOFT_HYPHEN && pos > 0) { nextIsSoftBreakable = true; if (!ignoringSpaces) { // Ignore soft hyphens @@ -1877,7 +1877,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi tmpW += t->width(lastSpace, pos - lastSpace, f); #ifdef APPLE_CHANGES applyWordSpacing = (wordSpacing && currentCharacterIsSpace && !previousCharacterIsSpace && - !t->tqcontainsOnlyWhitespace(pos+1, strlen-(pos+1))); + !t->containsOnlyWhitespace(pos+1, strlen-(pos+1))); #endif #ifdef DEBUG_LINEBREAKS kdDebug(6041) << "found space at " << pos << " in string '" << TQString( str, strlen ).latin1() << "' adding " << tmpW << " new width = " << w << endl; @@ -1886,7 +1886,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi int fb = nearestFloatBottom(m_height); int newLineWidth = lineWidth(fb); // See if |tmpW| will fit on the new line. As long as it does not, - // keep adjusting our float bottom until we tqfind some room. + // keep adjusting our float bottom until we find some room. int lastFloatBottom = m_height; while (lastFloatBottom < fb && tmpW > newLineWidth) { lastFloatBottom = fb; @@ -1898,7 +1898,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi m_height = fb; width = newLineWidth; #ifdef DEBUG_LINEBREAKS - kdDebug() << "RenderBlock::tqfindNextLineBreak new position at " << m_height << " newWidth " << width << endl; + kdDebug() << "RenderBlock::findNextLineBreak new position at " << m_height << " newWidth " << width << endl; #endif } } @@ -1911,7 +1911,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi lBreak.endOfInline = false; } goto end; - } else if ( (pos > 1 && str[pos-1].tqunicode() == SOFT_HYPHEN) ) + } else if ( (pos > 1 && str[pos-1].unicode() == SOFT_HYPHEN) ) // Subtract the width of the soft hyphen out since we fit on a line. tmpW -= t->width(pos-1, 1, f); } @@ -1971,7 +1971,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi } if (!ignoringSpaces) { - // We didn't tqfind any space that would be beyond the line |width|. + // We didn't find any space that would be beyond the line |width|. // Lets add to |tmpW| the remaining width since the last space we found. // Before we test this new |tmpW| however, we will have to look ahead to check // if the next object/position can serve as a line breaking opportunity. @@ -2056,7 +2056,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi int fb = nearestFloatBottom(m_height); int newLineWidth = lineWidth(fb); // See if |tmpW| will fit on the new line. As long as it does not, - // keep adjusting our float bottom until we tqfind some room. + // keep adjusting our float bottom until we find some room. int lastFloatBottom = m_height; while (lastFloatBottom < fb && tmpW > newLineWidth) { lastFloatBottom = fb; @@ -2067,7 +2067,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi m_height = fb; width = newLineWidth; #ifdef DEBUG_LINEBREAKS - kdDebug() << "RenderBlock::tqfindNextLineBreak new position at " << m_height << " newWidth " << width << endl; + kdDebug() << "RenderBlock::findNextLineBreak new position at " << m_height << " newWidth " << width << endl; #endif } @@ -2189,7 +2189,7 @@ BidiIterator RenderBlock::tqfindNextLineBreak(BidiIterator &start, BidiState &bi // For soft hyphens on line breaks, we have to chop out the midpoints that made us // ignore the hyphen so that it will render at the end of the line. TQChar c = static_cast<RenderText*>(lBreak.obj)->text()[lBreak.pos-1]; - if (c.tqunicode() == SOFT_HYPHEN) + if (c.unicode() == SOFT_HYPHEN) chopMidpointsAt(lBreak.obj, lBreak.pos-2); } @@ -2233,7 +2233,7 @@ void RenderBlock::checkLinesForTextOverflow() if ((ltr && lineBoxEdge > blockEdge) || (!ltr && lineBoxEdge < blockEdge)) { // This line spills out of our box in the appropriate direction. Now we need to see if the line // can be truncated. In order for truncation to be possible, the line must have sufficient space to - // accommodate our truncation string, and no tqreplaced elements (images, tables) can overlap the ellipsis + // accommodate our truncation string, and no replaced elements (images, tables) can overlap the ellipsis // space. int width = curr == firstRootBox() ? firstLineEllipsisWidth : ellipsisWidth; if (curr->canAccommodateEllipsis(ltr, blockEdge, lineBoxEdge, width)) diff --git a/khtml/rendering/bidi.h b/khtml/rendering/bidi.h index 2ae5599a1..c8776ce19 100644 --- a/khtml/rendering/bidi.h +++ b/khtml/rendering/bidi.h @@ -107,7 +107,7 @@ public: /* InlineMinMaxIterator is a class that will iterate over all render objects that contribute to inline min/max width calculations. Note the following about the way it walks: (1) Positioned content is skipped (since it does not contribute to min/max width of a block) - (2) We do not drill into the children of floats or tqreplaced elements, since you can't break + (2) We do not drill into the children of floats or replaced elements, since you can't break in the middle of such an element. (3) Inline flows (e.g., <a>, <span>, <i>) are walked twice, since each side can have distinct borders/margin/padding that contribute to the min/max width. diff --git a/khtml/rendering/break_lines.h b/khtml/rendering/break_lines.h index 928b75e18..5176e5fb0 100644 --- a/khtml/rendering/break_lines.h +++ b/khtml/rendering/break_lines.h @@ -6,13 +6,13 @@ namespace khtml { /* - array of tqunicode codes where breaking shouldn't occur. + array of unicode codes where breaking shouldn't occur. (in sorted order because of using with binary search) these are currently for Japanese, though simply adding Korean, Chinese ones should work as well */ /* - dontbreakbefore[] tqcontains characters not covered by TQChar::Punctuation_Close that shouldn't be broken before. + dontbreakbefore[] contains characters not covered by TQChar::Punctuation_Close that shouldn't be broken before. chars included in TQChar::Punctuation_Close are listed below.(look at UAX #14) - 3001 ideographic comma - 3002 ideographic full stop @@ -122,7 +122,7 @@ namespace khtml { inline bool isBreakable( const TQChar *str, const int pos, int len ) { const TQChar *c = str+pos; - unsigned short ch = c->tqunicode(); + unsigned short ch = c->unicode(); if ( ch > 0xff ) { // not latin1, need to do more sophisticated checks for asian fonts unsigned char row = c->row(); @@ -147,8 +147,8 @@ namespace khtml { return false; // do binary search in dontbreak[] - return break_bsearch(dontbreakbefore, c->tqunicode()) && - break_bsearch(dontbreakafter, (str+(pos-1))->tqunicode()); + return break_bsearch(dontbreakbefore, c->unicode()) && + break_bsearch(dontbreakafter, (str+(pos-1))->unicode()); } else // no asian font return c->isSpace(); } else { diff --git a/khtml/rendering/counter_tree.h b/khtml/rendering/counter_tree.h index ca630ea19..55b924b80 100644 --- a/khtml/rendering/counter_tree.h +++ b/khtml/rendering/counter_tree.h @@ -29,7 +29,7 @@ namespace khtml { class CounterReset; -// This file implements a counter-tree that is used for tqfinding all parents in counters() lookup, +// This file implements a counter-tree that is used for finding all parents in counters() lookup, // and for propagating count-changes when nodes are added or removed. // Please note that only counter-reset and root can be parents here, and that render-tree parents // are just counter-tree siblings diff --git a/khtml/rendering/enumerate.cpp b/khtml/rendering/enumerate.cpp index 57445c12b..9cfe149ad 100644 --- a/khtml/rendering/enumerate.cpp +++ b/khtml/rendering/enumerate.cpp @@ -138,7 +138,7 @@ TQString toHebrew( int number ) { TQString letter; if (number < 1) return TQString::number(number); if (number>999) { - letter = toHebrew(number/1000) + TQString::tqfromLatin1("'"); + letter = toHebrew(number/1000) + TQString::fromLatin1("'"); number = number%1000; } diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp index 18e0e57f0..a33f0e082 100644 --- a/khtml/rendering/font.cpp +++ b/khtml/rendering/font.cpp @@ -170,7 +170,7 @@ void Font::drawText( TQPainter *p, int x, int y, TQChar *str, int slen, int pos, // and stored. In the second, the actual characters are drawn. // For each letter in the text box, save the width of the character. - // When word-wise, only the first letter tqcontains the width, but of the + // When word-wise, only the first letter contains the width, but of the // whole word. short* const widthList = (short *)alloca(to*sizeof(short)); @@ -293,7 +293,7 @@ int Font::width( TQChar *chs, int, int pos, int len, int start, int end, int toA const TQString qstr = cstr.string(); if ( scFont ) { const TQString upper = qstr.upper(); - const TQChar *uc = qstr.tqunicode(); + const TQChar *uc = qstr.unicode(); const TQFontMetrics sc_fm( *scFont ); for ( int i = 0; i < len; ++i ) { if ( (uc+i)->category() == TQChar::Letter_Lowercase ) @@ -431,7 +431,7 @@ void Font::update( TQPaintDeviceMetrics* devMetrics ) const if( !isFontScalable(db, f) ) { const TQValueList<int>& pointSizes = (*scalSizesCache)[ScalKey(f)]; - // lets see if we tqfind a nice looking font, which is not too far away + // lets see if we find a nice looking font, which is not too far away // from the requested one. // kdDebug(6080) << "khtml::setFontSize family = " << f.family() << " size requested=" << size << endl; diff --git a/khtml/rendering/render_applet.cpp b/khtml/rendering/render_applet.cpp index ad0d787df..fce22f7c8 100644 --- a/khtml/rendering/render_applet.cpp +++ b/khtml/rendering/render_applet.cpp @@ -70,7 +70,7 @@ short RenderApplet::intrinsicWidth() const int rval = 300; if( m_widget ) - rval = ((KJavaAppletWidget*)(m_widget))->tqsizeHint().width(); + rval = ((KJavaAppletWidget*)(m_widget))->sizeHint().width(); return rval > 10 ? rval : 50; } @@ -80,14 +80,14 @@ int RenderApplet::intrinsicHeight() const int rval = 150; if( m_widget ) - rval = m_widget->tqsizeHint().height(); + rval = m_widget->sizeHint().height(); return rval > 10 ? rval : 50; } -void RenderApplet::tqlayout() +void RenderApplet::layout() { - //kdDebug(6100) << "RenderApplet::tqlayout" << endl; + //kdDebug(6100) << "RenderApplet::layout" << endl; KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); @@ -123,22 +123,22 @@ void RenderApplet::processArguments(const TQMap<TQString, TQString> &args) KJavaApplet* applet = w ? w->applet() : 0; if ( applet ) { - applet->setBaseURL( args[TQString::tqfromLatin1("baseURL") ] ); - applet->setAppletClass( args[TQString::tqfromLatin1("code") ] ); + applet->setBaseURL( args[TQString::fromLatin1("baseURL") ] ); + applet->setAppletClass( args[TQString::fromLatin1("code") ] ); - TQString str = args[TQString::tqfromLatin1("codeBase") ]; + TQString str = args[TQString::fromLatin1("codeBase") ]; if( !str.isEmpty() ) applet->setCodeBase( str ); - str = args[TQString::tqfromLatin1("name") ]; + str = args[TQString::fromLatin1("name") ]; if( !str.isNull() ) applet->setAppletName( str ); else - applet->setAppletName( args[TQString::tqfromLatin1("code") ] ); + applet->setAppletName( args[TQString::fromLatin1("code") ] ); - str = args[TQString::tqfromLatin1("archive") ]; + str = args[TQString::fromLatin1("archive") ]; if( !str.isEmpty() ) - applet->setArchives( args[TQString::tqfromLatin1("archive") ] ); + applet->setArchives( args[TQString::fromLatin1("archive") ] ); } } diff --git a/khtml/rendering/render_applet.h b/khtml/rendering/render_applet.h index 1ec9c5b7e..184697a7c 100644 --- a/khtml/rendering/render_applet.h +++ b/khtml/rendering/render_applet.h @@ -44,7 +44,7 @@ public: virtual const char *renderName() const { return "RenderApplet"; } - virtual void tqlayout(); + virtual void layout(); virtual short intrinsicWidth() const; virtual int intrinsicHeight() const; virtual bool isApplet() const { return true; } diff --git a/khtml/rendering/render_arena.cpp b/khtml/rendering/render_arena.cpp index 448e9b7e9..99fbf4f4d 100644 --- a/khtml/rendering/render_arena.cpp +++ b/khtml/rendering/render_arena.cpp @@ -27,7 +27,7 @@ * version of this file only under the terms of one of those two * licenses (the MPL or the GPL) and not to allow others to use your * version of this file under the LGPL, indicate your decision by - * deletingthe provisions above and tqreplace them with the notice and + * deletingthe provisions above and replace them with the notice and * other provisions required by the MPL or the GPL, as the case may be. * If you do not delete the provisions above, a recipient may use your * version of this file under any of the LGPL, the MPL or the GPL. @@ -52,7 +52,7 @@ typedef struct { } RenderArenaDebugHeader; #ifdef VALGRIND_SUPPORT -Arena* tqfindContainingArena(ArenaPool* pool, void* ptr) { +Arena* findContainingArena(ArenaPool* pool, void* ptr) { uword ptrBits = reinterpret_cast<uword>(ptr); for (Arena* a = &pool->first; a; a = a->next) if (ptrBits >= a->base && ptrBits < a->limit) @@ -88,7 +88,7 @@ void* RenderArena::allocate(size_t size) #else void* result = 0; - // Ensure we have correct tqalignment for pointers. Important for Tru64 + // Ensure we have correct alignment for pointers. Important for Tru64 size = KHTML_ROUNDUP(size, sizeof(void*)); // Check recyclers first @@ -98,7 +98,7 @@ void* RenderArena::allocate(size_t size) result = m_recyclers[index]; if (result) { #ifdef VALGRIND_SUPPORT - VALGRIND_MEMPOOL_ALLOC(tqfindContainingArena(&m_pool, result)->base, result, size); + VALGRIND_MEMPOOL_ALLOC(findContainingArena(&m_pool, result)->base, result, size); #endif // Need to move to the next object void* next = *((void**)result); @@ -127,10 +127,10 @@ void RenderArena::free(size_t size, void* ptr) #else #ifdef VALGRIND_SUPPORT - VALGRIND_MEMPOOL_FREE(tqfindContainingArena(&m_pool, ptr)->base, ptr); + VALGRIND_MEMPOOL_FREE(findContainingArena(&m_pool, ptr)->base, ptr); #endif - // Ensure we have correct tqalignment for pointers. Important for Tru64 + // Ensure we have correct alignment for pointers. Important for Tru64 size = KHTML_ROUNDUP(size, sizeof(void*)); // See if it's a size that we recycle diff --git a/khtml/rendering/render_arena.h b/khtml/rendering/render_arena.h index 1bb37c11d..786cd208a 100644 --- a/khtml/rendering/render_arena.h +++ b/khtml/rendering/render_arena.h @@ -27,7 +27,7 @@ * version of this file only under the terms of one of those two * licenses (the MPL or the GPL) and not to allow others to use your * version of this file under the LGPL, indicate your decision by - * deletingthe provisions above and tqreplace them with the notice and + * deletingthe provisions above and replace them with the notice and * other provisions required by the MPL or the GPL, as the case may be. * If you do not delete the provisions above, a recipient may use your * version of this file under any of the LGPL, the MPL or the GPL. diff --git a/khtml/rendering/render_block.cpp b/khtml/rendering/render_block.cpp index 0ea4144f1..ccbb6fad0 100644 --- a/khtml/rendering/render_block.cpp +++ b/khtml/rendering/render_block.cpp @@ -94,7 +94,7 @@ RenderBlock::RenderBlock(DOM::NodeImpl* node) m_positionedObjects = 0; m_firstLine = false; m_avoidPageBreak = false; - m_cleartqStatus = CNONE; + m_clearStatus = CNONE; m_maxTopPosMargin = m_maxTopNegMargin = m_maxBottomPosMargin = m_maxBottomNegMargin = 0; m_topMarginQuirk = m_bottomMarginQuirk = false; m_overflowHeight = m_overflowWidth = 0; @@ -223,7 +223,7 @@ void RenderBlock::updateFirstLetter() // punctuation and white-space if(oldText->l >= 1) { oldText->ref(); - // begin: we need skip leading whitespace so that RenderBlock::tqfindNextLineBreak + // begin: we need skip leading whitespace so that RenderBlock::findNextLineBreak // won't think we're continuing from a previous run unsigned int begin = 0; // the position that first-letter begins unsigned int length = 0; // the position that "the rest" begins @@ -274,7 +274,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi bool madeBoxesNonInline = false; // If the requested beforeChild is not one of our children, then this is most likely because - // there is an anonymous block box within this object that tqcontains the beforeChild. So + // there is an anonymous block box within this object that contains the beforeChild. So // just insert the child into the anonymous block box instead of here. This may also be // needed in cases of things like anonymous tables. if (beforeChild && beforeChild->parent() != this) { @@ -289,7 +289,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi beforeChild->parent()->firstChild() == beforeChild) return addChildToFlow(newChild, beforeChild->parent()); - // Otherwise tqfind our kid inside which the beforeChild is, and delegate to it. + // Otherwise find our kid inside which the beforeChild is, and delegate to it. // This may be many levels deep due to anonymous tables, table sections, etc. RenderObject* responsible = beforeChild->parent(); while (responsible->parent() != this) @@ -298,7 +298,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi return responsible->addChild(newChild,beforeChild); } - // prevent elements that haven't received a tqlayout yet from getting painted by pushing + // prevent elements that haven't received a layout yet from getting painted by pushing // them far above the top of the page if (!newChild->isInline()) newChild->setPos(newChild->xPos(), -500000); @@ -376,7 +376,7 @@ static void getInlineRun(RenderObject* start, RenderObject* stop, RenderObject*& inlineRunStart, RenderObject*& inlineRunEnd) { - // Beginning at |start| we tqfind the largest contiguous run of inlines that + // Beginning at |start| we find the largest contiguous run of inlines that // we can. We denote the run with start and end points, |inlineRunStart| // and |inlineRunEnd|. Note that these two values may be the same if // we encounter only one inline. @@ -565,7 +565,7 @@ void RenderBlock::removeChild(RenderObject *oldChild) bool RenderBlock::isSelfCollapsingBlock() const { // We are not self-collapsing if we - // (a) have a non-zero height according to tqlayout (an optimization to avoid wasting time) + // (a) have a non-zero height according to layout (an optimization to avoid wasting time) // (b) are a table, // (c) have border/padding, // (d) have a min-height @@ -604,30 +604,30 @@ bool RenderBlock::isSelfCollapsingBlock() const return false; } -void RenderBlock::tqlayout() +void RenderBlock::layout() { - // Table cells call tqlayoutBlock directly, so don't add any logic here. Put code into - // tqlayoutBlock(). - tqlayoutBlock(false); + // Table cells call layoutBlock directly, so don't add any logic here. Put code into + // layoutBlock(). + layoutBlock(false); } -void RenderBlock::tqlayoutBlock(bool retqlayoutChildren) +void RenderBlock::layoutBlock(bool relayoutChildren) { if (isInline() && !isReplacedBlock()) { setNeedsLayout(false); return; } - // kdDebug( 6040 ) << renderName() << " " << this << "::tqlayoutBlock() start" << endl; + // kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl; // TQTime t; // t.start(); KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); - if (canvas()->pagedMode()) retqlayoutChildren = true; + if (canvas()->pagedMode()) relayoutChildren = true; - if (!retqlayoutChildren && posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) { + if (!relayoutChildren && posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) { // All we have to is lay out our positioned objects. - tqlayoutPositionedObjects(retqlayoutChildren); + layoutPositionedObjects(relayoutChildren); if (hasOverflowClip()) m_layer->checkScrollbarsAfterLayout(); setNeedsLayout(false); @@ -635,7 +635,7 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren) } if (markedForRepaint()) { - tqrepaintDuringLayout(); + repaintDuringLayout(); setMarkedForRepaint(false); } @@ -653,14 +653,14 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren) } if ( oldWidth != m_width ) - retqlayoutChildren = true; + relayoutChildren = true; // kdDebug( 6040 ) << floatingObjects << "," << oldWidth << "," // << m_width << ","<< needsLayout() << "," << isAnonymousBox() << "," // << overhangingContents() << "," << isPositioned() << endl; #ifdef DEBUG_LAYOUT - kdDebug( 6040 ) << renderName() << "(RenderBlock) " << this << " ::tqlayout() width=" << m_width << ", needsLayout=" << needsLayout() << endl; + kdDebug( 6040 ) << renderName() << "(RenderBlock) " << this << " ::layout() width=" << m_width << ", needsLayout=" << needsLayout() << endl; if(containingBlock() == static_cast<RenderObject *>(this)) kdDebug( 6040 ) << renderName() << ": containingBlock == this" << endl; #endif @@ -670,14 +670,14 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren) int previousHeight = m_height; m_height = 0; m_overflowHeight = 0; - m_cleartqStatus = CNONE; + m_clearStatus = CNONE; // We use four values, maxTopPos, maxPosNeg, maxBottomPos, and maxBottomNeg, to track // our current maximal positive and negative margins. These values are used when we // are collapsed with adjacent blocks, so for example, if you have block A and B // collapsing together, then you'd take the maximal positive margin from both A and B // and subtract it from the maximal negative margin from both A and B to get the - // true collapsed margin. This algorithm is recursive, so when we finish tqlayout() + // true collapsed margin. This algorithm is recursive, so when we finish layout() // our block knows its current maximal positive/negative values. // // Start out by setting our margin values to our current margins. Table cells have @@ -705,9 +705,9 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren) setContainsPageBreak(false); if (childrenInline()) - tqlayoutInlineChildren( retqlayoutChildren ); + layoutInlineChildren( relayoutChildren ); else - tqlayoutBlockChildren( retqlayoutChildren ); + layoutBlockChildren( relayoutChildren ); // Expand our intrinsic height to encompass floats. int toAdd = borderBottom() + paddingBottom(); @@ -729,7 +729,7 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren) m_overflowHeight = m_height; } if (previousHeight != m_height) - retqlayoutChildren = true; + relayoutChildren = true; if (isTableCell()) { // Table cells need to grow to accommodate both overhanging floats and @@ -764,7 +764,7 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren) kdDebug( 6040 ) << renderName() << " crosses to page " << xpage << endl; #endif } - if (needsPageBreak && !tqcontainsPageBreak()) { + if (needsPageBreak && !containsPageBreak()) { setNeedsPageClear(true); #ifdef PAGE_DEBUG kdDebug( 6040 ) << renderName() << " marked for page-clear" << endl; @@ -772,7 +772,7 @@ void RenderBlock::tqlayoutBlock(bool retqlayoutChildren) } } - tqlayoutPositionedObjects( retqlayoutChildren ); + layoutPositionedObjects( relayoutChildren ); // Always ensure our overflow width/height are at least as large as our width/height. m_overflowWidth = kMax(m_overflowWidth, (int)m_width); @@ -881,7 +881,7 @@ static inline bool isAnonymousWhitespace( RenderObject* o ) { return false; RenderObject *fc = o->firstChild(); return fc && fc == o->lastChild() && fc->isText() && static_cast<RenderText *>(fc)->stringLength() == 1 && - static_cast<RenderText *>(fc)->text()[0].tqunicode() == ' '; + static_cast<RenderText *>(fc)->text()[0].unicode() == ' '; } RenderObject* RenderBlock::handleCompactChild(RenderObject* child, CompactInfo& compactInfo, const MarginInfo& marginInfo, bool& handled) @@ -908,7 +908,7 @@ RenderObject* RenderBlock::handleCompactChild(RenderObject* child, CompactInfo& // The compact will fit in the margin. handled = true; compactInfo.set(child, curr); - child->tqlayoutIfNeeded(); + child->layoutIfNeeded(); int off = marginInfo.margin(); m_height += off + curr->marginTop() < child->marginTop() ? child->marginTop() - curr->marginTop() -off: 0; @@ -967,7 +967,7 @@ void RenderBlock::insertCompactIfNeeded(RenderObject* child, CompactInfo& compac Length newLineHeight( kMax(compactChild->lineHeight(true)+adj, (int)child->lineHeight(true)), khtml::Fixed); child->style()->setLineHeight( newLineHeight ); child->setNeedsLayout( true, false ); - child->tqlayout(); + child->layout(); compactChild->setPos(compactXPos, compactYPos); // Set the x position. compactInfo.clear(); @@ -1110,7 +1110,7 @@ void RenderBlock::collapseMargins(RenderObject* child, MarginInfo& marginInfo, i child->markAllDescendantsWithFloatsForLayout(); // Our guess was wrong. Make the child lay itself out again. - child->tqlayoutIfNeeded(); + child->layoutIfNeeded(); } } @@ -1146,7 +1146,7 @@ void RenderBlock::clearFloatsIfNeeded(RenderObject* child, MarginInfo& marginInf } // If our value of clear caused us to be repositioned vertically to be - // underneath a float, we might have to do another tqlayout to take into account + // underneath a float, we might have to do another layout to take into account // the extra space we now have available. if (!selfCollapsing && !child->style()->width().isFixed() && child->usesLineWidth()) // The child's width is a percentage of the line width. @@ -1156,7 +1156,7 @@ void RenderBlock::clearFloatsIfNeeded(RenderObject* child, MarginInfo& marginInf child->setChildNeedsLayout(true); if (!child->flowAroundFloats() && child->hasFloats()) child->markAllDescendantsWithFloatsForLayout(); - child->tqlayoutIfNeeded(); + child->layoutIfNeeded(); } } @@ -1215,7 +1215,7 @@ void RenderBlock::clearPageBreak(RenderObject* child, int pageBottom) // Increase our height by the amount we had to clear. m_height += heightIncrease; - // We might have to do another tqlayout to take into account + // We might have to do another layout to take into account // the extra space we now have available. if (!child->style()->width().isFixed() && child->usesLineWidth()) // The child's width is a percentage of the line width. @@ -1225,9 +1225,9 @@ void RenderBlock::clearPageBreak(RenderObject* child, int pageBottom) child->setChildNeedsLayout(true); if (!child->flowAroundFloats() && child->hasFloats()) child->markAllDescendantsWithFloatsForLayout(); - if (child->tqcontainsPageBreak()) + if (child->containsPageBreak()) child->setNeedsLayout(true); - child->tqlayoutIfNeeded(); + child->layoutIfNeeded(); child->setAfterPageBreak(true); } @@ -1235,7 +1235,7 @@ void RenderBlock::clearPageBreak(RenderObject* child, int pageBottom) int RenderBlock::estimateVerticalPosition(RenderObject* child, const MarginInfo& marginInfo) { // FIXME: We need to eliminate the estimation of vertical position, because - // when it's wrong we sometimes trigger a pathological retqlayout if there are + // when it's wrong we sometimes trigger a pathological relayout if there are // intruding floats. int yPosEstimate = m_height; if (!marginInfo.canCollapseWithTop()) { @@ -1344,10 +1344,10 @@ void RenderBlock::handleBottomOfBlock(int top, int bottom, MarginInfo& marginInf setCollapsedBottomMargin(marginInfo); } -void RenderBlock::tqlayoutBlockChildren( bool retqlayoutChildren ) +void RenderBlock::layoutBlockChildren( bool relayoutChildren ) { #ifdef DEBUG_LAYOUT - kdDebug( 6040 ) << renderName() << " tqlayoutBlockChildren( " << this <<" ), retqlayoutChildren="<< retqlayoutChildren << endl; + kdDebug( 6040 ) << renderName() << " layoutBlockChildren( " << this <<" ), relayoutChildren="<< relayoutChildren << endl; #endif int top = borderTop() + paddingTop(); @@ -1362,9 +1362,9 @@ void RenderBlock::tqlayoutBlockChildren( bool retqlayoutChildren ) MarginInfo marginInfo(this, top, bottom); CompactInfo compactInfo; - // Fieldsets need to tqfind their legend and position it inside the border of the object. - // The legend then gets skipped during normal tqlayout. - RenderObject* legend = tqlayoutLegend(retqlayoutChildren); + // Fieldsets need to find their legend and position it inside the border of the object. + // The legend then gets skipped during normal layout. + RenderObject* legend = layoutLegend(relayoutChildren); PageBreakInfo pageBreakInfo(pageTopAfter(0)); @@ -1379,8 +1379,8 @@ void RenderBlock::tqlayoutBlockChildren( bool retqlayoutChildren ) int oldTopPosMargin = m_maxTopPosMargin; int oldTopNegMargin = m_maxTopNegMargin; - // make sure we retqlayout children if we need it. - if (!child->isPositioned() && (retqlayoutChildren || + // make sure we relayout children if we need it. + if (!child->isPositioned() && (relayoutChildren || (child->isReplaced() && (child->style()->width().isPercent() || child->style()->height().isPercent())) || (child->isRenderBlock() && child->style()->height().isPercent()) || (child->isBody() && child->style()->htmlHacks()))) @@ -1407,11 +1407,11 @@ void RenderBlock::tqlayoutBlockChildren( bool retqlayoutChildren ) // Try to guess our correct y position. In most cases this guess will // be correct. Only if we're wrong (when we compute the real y position) - // will we have to potentially retqlayout. + // will we have to potentially relayout. int yPosEstimate = estimateVerticalPosition(child, marginInfo); // If an element might be affected by the presence of floats, then always mark it for - // tqlayout. + // layout. if ( !child->flowAroundFloats() || child->usesLineWidth() ) { int fb = floatBottom(); if (fb > m_height || fb > yPosEstimate) @@ -1420,7 +1420,7 @@ void RenderBlock::tqlayoutBlockChildren( bool retqlayoutChildren ) // Go ahead and position the child as though it didn't collapse with the top. child->setPos(child->xPos(), yPosEstimate); - child->tqlayoutIfNeeded(); + child->layoutIfNeeded(); // Now determine the correct ypos based on examination of collapsing margin // values. @@ -1501,9 +1501,9 @@ void RenderBlock::clearChildOfPageBreaks(RenderObject *child, PageBreakInfo &pag int xpage = crossesPageBreak(childTop, childBottom); if (xpage || forcePageBreak) { - if (!forcePageBreak && child->tqcontainsPageBreak() && !child->needsPageClear()) { + if (!forcePageBreak && child->containsPageBreak() && !child->needsPageClear()) { #ifdef PAGE_DEBUG - kdDebug(6040) << renderName() << " Child tqcontains page-break to page " << xpage << endl; + kdDebug(6040) << renderName() << " Child contains page-break to page " << xpage << endl; #endif // ### Actually this assumes floating children are breaking/clearing // nicely as well. @@ -1572,24 +1572,24 @@ void RenderBlock::clearChildOfPageBreaks(RenderObject *child, PageBreakInfo &pag pageBreakInfo.setForcePageBreak(true); } -void RenderBlock::tqlayoutPositionedObjects(bool retqlayoutChildren) +void RenderBlock::layoutPositionedObjects(bool relayoutChildren) { if (m_positionedObjects) { - //kdDebug( 6040 ) << renderName() << " " << this << "::tqlayoutPositionedObjects() start" << endl; + //kdDebug( 6040 ) << renderName() << " " << this << "::layoutPositionedObjects() start" << endl; RenderObject* r; TQPtrListIterator<RenderObject> it(*m_positionedObjects); for ( ; (r = it.current()); ++it ) { //kdDebug(6040) << " have a positioned object" << endl; if (r->markedForRepaint()) { - r->tqrepaintDuringLayout(); + r->repaintDuringLayout(); r->setMarkedForRepaint(false); } - if ( retqlayoutChildren || r->style()->position() == FIXED || + if ( relayoutChildren || r->style()->position() == FIXED || ((r->hasStaticY()||r->hasStaticX()) && r->parent() != this && r->parent()->isBlockFlow()) ) { r->setChildNeedsLayout(true); r->dirtyFormattingContext(false); } - r->tqlayoutIfNeeded(); + r->layoutIfNeeded(); } } } @@ -1775,7 +1775,7 @@ void RenderBlock::insertFloatingObject(RenderObject *o) FloatingObject *newObj; if (o->isFloating()) { // floating object - o->tqlayoutIfNeeded(); + o->layoutIfNeeded(); if(o->style()->floating() & FLEFT) newObj = new FloatingObject(FloatingObject::FloatLeft); @@ -1894,7 +1894,7 @@ void RenderBlock::positionNewFloats() if (ftQuirk && (rightRelOffset(y,ro, false)-fx < f->width)) { o->setPos( o->xPos(), y + o->marginTop() ); o->setChildNeedsLayout(true, false); - o->tqlayoutIfNeeded(); + o->layoutIfNeeded(); _height = o->height() + o->marginTop() + o->marginBottom(); f->width = o->width() + o->marginLeft() + o->marginRight(); } @@ -1918,7 +1918,7 @@ void RenderBlock::positionNewFloats() if (ftQuirk && (fx - leftRelOffset(y,lo, false) < f->width)) { o->setPos( o->xPos(), y + o->marginTop() ); o->setChildNeedsLayout(true, false); - o->tqlayoutIfNeeded(); + o->layoutIfNeeded(); _height = o->height() + o->marginTop() + o->marginBottom(); f->width = o->width() + o->marginLeft() + o->marginRight(); } @@ -1950,7 +1950,7 @@ void RenderBlock::newLine() positionNewFloats(); // set y position int newY = 0; - switch(m_cleartqStatus) + switch(m_clearStatus) { case CLEFT: newY = leftBottom(); @@ -1968,7 +1968,7 @@ void RenderBlock::newLine() // kdDebug( 6040 ) << "adjusting y position" << endl; m_height = newY; } - m_cleartqStatus = CNONE; + m_clearStatus = CNONE; } int @@ -2315,7 +2315,7 @@ RenderBlock::clearFloats() RenderObject *prev = previousSibling(); - // tqfind the element to copy the floats from + // find the element to copy the floats from // pass non-flows // pass fAF's bool parentHasFloats = false; @@ -2438,7 +2438,7 @@ void RenderBlock::addOverHangingFloats( RenderBlock *flow, int xoff, int offset, } } -bool RenderBlock::tqcontainsFloat(RenderObject* o) const +bool RenderBlock::containsFloat(RenderObject* o) const { if (m_floatingObjects) { TQPtrListIterator<FloatingObject> it(*m_floatingObjects); @@ -2463,7 +2463,7 @@ void RenderBlock::markAllDescendantsWithFloatsForLayout(RenderObject* floatToRem if (!childrenInline()) { for (RenderObject* child = firstChild(); child; child = child->nextSibling()) { if (isBlockFlow() && !child->isFloatingOrPositioned() && - ((floatToRemove ? child->tqcontainsFloat(floatToRemove) : child->hasFloats()) || child->usesLineWidth())) + ((floatToRemove ? child->containsFloat(floatToRemove) : child->hasFloats()) || child->usesLineWidth())) child->markAllDescendantsWithFloatsForLayout(floatToRemove); } } @@ -2518,7 +2518,7 @@ bool RenderBlock::isPointInScrollbar(int _x, int _y, int _tx, int _ty) _ty + borderTop() - borderTopExtra(), m_layer->verticalScrollbarWidth(), height() + borderTopExtra() + borderBottomExtra()-borderTop()-borderBottom()); - if (vertRect.tqcontains(_x, _y)) { + if (vertRect.contains(_x, _y)) { #ifdef APPLE_CHANGES RenderLayer::gScrollBar = m_layer->verticalScrollbar(); #endif @@ -2531,7 +2531,7 @@ bool RenderBlock::isPointInScrollbar(int _x, int _y, int _tx, int _ty) _ty + height() + borderTop() + borderBottomExtra() - borderBottom() - m_layer->horizontalScrollbarHeight(), width()-borderLeft()-borderRight(), m_layer->horizontalScrollbarHeight()); - if (horizRect.tqcontains(_x, _y)) { + if (horizRect.contains(_x, _y)) { #ifdef APPLE_CHANGES RenderLayer::gScrollBar = m_layer->horizontalScrollbar(); #endif @@ -2705,7 +2705,7 @@ void RenderBlock::calcInlineMinMaxWidth() // and are included in the iteration solely so that their margins can // be added in. // - // (2) An inline non-text non-flow object, e.g., an inline tqreplaced element. + // (2) An inline non-text non-flow object, e.g., an inline replaced element. // These objects can always be on a line by themselves, so in this situation // we need to go ahead and break the current line, and then add in our own // margins and min/max width on its own line, and then terminate the line. @@ -2735,7 +2735,7 @@ void RenderBlock::calcInlineMinMaxWidth() short childMax = 0; if (!child->isText()) { - // Case (1) and (2). Inline tqreplaced and inline flow elements. + // Case (1) and (2). Inline replaced and inline flow elements. if (child->isInlineFlow()) { // Add in padding/border/margin from the appropriate side of // the element. @@ -2747,7 +2747,7 @@ void RenderBlock::calcInlineMinMaxWidth() inlineMax += childMax; } else { - // Inline tqreplaced elements add in their margins to their min/max values. + // Inline replaced elements add in their margins to their min/max values. int margins = 0; LengthType type = cstyle->marginLeft().type(); if ( type != Variable ) @@ -2763,7 +2763,7 @@ void RenderBlock::calcInlineMinMaxWidth() if (!child->isRenderInline() && !child->isText()) { bool qBreak = isTcQuirk && !child->isFloatingOrPositioned(); - // Case (2). Inline tqreplaced elements and floats. + // Case (2). Inline replaced elements and floats. // Go ahead and terminate the current line as far as // minwidth is concerned. childMin += child->minWidth(); @@ -3143,7 +3143,7 @@ void RenderBlock::dump(TQTextStream &stream, const TQString &ind) const stream << ")"; } - // ### EClear m_cleartqStatus + // ### EClear m_clearStatus } #endif diff --git a/khtml/rendering/render_block.h b/khtml/rendering/render_block.h index df8d16fe0..2b0e49398 100644 --- a/khtml/rendering/render_block.h +++ b/khtml/rendering/render_block.h @@ -98,21 +98,21 @@ public: virtual void attach(); void updateFirstLetter(); - virtual void tqlayout(); - void tqlayoutBlock( bool retqlayoutChildren ); - void tqlayoutBlockChildren( bool retqlayoutChildren ); - void tqlayoutInlineChildren( bool retqlayoutChildren, int breakBeforeLine = 0); + virtual void layout(); + void layoutBlock( bool relayoutChildren ); + void layoutBlockChildren( bool relayoutChildren ); + void layoutInlineChildren( bool relayoutChildren, int breakBeforeLine = 0); - void tqlayoutPositionedObjects( bool retqlayoutChildren ); + void layoutPositionedObjects( bool relayoutChildren ); void insertPositionedObject(RenderObject *o); void removePositionedObject(RenderObject *o); // Called to lay out the legend for a fieldset. - virtual RenderObject* tqlayoutLegend(bool /*retqlayoutChildren*/) { return 0; }; + virtual RenderObject* layoutLegend(bool /*relayoutChildren*/) { return 0; }; // the implementation of the following functions is in bidi.cpp void bidiReorderLine(const BidiIterator &start, const BidiIterator &end, BidiState &bidi ); - BidiIterator tqfindNextLineBreak(BidiIterator &start, BidiState &info ); + BidiIterator findNextLineBreak(BidiIterator &start, BidiState &info ); InlineFlowBox* constructLine(const BidiIterator& start, const BidiIterator& end); InlineFlowBox* createLineBoxes(RenderObject* obj); void computeHorizontalPositionsForLine(InlineFlowBox* lineBox, BidiState &bidi); @@ -136,11 +136,11 @@ public: int getClearDelta(RenderObject *child); virtual void markAllDescendantsWithFloatsForLayout(RenderObject* floatToRemove = 0); - // FIXME: tqcontainsFloats() should not return true if the floating objects list - // is empty. However, tqlayoutInlineChildren() relies on the current behavior. + // FIXME: containsFloats() should not return true if the floating objects list + // is empty. However, layoutInlineChildren() relies on the current behavior. // http://bugzilla.opendarwin.org/show_bug.cgi?id=7395#c3 virtual bool hasFloats() const { return m_floatingObjects!=0; } - virtual bool tqcontainsFloat(RenderObject* o) const; + virtual bool containsFloat(RenderObject* o) const; virtual bool hasOverhangingFloats() const { return floatBottom() > m_height; } void addOverHangingFloats( RenderBlock *block, int xoffset, int yoffset, bool child ); @@ -222,7 +222,7 @@ protected: bool crossedLayer : 1; // lock noPaint flag }; - // The following helper functions and structs are used by tqlayoutBlockChildren. + // The following helper functions and structs are used by layoutBlockChildren. class CompactInfo { // A compact child that needs to be collapsed into the margin of the following block. RenderObject* m_compact; @@ -342,7 +342,7 @@ protected: void handleBottomOfBlock(int top, int bottom, MarginInfo& marginInfo); void setCollapsedBottomMargin(const MarginInfo& marginInfo); void clearChildOfPageBreaks(RenderObject* child, PageBreakInfo &pageBreakInfo, MarginInfo &marginInfo); - // End helper functions and structs used by tqlayoutBlockChildren. + // End helper functions and structs used by layoutBlockChildren. protected: // How much content overflows out of our block vertically or horizontally (all we support @@ -359,8 +359,8 @@ private: TQPtrList<RenderObject>* m_positionedObjects; bool m_childrenInline : 1; - bool m_firstLine : 1; // used in inline tqlayouting - EClear m_cleartqStatus : 2; // used during layuting of paragraphs + bool m_firstLine : 1; // used in inline layouting + EClear m_clearStatus : 2; // used during layuting of paragraphs bool m_avoidPageBreak : 1; // anonymous avoid page-break block bool m_topMarginQuirk : 1; bool m_bottomMarginQuirk : 1; diff --git a/khtml/rendering/render_body.cpp b/khtml/rendering/render_body.cpp index 14256d91b..930ec358c 100644 --- a/khtml/rendering/render_body.cpp +++ b/khtml/rendering/render_body.cpp @@ -81,20 +81,20 @@ void RenderBody::paintBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty) } -void RenderBody::tqrepaint(Priority p) +void RenderBody::repaint(Priority p) { RenderObject *cb = containingBlock(); if(cb) - cb->tqrepaint(p); + cb->repaint(p); } -void RenderBody::tqlayout() +void RenderBody::layout() { // in quirk mode, we'll need to have our margins determined // for percentage height calculations if (style()->htmlHacks()) calcHeight(); - RenderBlock::tqlayout(); + RenderBlock::layout(); if (!scrollbarsStyled) { diff --git a/khtml/rendering/render_body.h b/khtml/rendering/render_body.h index d508b8f5e..7951f73e1 100644 --- a/khtml/rendering/render_body.h +++ b/khtml/rendering/render_body.h @@ -40,9 +40,9 @@ public: virtual bool isBody() const { return true; } virtual const char *renderName() const { return "RenderBody"; } - virtual void tqrepaint(Priority p=NormalPriority); + virtual void repaint(Priority p=NormalPriority); - virtual void tqlayout(); + virtual void layout(); virtual void setStyle(RenderStyle* style); virtual int availableHeight() const; diff --git a/khtml/rendering/render_box.cpp b/khtml/rendering/render_box.cpp index 4ec95bf9c..e6742d54e 100644 --- a/khtml/rendering/render_box.cpp +++ b/khtml/rendering/render_box.cpp @@ -117,9 +117,9 @@ void RenderBox::restructureParentFlow() { static inline bool overflowAppliesTo(RenderObject* o) { // css 2.1-11.1.1 - // 1) overflow only applies to non-tqreplaced block-level elements, table cells, and inline-block elements + // 1) overflow only applies to non-replaced block-level elements, table cells, and inline-block elements if (o->isRenderBlock() || o->isTableRow() || o->isTableSection()) - // 2) overflow on root applies to the viewport (cf. KHTMLView::tqlayout) + // 2) overflow on root applies to the viewport (cf. KHTMLView::layout) if (!o->isRoot()) // 3) overflow on body may apply to the viewport... if (!o->isBody() @@ -490,7 +490,7 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba TQColor bgColor = c; // Paint the color first underneath all images. - if (!bgLayer->next() && bgColor.isValid() && tqAlpha(bgColor.rgb()) > 0) + if (!bgLayer->next() && bgColor.isValid() && qAlpha(bgColor.rgb()) > 0) p->fillRect(_tx, clipy, w, cliph, bgColor); // no progressive loading of the background image @@ -622,7 +622,7 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba sy+=b.y()-cy; cx=b.x();cy=b.y();cw=b.width();ch=b.height(); } - // restrict painting to tqrepaint-clip + // restrict painting to repaint-clip if (cy < clipy) { ch -= (clipy - cy); sy += (clipy - cy); @@ -795,7 +795,7 @@ void RenderBox::position(InlineBox* box, int /*from*/, int /*len*/, bool /*rever setPos( box->xPos(), box->yPos() ); } -void RenderBox::tqrepaint(Priority prior) +void RenderBox::repaint(Priority prior) { int ow = style() ? style()->outlineSize() : 0; if( isInline() && !isReplaced() ) @@ -806,17 +806,17 @@ void RenderBox::tqrepaint(Priority prior) p = p->parent(); int xoff = p->hasOverflowClip() ? 0 : p->overflowLeft(); int yoff = p->hasOverflowClip() ? 0 : p->overflowTop(); - p->tqrepaintRectangle( -ow + xoff, -ow + yoff, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, prior); + p->repaintRectangle( -ow + xoff, -ow + yoff, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, prior); } else { int xoff = hasOverflowClip() ? 0 : overflowLeft(); int yoff = hasOverflowClip() ? 0 : overflowTop(); - tqrepaintRectangle( -ow + xoff, -ow + yoff, effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); + repaintRectangle( -ow + xoff, -ow + yoff, effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); } } -void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderBox::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) { x += m_x; y += m_y; @@ -830,7 +830,7 @@ void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool if (style()->position() == FIXED) f=true; - // kdDebug( 6040 ) << "RenderBox(" <<this << ", " << renderName() << ")::tqrepaintRectangle (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl; + // kdDebug( 6040 ) << "RenderBox(" <<this << ", " << renderName() << ")::repaintRectangle (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl; RenderObject *o = container(); if( o ) { if (o->layer()) { @@ -839,7 +839,7 @@ void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool if (style()->position() == ABSOLUTE) o->layer()->checkInlineRelOffset(this,x,y); } - o->tqrepaintRectangle(x, y, w, h, p, f); + o->repaintRectangle(x, y, w, h, p, f); } } @@ -1364,8 +1364,8 @@ void RenderBox::calcAbsoluteHorizontal() // percentage issues. // The following is based off of the W3C Working Draft from April 11, 2006 of - // CSS 2.1: Section 10.3.7 "Absolutely positioned, non-tqreplaced elements" - // <http://www.w3.org/TR/CSS21/visudet.html#abs-non-tqreplaced-width> + // CSS 2.1: Section 10.3.7 "Absolutely positioned, non-replaced elements" + // <http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width> // (block-style-comments in this function and in calcAbsoluteHorizontalValues() // correspond to text from the spec) @@ -1415,14 +1415,14 @@ void RenderBox::calcAbsoluteHorizontal() // Calculate the static distance if needed. if (left.isVariable() && right.isVariable()) { if (containerDirection == LTR) { - // 'm_staticX' should already have been set through tqlayout of the parent. + // 'm_staticX' should already have been set through layout of the parent. int staticPosition = m_staticX - containerBlock->borderLeft(); for (RenderObject* po = parent(); po && po != containerBlock; po = po->parent()) staticPosition += po->xPos(); left = Length(staticPosition, Fixed); } else { RenderObject* po = parent(); - // 'm_staticX' should already have been set through tqlayout of the parent. + // 'm_staticX' should already have been set through layout of the parent. int staticPosition = m_staticX + containerWidth + containerBlock->borderRight() - po->width(); for (; po && po != containerBlock; po = po->parent()) staticPosition -= po->xPos(); @@ -1575,7 +1575,7 @@ void RenderBox::calcAbsoluteHorizontalValues(Length width, const RenderObject* c * for 'right' * * Calculation of the shrink-to-fit width is similar to calculating the - * width of a table cell using the automatic table tqlayout algorithm. + * width of a table cell using the automatic table layout algorithm. * Roughly: calculate the preferred width by formatting the content * without breaking lines other than where explicit line breaks occur, * and also calculate the preferred minimum width, e.g., by trying all @@ -1596,7 +1596,7 @@ void RenderBox::calcAbsoluteHorizontalValues(Length width, const RenderObject* c const int availableSpace = containerWidth - (marginLeftValue + marginRightValue + bordersPlusPadding); - // FIXME: Is there a faster way to tqfind the correct case? + // FIXME: Is there a faster way to find the correct case? // Use rule/case that applies. if (leftIsAuto && widthIsAuto && !rightIsAuto) { // RULE 1: (use shrink-to-fit for width, and solve of left) @@ -1645,8 +1645,8 @@ void RenderBox::calcAbsoluteVertical() } // The following is based off of the W3C Working Draft from April 11, 2006 of - // CSS 2.1: Section 10.6.4 "Absolutely positioned, non-tqreplaced elements" - // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-non-tqreplaced-height> + // CSS 2.1: Section 10.6.4 "Absolutely positioned, non-replaced elements" + // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-non-replaced-height> // (block-style-comments in this function and in calcAbsoluteVerticalValues() // correspond to text from the spec) @@ -1680,7 +1680,7 @@ void RenderBox::calcAbsoluteVertical() // Calculate the static distance if needed. if (top.isVariable() && bottom.isVariable()) { - // m_staticY should already have been set through tqlayout of the parent() + // m_staticY should already have been set through layout of the parent() int staticTop = m_staticY - containerBlock->borderTop(); for (RenderObject* po = parent(); po && po != containerBlock; po = po->parent()) { staticTop += po->yPos(); @@ -1876,8 +1876,8 @@ void RenderBox::calcAbsoluteVerticalValues(Length height, const RenderObject* co void RenderBox::calcAbsoluteHorizontalReplaced() { // The following is based off of the W3C Working Draft from April 11, 2006 of - // CSS 2.1: Section 10.3.8 "Absolutly positioned, tqreplaced elements" - // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-tqreplaced-width> + // CSS 2.1: Section 10.3.8 "Absolutly positioned, replaced elements" + // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-replaced-width> // (block-style-comments in this function correspond to text from the spec and // the numbers correspond to numbers in spec) @@ -1900,12 +1900,12 @@ void RenderBox::calcAbsoluteHorizontalReplaced() /*-----------------------------------------------------------------------*\ - * 1. The used value of 'width' is determined as for inline tqreplaced + * 1. The used value of 'width' is determined as for inline replaced * elements. \*-----------------------------------------------------------------------*/ // NOTE: This value of width is FINAL in that the min/max width calculations // are dealt with in calcReplacedWidth(). This means that the steps to produce - // correct max/min in the non-tqreplaced version, are not necessary. + // correct max/min in the non-replaced version, are not necessary. m_width = calcReplacedWidth() + borderLeft() + borderRight() + paddingLeft() + paddingRight(); const int availableSpace = containerWidth - m_width; @@ -1917,14 +1917,14 @@ void RenderBox::calcAbsoluteHorizontalReplaced() if (left.isVariable() && right.isVariable()) { // see FIXME 1 if (containerDirection == LTR) { - // 'm_staticX' should already have been set through tqlayout of the parent. + // 'm_staticX' should already have been set through layout of the parent. int staticPosition = m_staticX - containerBlock->borderLeft(); for (RenderObject* po = parent(); po && po != containerBlock; po = po->parent()) staticPosition += po->xPos(); left.setValue(Fixed, staticPosition); } else { RenderObject* po = parent(); - // 'm_staticX' should already have been set through tqlayout of the parent. + // 'm_staticX' should already have been set through layout of the parent. int staticPosition = m_staticX + containerWidth + containerBlock->borderRight() - po->width(); for (; po && po != containerBlock; po = po->parent()) staticPosition -= po->xPos(); @@ -1933,7 +1933,7 @@ void RenderBox::calcAbsoluteHorizontalReplaced() } /*-----------------------------------------------------------------------*\ - * 3. If 'left' or 'right' are 'auto', tqreplace any 'auto' on 'margin-left' + * 3. If 'left' or 'right' are 'auto', replace any 'auto' on 'margin-left' * or 'margin-right' with '0'. \*-----------------------------------------------------------------------*/ if (left.isVariable() || right.isVariable()) { @@ -2040,8 +2040,8 @@ void RenderBox::calcAbsoluteHorizontalReplaced() void RenderBox::calcAbsoluteVerticalReplaced() { // The following is based off of the W3C Working Draft from April 11, 2006 of - // CSS 2.1: Section 10.6.5 "Absolutly positioned, tqreplaced elements" - // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-tqreplaced-height> + // CSS 2.1: Section 10.6.5 "Absolutly positioned, replaced elements" + // <http://www.w3.org/TR/2005/WD-CSS21-20050613/visudet.html#abs-replaced-height> // (block-style-comments in this function correspond to text from the spec and // the numbers correspond to numbers in spec) @@ -2057,21 +2057,21 @@ void RenderBox::calcAbsoluteVerticalReplaced() /*-----------------------------------------------------------------------*\ - * 1. The used value of 'height' is determined as for inline tqreplaced + * 1. The used value of 'height' is determined as for inline replaced * elements. \*-----------------------------------------------------------------------*/ // NOTE: This value of height is FINAL in that the min/max height calculations // are dealt with in calcReplacedHeight(). This means that the steps to produce - // correct max/min in the non-tqreplaced version, are not necessary. + // correct max/min in the non-replaced version, are not necessary. m_height = calcReplacedHeight() + borderTop() + borderBottom() + paddingTop() + paddingBottom(); const int availableSpace = containerHeight - m_height; /*-----------------------------------------------------------------------*\ - * 2. If both 'top' and 'bottom' have the value 'auto', tqreplace 'top' + * 2. If both 'top' and 'bottom' have the value 'auto', replace 'top' * with the element's static position. \*-----------------------------------------------------------------------*/ if (top.isVariable() && bottom.isVariable()) { - // m_staticY should already have been set through tqlayout of the parent(). + // m_staticY should already have been set through layout of the parent(). int staticTop = m_staticY - containerBlock->borderTop(); for (RenderObject* po = parent(); po && po != containerBlock; po = po->parent()) { staticTop += po->yPos(); @@ -2080,7 +2080,7 @@ void RenderBox::calcAbsoluteVerticalReplaced() } /*-----------------------------------------------------------------------*\ - * 3. If 'bottom' is 'auto', tqreplace any 'auto' on 'margin-top' or + * 3. If 'bottom' is 'auto', replace any 'auto' on 'margin-top' or * 'margin-bottom' with '0'. \*-----------------------------------------------------------------------*/ // FIXME: The spec. says that this step should only be taken when bottom is @@ -2296,7 +2296,7 @@ void RenderBox::caretPos(int /*offset*/, int flags, int &_x, int &_y, int &width switch (s->textAlign()) { case LEFT: case KHTML_LEFT: - case TAAUTO: // ### tqfind out what this does + case TAAUTO: // ### find out what this does case JUSTIFY: break; case CENTER: diff --git a/khtml/rendering/render_box.h b/khtml/rendering/render_box.h index dcc38ba7d..c0c618d5c 100644 --- a/khtml/rendering/render_box.h +++ b/khtml/rendering/render_box.h @@ -87,9 +87,9 @@ public: virtual int rightmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; virtual int leftmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; - virtual void tqrepaint(Priority p=NormalPriority); + virtual void repaint(Priority p=NormalPriority); - virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); virtual short containingBlockWidth() const; void relativePositionOffset(int &tx, int &ty) const; @@ -202,7 +202,7 @@ protected: /* A box used to represent this object on a line * when its inner content isn't contextually relevant - * (e.g tqreplaced or positioned elements) + * (e.g replaced or positioned elements) */ InlineBox *m_placeHolderBox; }; diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp index 02eaa1599..e8540eba6 100644 --- a/khtml/rendering/render_canvas.cpp +++ b/khtml/rendering/render_canvas.cpp @@ -136,7 +136,7 @@ void RenderCanvas::calcMinMaxWidth() //#define SPEED_DEBUG -void RenderCanvas::tqlayout() +void RenderCanvas::layout() { if (m_pagedMode) { m_minWidth = m_width; @@ -178,12 +178,12 @@ void RenderCanvas::tqlayout() qt.start(); #endif - bool retqlayoutChildren = (oldWidth != m_width) || (oldHeight != m_height); + bool relayoutChildren = (oldWidth != m_width) || (oldHeight != m_height); - RenderBlock::tqlayoutBlock( retqlayoutChildren ); + RenderBlock::layoutBlock( relayoutChildren ); #ifdef SPEED_DEBUG - kdDebug() << "RenderCanvas::tqlayout time used=" << qt.elapsed() << endl; + kdDebug() << "RenderCanvas::layout time used=" << qt.elapsed() << endl; qt.start(); #endif @@ -217,11 +217,11 @@ void RenderCanvas::updateDocumentSize() // if we are about to show a scrollbar, and the document is sized to the viewport w or h, // then reserve the scrollbar space so that it doesn't trigger the _other_ scrollbar - if (!vss && m_width - m_view->verticalScrollBar()->tqsizeHint().width() == s.width() && + if (!vss && m_width - m_view->verticalScrollBar()->sizeHint().width() == s.width() && m_cachedDocWidth <= m_width) hDocW = kMin( m_cachedDocWidth, s.width() ); - if (!hss && m_height - m_view->horizontalScrollBar()->tqsizeHint().height() == s.height() && + if (!hss && m_height - m_view->horizontalScrollBar()->sizeHint().height() == s.height() && m_cachedDocHeight <= m_height) hDocH = kMin( m_cachedDocHeight, s.height() ); @@ -269,7 +269,7 @@ bool RenderCanvas::needsFullRepaint() const return m_needsFullRepaint || m_pagedMode; } -void RenderCanvas::tqrepaintViewRectangle(int x, int y, int w, int h, bool asap) +void RenderCanvas::repaintViewRectangle(int x, int y, int w, int h, bool asap) { KHTMLAssert( view() ); view()->scheduleRepaint( x, y, w, h, asap ); @@ -332,7 +332,7 @@ void RenderCanvas::paintBoxDecorations(PaintInfo& paintInfo, int /*_tx*/, int /* paintInfo.p->fillRect(paintInfo.r, view()->palette().active().color(TQColorGroup::Base)); } -void RenderCanvas::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderCanvas::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) { if (m_staticMode) return; // kdDebug( 6040 ) << "updating views contents (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl; @@ -353,7 +353,7 @@ void RenderCanvas::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bo if (p == RealtimePriority) // ### KWQ's updateContents has an additional parameter "now". // It's not clear what the difference between updateContents(...,true) - // and tqrepaintContents(...) is. As Qt doesn't have this, I'm leaving it out. (LS) + // and repaintContents(...) is. As Qt doesn't have this, I'm leaving it out. (LS) m_view->updateContents(ur/*, true*/); else if (p == HighPriority) m_view->scheduleRepaint(x, y, w, h, true /*asap*/); @@ -372,23 +372,23 @@ void RenderCanvas::scheduleDeferredRepaints() if (!needsFullRepaint()) { TQValueList<RenderObject*>::const_iterator it; for ( it = m_dirtyChildren.begin(); it != m_dirtyChildren.end(); ++it ) - (*it)->tqrepaint(); + (*it)->repaint(); } - //kdDebug(6040) << "scheduled deferred tqrepaints: " << m_dirtyChildren.count() << " needed full tqrepaint: " << needsFullRepaint() << endl; + //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full repaint: " << needsFullRepaint() << endl; m_dirtyChildren.clear(); } -void RenderCanvas::tqrepaint(Priority p) +void RenderCanvas::repaint(Priority p) { if (m_view && !m_staticMode) { if (p == RealtimePriority) { //m_view->resizeContents(docWidth(), docHeight()); m_view->unscheduleRepaint(); if (needsLayout()) { - m_view->scheduleRetqlayout(); + m_view->scheduleRelayout(); return; } - // ### same as in tqrepaintRectangle + // ### same as in repaintRectangle m_view->updateContents(m_view->contentsX(), m_view->contentsY(), m_view->visibleWidth(), m_view->visibleHeight()/*, true*/); } @@ -454,7 +454,7 @@ TQRect RenderCanvas::selectionRect() const void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep) { // Check we got valid renderobjects. www.msnbc.com and clicking - // around, to tqfind the case where this happened. + // around, to find the case where this happened. if ( !s || !e ) { kdWarning(6040) << "RenderCanvas::setSelection() called with start=" << s << " end=" << e << endl; @@ -492,7 +492,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep no = no->nextSibling(); } } - if (os->selectionState() == SelectionInside && !oldSelectedInside.tqcontainsRef(os)) + if (os->selectionState() == SelectionInside && !oldSelectedInside.containsRef(os)) oldSelectedInside.append(os); os = no; @@ -550,7 +550,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep if (no) no = no->nextSibling(); } - if (o->selectionState() == SelectionInside && !newSelectedInside.tqcontainsRef(o)) + if (o->selectionState() == SelectionInside && !newSelectedInside.containsRef(o)) newSelectedInside.append(o); o=no; @@ -567,7 +567,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep TQRect updateRect; - // Don't use tqrepaint() because it will cause all rects to + // Don't use repaint() because it will cause all rects to // be united (see khtmlview::scheduleRepaint()). Instead // just draw damage rects for objects that have a change // in selection state. @@ -581,7 +581,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep TQPtrListIterator<RenderObject> oldIterator(oldSelectedInside); bool firstRect = true; for (; oldIterator.current(); ++oldIterator){ - if (!newSelectedInside.tqcontainsRef(oldIterator.current())){ + if (!newSelectedInside.containsRef(oldIterator.current())){ if (firstRect){ updateRect = enclosingPositionedRect(oldIterator.current()); firstRect = false; @@ -601,7 +601,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep TQPtrListIterator<RenderObject> newIterator(newSelectedInside); firstRect = true; for (; newIterator.current(); ++newIterator){ - if (!oldSelectedInside.tqcontainsRef(newIterator.current())){ + if (!oldSelectedInside.containsRef(newIterator.current())){ if (firstRect){ updateRect = enclosingPositionedRect(newIterator.current()); firstRect = false; @@ -651,9 +651,9 @@ void RenderCanvas::clearSelection(bool doRepaint) { if (o->selectionState()!=SelectionNone) if (doRepaint) - o->tqrepaint(); + o->repaint(); o->setSelectionState(SelectionNone); - o->tqrepaint(); + o->repaint(); RenderObject* no; if ( !(no = o->firstChild()) ) if ( !(no = o->nextSibling()) ) @@ -669,7 +669,7 @@ void RenderCanvas::clearSelection(bool doRepaint) if (m_selectionEnd) { m_selectionEnd->setSelectionState(SelectionNone); if (doRepaint) - m_selectionEnd->tqrepaint(); + m_selectionEnd->repaint(); } // set selection start & end to 0 diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h index 741e56f4e..17f279d7b 100644 --- a/khtml/rendering/render_canvas.h +++ b/khtml/rendering/render_canvas.h @@ -50,7 +50,7 @@ public: virtual bool isCanvas() const { return true; } virtual void setStyle(RenderStyle *style); - virtual void tqlayout(); + virtual void layout(); virtual void calcWidth(); virtual void calcHeight(); virtual void calcMinMaxWidth(); @@ -61,9 +61,9 @@ public: KHTMLView *view() const { return m_view; } - virtual void tqrepaint(Priority p=NormalPriority); - virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); - void tqrepaintViewRectangle(int x, int y, int w, int h, bool asap=false); + virtual void repaint(Priority p=NormalPriority); + virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + void repaintViewRectangle(int x, int y, int w, int h, bool asap=false); bool needsFullRepaint() const; void deferredRepaint( RenderObject* o ); void scheduleDeferredRepaints(); @@ -137,7 +137,7 @@ protected: void updateDocumentSize(); // internal setters for cached values of document width/height - // Setting to -1/-1 tqinvalidates the cache. + // Setting to -1/-1 invalidates the cache. void setCachedDocWidth(int w ) { m_cachedDocWidth = w; } void setCachedDocHeight(int h) { m_cachedDocHeight = h; } @@ -170,7 +170,7 @@ protected: bool m_staticMode; // Canvas is paged bool m_pagedMode; - // Canvas tqcontains overlaid widgets + // Canvas contains overlaid widgets bool m_needsWidgetMasks; short m_pageNr; diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp index df7bfab79..69f987477 100644 --- a/khtml/rendering/render_container.cpp +++ b/khtml/rendering/render_container.cpp @@ -144,7 +144,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild newStyle->inheritFrom(style()); newStyle->setDisplay( TABLE ); newStyle->setFlowAroundFloats( true ); - table->setParent( this ); // so it tqfinds the arena + table->setParent( this ); // so it finds the arena table->setStyle(newStyle); table->setParent( 0 ); addChild(table, beforeChild); @@ -170,15 +170,15 @@ RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild) KHTMLAssert(oldChild->parent() == this); // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or - // that a positioned child got yanked). We also tqrepaint, so that the area exposed when the child - // disappears gets tqrepainted properly. + // that a positioned child got yanked). We also repaint, so that the area exposed when the child + // disappears gets repainted properly. if ( document()->renderer() ) { oldChild->setNeedsLayoutAndMinMaxRecalc(); - oldChild->tqrepaint(); + oldChild->repaint(); // Keep our layer hierarchy updated. oldChild->removeLayers(enclosingLayer()); - // remove the child from any special tqlayout lists + // remove the child from any special layout lists oldChild->removeFromObjectLists(); // if oldChild is the start or end of the selection, then clear @@ -524,7 +524,7 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC } -void RenderContainer::tqlayout() +void RenderContainer::layout() { KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); @@ -532,8 +532,8 @@ void RenderContainer::tqlayout() RenderObject *child = firstChild(); while( child ) { if (pagedMode) child->setNeedsLayout(true); - child->tqlayoutIfNeeded(); - if (child->tqcontainsPageBreak()) setContainsPageBreak(true); + child->layoutIfNeeded(); + if (child->containsPageBreak()) setContainsPageBreak(true); if (child->needsPageClear()) setNeedsPageClear(true); child = child->nextSibling(); } diff --git a/khtml/rendering/render_container.h b/khtml/rendering/render_container.h index fb80bfc55..4cf386140 100644 --- a/khtml/rendering/render_container.h +++ b/khtml/rendering/render_container.h @@ -42,7 +42,7 @@ public: RenderObject *lastChild() const { return m_last; } virtual bool childAllowed() const { - // Prevent normal children when we are tqreplaced by generated content + // Prevent normal children when we are replaced by generated content if (style()) return style()->useNormalContent(); return true; } @@ -53,7 +53,7 @@ public: virtual void appendChildNode(RenderObject* child); virtual void insertChildNode(RenderObject* child, RenderObject* before); - virtual void tqlayout(); + virtual void layout(); virtual void calcMinMaxWidth() { setMinMaxKnown( true ); } virtual void removeLeftoverAnonymousBoxes(); diff --git a/khtml/rendering/render_flow.cpp b/khtml/rendering/render_flow.cpp index 3bd21fe6f..ae579bd46 100644 --- a/khtml/rendering/render_flow.cpp +++ b/khtml/rendering/render_flow.cpp @@ -267,12 +267,12 @@ bool RenderFlow::hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTest } -void RenderFlow::tqrepaint(Priority prior) +void RenderFlow::repaint(Priority prior) { if (isInlineFlow()) { // Find our leftmost position. int left = 0; - // root inline box not reliably availabe during retqlayout + // root inline box not reliably availabe during relayout int top = firstLineBox() ? ( needsLayout() ? firstLineBox()->xPos() : firstLineBox()->root()->topOverflow() ) : 0; @@ -280,7 +280,7 @@ void RenderFlow::tqrepaint(Priority prior) if (curr == firstLineBox() || curr->xPos() < left) left = curr->xPos(); - // Now tqinvalidate a rectangle. + // Now invalidate a rectangle. int ow = style() ? style()->outlineSize() : 0; // We need to add in the relative position offsets of any inlines (including us) up to our @@ -295,18 +295,18 @@ void RenderFlow::tqrepaint(Priority prior) } RootInlineBox *lastRoot = lastLineBox() && !needsLayout() ? lastLineBox()->root() : 0; - containingBlock()->tqrepaintRectangle(-ow+left, -ow+top, + containingBlock()->repaintRectangle(-ow+left, -ow+top, width()+ow*2, (lastRoot ? lastRoot->bottomOverflow() - top : height())+ow*2, prior); } else { if (firstLineBox() && firstLineBox()->topOverflow() < 0) { int ow = style() ? style()->outlineSize() : 0; - tqrepaintRectangle(-ow, -ow+firstLineBox()->topOverflow(), + repaintRectangle(-ow, -ow+firstLineBox()->topOverflow(), effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); } else - return RenderBox::tqrepaint(prior); + return RenderBox::repaint(prior); } } diff --git a/khtml/rendering/render_flow.h b/khtml/rendering/render_flow.h index 85321cd5d..1e23822bb 100644 --- a/khtml/rendering/render_flow.h +++ b/khtml/rendering/render_flow.h @@ -32,12 +32,12 @@ namespace khtml { /** - * all tqgeometry managing stuff is only in the block elements. + * all geometry managing stuff is only in the block elements. * - * Inline elements don't tqlayout themselves, but the whole paragraph + * Inline elements don't layout themselves, but the whole paragraph * gets flowed by the surrounding block element. This is, because * one needs to know the whole paragraph to calculate bidirectional - * behaviour of text, so putting the tqlayouting routines in the inline + * behaviour of text, so putting the layouting routines in the inline * elements is impossible. */ class RenderFlow : public RenderBox @@ -69,7 +69,7 @@ public: void paintLines(PaintInfo& i, int _tx, int _ty); bool hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTestAction hitTestAction); - virtual void tqrepaint(Priority p=NormalPriority); + virtual void repaint(Priority p=NormalPriority); virtual int highestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; virtual int lowestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp index ca556ecb5..58a9a8d33 100644 --- a/khtml/rendering/render_form.cpp +++ b/khtml/rendering/render_form.cpp @@ -81,7 +81,7 @@ void RenderFormElement::updateFromElement() RenderWidget::updateFromElement(); } -void RenderFormElement::tqlayout() +void RenderFormElement::layout() { KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); @@ -155,8 +155,8 @@ void RenderCheckBox::calcMinMaxWidth() KHTMLAssert( !minMaxKnown() ); TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget ); - TQSize s( cb->style().tqpixelMetric( TQStyle::PM_IndicatorWidth ), - cb->style().tqpixelMetric( TQStyle::PM_IndicatorHeight ) ); + TQSize s( cb->style().pixelMetric( TQStyle::PM_IndicatorWidth ), + cb->style().pixelMetric( TQStyle::PM_IndicatorHeight ) ); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); @@ -207,8 +207,8 @@ void RenderRadioButton::calcMinMaxWidth() KHTMLAssert( !minMaxKnown() ); TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget ); - TQSize s( rb->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), - rb->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) ); + TQSize s( rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), + rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) ); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); @@ -260,17 +260,17 @@ void RenderSubmitButton::calcMinMaxWidth() bool empty = raw.isEmpty(); if ( empty ) - raw = TQString::tqfromLatin1("X"); + raw = TQString::fromLatin1("X"); TQFontMetrics fm = pb->fontMetrics(); TQSize ts = fm.size( ShowPrefix, raw); TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts ) .expandedTo(TQApplication::globalStrut())); - int margin = pb->style().tqpixelMetric( TQStyle::PM_ButtonMargin, pb) + - pb->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; + int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) + + pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; int w = ts.width() + margin; int h = s.height(); if (pb->isDefault() || pb->autoDefault()) { - int dbw = pb->style().tqpixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2; + int dbw = pb->style().pixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2; w += dbw; } @@ -491,7 +491,7 @@ void RenderLineEdit::setStyle(RenderStyle* _style) { RenderFormElement::setStyle( _style ); - widget()->tqsetAlignment(textAlignment()); + widget()->setAlignment(textAlignment()); } void RenderLineEdit::highLightWord( unsigned int length, unsigned int pos ) @@ -642,13 +642,13 @@ RenderFieldset::RenderFieldset(HTMLGenericFormElementImpl *element) { } -RenderObject* RenderFieldset::tqlayoutLegend(bool retqlayoutChildren) +RenderObject* RenderFieldset::layoutLegend(bool relayoutChildren) { - RenderObject* legend = tqfindLegend(); + RenderObject* legend = findLegend(); if (legend) { - if (retqlayoutChildren) + if (relayoutChildren) legend->setNeedsLayout(true); - legend->tqlayoutIfNeeded(); + legend->layoutIfNeeded(); int xPos = borderLeft() + paddingLeft() + legend->marginLeft(); if (style()->direction() == RTL) @@ -661,7 +661,7 @@ RenderObject* RenderFieldset::tqlayoutLegend(bool retqlayoutChildren) return legend; } -RenderObject* RenderFieldset::tqfindLegend() +RenderObject* RenderFieldset::findLegend() { for (RenderObject* legend = firstChild(); legend; legend = legend->nextSibling()) { if (!legend->isFloatingOrPositioned() && legend->element() && @@ -675,7 +675,7 @@ void RenderFieldset::paintBoxDecorations(PaintInfo& pI, int _tx, int _ty) { //kdDebug( 6040 ) << renderName() << "::paintDecorations()" << endl; - RenderObject* legend = tqfindLegend(); + RenderObject* legend = findLegend(); if (!legend) return RenderBlock::paintBoxDecorations(pI, _tx, _ty); @@ -768,8 +768,8 @@ void RenderFieldset::setStyle(RenderStyle* _style) RenderBlock::setStyle(_style); // WinIE renders fieldsets with display:inline like they're inline-blocks. For us, - // an inline-block is just a block element with tqreplaced set to true and inline set - // to true. Ensure that if we ended up being inline that we set our tqreplaced flag + // an inline-block is just a block element with replaced set to true and inline set + // to true. Ensure that if we ended up being inline that we set our replaced flag // so that we're treated like an inline-block. if (isInline()) setReplaced(true); @@ -809,7 +809,7 @@ void RenderFileButton::calcMinMaxWidth() edit, TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth())) .expandedTo(TQApplication::globalStrut()); - TQSize bs = static_cast<KURLRequester*>( m_widget )->tqminimumSizeHint() - edit->tqminimumSizeHint(); + TQSize bs = static_cast<KURLRequester*>( m_widget )->minimumSizeHint() - edit->minimumSizeHint(); setIntrinsicWidth( s.width() + bs.width() ); setIntrinsicHeight( kMax(s.height(), bs.height()) ); @@ -1018,7 +1018,7 @@ void RenderSelect::updateFromElement() DOMString label = optElem->getAttribute(ATTR_LABEL); if (!label.isEmpty()) text = label.string(); - text = TQString::tqfromLatin1(" ")+text; + text = TQString::fromLatin1(" ")+text; } if(m_useListBox) { @@ -1065,14 +1065,14 @@ void RenderSelect::calcMinMaxWidth() // ### ugly HACK FIXME!!! setMinMaxKnown(); - tqlayoutIfNeeded(); + layoutIfNeeded(); setNeedsLayoutAndMinMaxRecalc(); // ### end FIXME RenderFormElement::calcMinMaxWidth(); } -void RenderSelect::tqlayout( ) +void RenderSelect::layout( ) { KHTMLAssert(needsLayout()); KHTMLAssert(minMaxKnown()); @@ -1107,21 +1107,21 @@ void RenderSelect::tqlayout( ) if(size < 1) size = kMin(static_cast<KListBox*>(m_widget)->count(), 10u); - width += 2*w->frameWidth() + w->verticalScrollBar()->tqsizeHint().width(); + width += 2*w->frameWidth() + w->verticalScrollBar()->sizeHint().width(); height = size*height + 2*w->frameWidth(); setIntrinsicWidth( width ); setIntrinsicHeight( height ); } else { - TQSize s(m_widget->tqsizeHint()); + TQSize s(m_widget->sizeHint()); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); } /// uuh, ignore the following line.. setNeedsLayout(true); - RenderFormElement::tqlayout(); + RenderFormElement::layout(); // and now disable the widget in case there is no <option> given TQMemArray<HTMLGenericFormElementImpl*> listItems = element()->listItems(); @@ -1145,7 +1145,7 @@ void RenderSelect::slotSelected(int index) // emitted by the combobox only bool found = ( listItems[index]->id() == ID_OPTION ); if ( !found ) { - // this one is not selectable, we need to tqfind an option element + // this one is not selectable, we need to find an option element while ( ( unsigned ) index < listItems.size() ) { if ( listItems[index]->id() == ID_OPTION ) { found = true; @@ -1277,7 +1277,7 @@ void RenderSelect::updateSelection() // ------------------------------------------------------------------------- TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent) - : KTextEdit(parent, "__khtml"), m_tqfindDlg(0), m_tqfind(0), m_repDlg(0), m_tqreplace(0) + : KTextEdit(parent, "__khtml"), m_findDlg(0), m_find(0), m_repDlg(0), m_replace(0) { if(wrap != DOM::HTMLTextAreaElementImpl::ta_NoWrap) { setWordWrap(TQTextEdit::WidgetWidth); @@ -1295,22 +1295,22 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent) setMouseTracking(true); KActionCollection *ac = new KActionCollection(this); - m_tqfindAction = KStdAction::tqfind( this, TQT_SLOT( slotFind() ), ac ); - m_tqfindNextAction = KStdAction::tqfindNext( this, TQT_SLOT( slotFindNext() ), ac ); - m_tqreplaceAction = KStdAction::tqreplace( this, TQT_SLOT( slotReplace() ), ac ); + m_findAction = KStdAction::find( this, TQT_SLOT( slotFind() ), ac ); + m_findNextAction = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac ); + m_replaceAction = KStdAction::replace( this, TQT_SLOT( slotReplace() ), ac ); } TextAreaWidget::~TextAreaWidget() { - delete m_tqreplace; - m_tqreplace = 0L; - delete m_tqfind; - m_tqfind = 0L; + delete m_replace; + m_replace = 0L; + delete m_find; + m_find = 0L; delete m_repDlg; m_repDlg = 0L; - delete m_tqfindDlg; - m_tqfindDlg = 0L; + delete m_findDlg; + m_findDlg = 0L; } @@ -1325,14 +1325,14 @@ TQPopupMenu *TextAreaWidget::createPopupMenu(const TQPoint& pos) if (!isReadOnly()) { popup->insertSeparator(); - m_tqfindAction->plug(popup); - m_tqfindAction->setEnabled( !text().isEmpty() ); + m_findAction->plug(popup); + m_findAction->setEnabled( !text().isEmpty() ); - m_tqfindNextAction->plug(popup); - m_tqfindNextAction->setEnabled( m_tqfind != 0 ); + m_findNextAction->plug(popup); + m_findNextAction->setEnabled( m_find != 0 ); - m_tqreplaceAction->plug(popup); - m_tqreplaceAction->setEnabled( !text().isEmpty() ); + m_replaceAction->plug(popup); + m_replaceAction->setEnabled( !text().isEmpty() ); } return popup; @@ -1343,24 +1343,24 @@ void TextAreaWidget::slotFindHighlight(const TQString& text, int matchingIndex, { Q_UNUSED(text) //kdDebug() << "Highlight: [" << text << "] mi:" << matchingIndex << " ml:" << matchingLength << endl; - if (sender() == m_tqreplace) { + if (sender() == m_replace) { setSelection(m_repPara, matchingIndex, m_repPara, matchingIndex + matchingLength); setCursorPosition(m_repPara, matchingIndex); } else { - setSelection(m_tqfindPara, matchingIndex, m_tqfindPara, matchingIndex + matchingLength); - setCursorPosition(m_tqfindPara, matchingIndex); + setSelection(m_findPara, matchingIndex, m_findPara, matchingIndex + matchingLength); + setCursorPosition(m_findPara, matchingIndex); } ensureCursorVisible(); } -void TextAreaWidget::slotReplaceText(const TQString &text, int tqreplacementIndex, int /*tqreplacedLength*/, int matchedLength) { +void TextAreaWidget::slotReplaceText(const TQString &text, int replacementIndex, int /*replacedLength*/, int matchedLength) { Q_UNUSED(text) - //kdDebug() << "Replace: [" << text << "] ri:" << tqreplacementIndex << " rl:" << tqreplacedLength << " ml:" << matchedLength << endl; - setSelection(m_repPara, tqreplacementIndex, m_repPara, tqreplacementIndex + matchedLength); + //kdDebug() << "Replace: [" << text << "] ri:" << replacementIndex << " rl:" << replacedLength << " ml:" << matchedLength << endl; + setSelection(m_repPara, replacementIndex, m_repPara, replacementIndex + matchedLength); removeSelectedText(); - insertAt(m_repDlg->tqreplacement(), m_repPara, tqreplacementIndex); - if (m_tqreplace->options() & KReplaceDialog::PromptOnReplace) { + insertAt(m_repDlg->replacement(), m_repPara, replacementIndex); + if (m_replace->options() & KReplaceDialog::PromptOnReplace) { ensureCursorVisible(); } } @@ -1373,11 +1373,11 @@ void TextAreaWidget::slotDoReplace() return; } - delete m_tqreplace; - m_tqreplace = new KReplace(m_repDlg->pattern(), m_repDlg->tqreplacement(), m_repDlg->options(), this); - if (m_tqreplace->options() & KFindDialog::FromCursor) { + delete m_replace; + m_replace = new KReplace(m_repDlg->pattern(), m_repDlg->replacement(), m_repDlg->options(), this); + if (m_replace->options() & KFindDialog::FromCursor) { getCursorPosition(&m_repPara, &m_repIndex); - } else if (m_tqreplace->options() & KFindDialog::FindBackwards) { + } else if (m_replace->options() & KFindDialog::FindBackwards) { m_repPara = paragraphs() - 1; m_repIndex = paragraphLength(m_repPara) - 1; } else { @@ -1387,10 +1387,10 @@ void TextAreaWidget::slotDoReplace() // Connect highlight signal to code which handles highlighting // of found text. - connect(m_tqreplace, TQT_SIGNAL(highlight(const TQString &, int, int)), + connect(m_replace, TQT_SIGNAL(highlight(const TQString &, int, int)), this, TQT_SLOT(slotFindHighlight(const TQString &, int, int))); - connect(m_tqreplace, TQT_SIGNAL(tqfindNext()), this, TQT_SLOT(slotReplaceNext())); - connect(m_tqreplace, TQT_SIGNAL(tqreplace(const TQString &, int, int, int)), + connect(m_replace, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotReplaceNext())); + connect(m_replace, TQT_SIGNAL(replace(const TQString &, int, int, int)), this, TQT_SLOT(slotReplaceText(const TQString &, int, int, int))); m_repDlg->close(); @@ -1400,19 +1400,19 @@ void TextAreaWidget::slotDoReplace() void TextAreaWidget::slotReplaceNext() { - if (!m_tqreplace) { + if (!m_replace) { // assert? return; } - if (!(m_tqreplace->options() & KReplaceDialog::PromptOnReplace)) { + if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) { viewport()->setUpdatesEnabled(false); } KFind::Result res = KFind::NoMatch; while (res == KFind::NoMatch) { // If we're done..... - if (m_tqreplace->options() & KFindDialog::FindBackwards) { + if (m_replace->options() & KFindDialog::FindBackwards) { if (m_repIndex == 0 && m_repPara == 0) { break; } @@ -1423,14 +1423,14 @@ void TextAreaWidget::slotReplaceNext() } } - if (m_tqreplace->needData()) { - m_tqreplace->setData(text(m_repPara), m_repIndex); + if (m_replace->needData()) { + m_replace->setData(text(m_repPara), m_repIndex); } - res = m_tqreplace->tqreplace(); + res = m_replace->replace(); if (res == KFind::NoMatch) { - if (m_tqreplace->options() & KFindDialog::FindBackwards) { + if (m_replace->options() & KFindDialog::FindBackwards) { if (m_repPara == 0) { m_repIndex = 0; } else { @@ -1448,57 +1448,57 @@ void TextAreaWidget::slotReplaceNext() } } - if (!(m_tqreplace->options() & KReplaceDialog::PromptOnReplace)) { + if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) { viewport()->setUpdatesEnabled(true); - tqrepaintChanged(); + repaintChanged(); } if (res == KFind::NoMatch) { // at end - m_tqreplace->displayFinalDialog(); - delete m_tqreplace; - m_tqreplace = 0; + m_replace->displayFinalDialog(); + delete m_replace; + m_replace = 0; ensureCursorVisible(); - //or if ( m_tqreplace->shouldRestart() ) { reinit (w/o FromCursor) and call slotReplaceNext(); } + //or if ( m_replace->shouldRestart() ) { reinit (w/o FromCursor) and call slotReplaceNext(); } } else { - //m_tqreplace->closeReplaceNextDialog(); + //m_replace->closeReplaceNextDialog(); } } void TextAreaWidget::slotDoFind() { - if (!m_tqfindDlg) { + if (!m_findDlg) { // Should really assert() return; } - delete m_tqfind; - m_tqfind = new KFind(m_tqfindDlg->pattern(), m_tqfindDlg->options(), this); - if (m_tqfind->options() & KFindDialog::FromCursor) { - getCursorPosition(&m_tqfindPara, &m_tqfindIndex); - } else if (m_tqfind->options() & KFindDialog::FindBackwards) { - m_tqfindPara = paragraphs() - 1; - m_tqfindIndex = paragraphLength(m_tqfindPara) - 1; + delete m_find; + m_find = new KFind(m_findDlg->pattern(), m_findDlg->options(), this); + if (m_find->options() & KFindDialog::FromCursor) { + getCursorPosition(&m_findPara, &m_findIndex); + } else if (m_find->options() & KFindDialog::FindBackwards) { + m_findPara = paragraphs() - 1; + m_findIndex = paragraphLength(m_findPara) - 1; } else { - m_tqfindPara = 0; - m_tqfindIndex = 0; + m_findPara = 0; + m_findIndex = 0; } // Connect highlight signal to code which handles highlighting // of found text. - connect(m_tqfind, TQT_SIGNAL(highlight(const TQString &, int, int)), + connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)), this, TQT_SLOT(slotFindHighlight(const TQString &, int, int))); - connect(m_tqfind, TQT_SIGNAL(tqfindNext()), this, TQT_SLOT(slotFindNext())); + connect(m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext())); - m_tqfindDlg->close(); - m_tqfind->closeFindNextDialog(); + m_findDlg->close(); + m_find->closeFindNextDialog(); slotFindNext(); } void TextAreaWidget::slotFindNext() { - if (!m_tqfind) { + if (!m_find) { // assert? return; } @@ -1506,49 +1506,49 @@ void TextAreaWidget::slotFindNext() KFind::Result res = KFind::NoMatch; while (res == KFind::NoMatch) { // If we're done..... - if (m_tqfind->options() & KFindDialog::FindBackwards) { - if (m_tqfindIndex == 0 && m_tqfindPara == 0) { + if (m_find->options() & KFindDialog::FindBackwards) { + if (m_findIndex == 0 && m_findPara == 0) { break; } } else { - if (m_tqfindPara == paragraphs() - 1 && - m_tqfindIndex == paragraphLength(m_tqfindPara) - 1) { + if (m_findPara == paragraphs() - 1 && + m_findIndex == paragraphLength(m_findPara) - 1) { break; } } - if (m_tqfind->needData()) { - m_tqfind->setData(text(m_tqfindPara), m_tqfindIndex); + if (m_find->needData()) { + m_find->setData(text(m_findPara), m_findIndex); } - res = m_tqfind->tqfind(); + res = m_find->find(); if (res == KFind::NoMatch) { - if (m_tqfind->options() & KFindDialog::FindBackwards) { - if (m_tqfindPara == 0) { - m_tqfindIndex = 0; + if (m_find->options() & KFindDialog::FindBackwards) { + if (m_findPara == 0) { + m_findIndex = 0; } else { - m_tqfindPara--; - m_tqfindIndex = paragraphLength(m_tqfindPara) - 1; + m_findPara--; + m_findIndex = paragraphLength(m_findPara) - 1; } } else { - if (m_tqfindPara == paragraphs() - 1) { - m_tqfindIndex = paragraphLength(m_tqfindPara) - 1; + if (m_findPara == paragraphs() - 1) { + m_findIndex = paragraphLength(m_findPara) - 1; } else { - m_tqfindPara++; - m_tqfindIndex = 0; + m_findPara++; + m_findIndex = 0; } } } } if (res == KFind::NoMatch) { // at end - m_tqfind->displayFinalDialog(); - delete m_tqfind; - m_tqfind = 0; - //or if ( m_tqfind->shouldRestart() ) { reinit (w/o FromCursor) and call slotFindNext(); } + m_find->displayFinalDialog(); + delete m_find; + m_find = 0; + //or if ( m_find->shouldRestart() ) { reinit (w/o FromCursor) and call slotFindNext(); } } else { - //m_tqfind->closeFindNextDialog(); + //m_find->closeFindNextDialog(); } } @@ -1558,13 +1558,13 @@ void TextAreaWidget::slotFind() if( text().isEmpty() ) // saves having to track the text changes return; - if ( m_tqfindDlg ) { - KWin::activateWindow( m_tqfindDlg->winId() ); + if ( m_findDlg ) { + KWin::activateWindow( m_findDlg->winId() ); } else { - m_tqfindDlg = new KFindDialog(false, this, "KHTML Text Area Find Dialog"); - connect( m_tqfindDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) ); + m_findDlg = new KFindDialog(false, this, "KHTML Text Area Find Dialog"); + connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) ); } - m_tqfindDlg->show(); + m_findDlg->show(); } @@ -1651,10 +1651,10 @@ void RenderTextArea::calcMinMaxWidth() const TQFontMetrics &m = style()->fontMetrics(); w->setTabStopWidth(8 * m.width(" ")); TQSize size( kMax(element()->cols(), 1L)*m.width('x') + w->frameWidth() + - w->verticalScrollBar()->tqsizeHint().width(), + w->verticalScrollBar()->sizeHint().width(), kMax(element()->rows(), 1L)*m.lineSpacing() + w->frameWidth()*4 + (w->wordWrap() == TQTextEdit::NoWrap ? - w->horizontalScrollBar()->tqsizeHint().height() : 0) + w->horizontalScrollBar()->sizeHint().height() : 0) ); setIntrinsicWidth( size.width() ); @@ -1670,7 +1670,7 @@ void RenderTextArea::setStyle(RenderStyle* _style) RenderFormElement::setStyle(_style); widget()->blockSignals(true); - widget()->tqsetAlignment(textAlignment()); + widget()->setAlignment(textAlignment()); widget()->blockSignals(false); scrollbarsStyled = false; @@ -1678,11 +1678,11 @@ void RenderTextArea::setStyle(RenderStyle* _style) element()->m_unsubmittedFormChange = unsubmittedFormChange; } -void RenderTextArea::tqlayout() +void RenderTextArea::layout() { KHTMLAssert( needsLayout() ); - RenderFormElement::tqlayout(); + RenderFormElement::layout(); TextAreaWidget* w = static_cast<TextAreaWidget*>(m_widget); @@ -1738,13 +1738,13 @@ TQString RenderTextArea::text() paragraphText = paragraphText.left(pl); //Snip invented space. for (int l = 0; l < pl; ++l) { if (lindex != w->lineOfChar(p, l)) { - paragraphText.insert(l+ll++, TQString::tqfromLatin1("\n")); + paragraphText.insert(l+ll++, TQString::fromLatin1("\n")); lindex = w->lineOfChar(p, l); } } txt += paragraphText; if (p < w->paragraphs() - 1) - txt += TQString::tqfromLatin1("\n"); + txt += TQString::fromLatin1("\n"); } } else @@ -1817,7 +1817,7 @@ void RenderTextArea::computeParagraphAndIndex(long offset, int* para, int* index return; } - //Find the paragraph that tqcontains us.. + //Find the paragraph that contains us.. int containingPar = 0; long endPos = 0; long startPos = 0; @@ -1833,7 +1833,7 @@ void RenderTextArea::computeParagraphAndIndex(long offset, int* para, int* index *para = containingPar; - //Now, scan within the paragraph to tqfind the position.. + //Now, scan within the paragraph to find the position.. long localOffset = offset - startPos; *index = queryParagraphInfo(containingPar, ParaPortionOffset, localOffset); diff --git a/khtml/rendering/render_form.h b/khtml/rendering/render_form.h index 52caee0ea..c414e079c 100644 --- a/khtml/rendering/render_form.h +++ b/khtml/rendering/render_form.h @@ -86,7 +86,7 @@ public: virtual void updateFromElement(); - virtual void tqlayout(); + virtual void layout(); virtual short baselinePosition( bool ) const; DOM::HTMLGenericFormElementImpl *element() const @@ -293,14 +293,14 @@ public: RenderFieldset(DOM::HTMLGenericFormElementImpl *element); virtual const char *renderName() const { return "RenderFieldSet"; } - virtual RenderObject* tqlayoutLegend(bool retqlayoutChildren); + virtual RenderObject* layoutLegend(bool relayoutChildren); virtual void setStyle(RenderStyle* _style); protected: virtual void paintBoxDecorations(PaintInfo& pI, int _tx, int _ty); void paintBorderMinusLegend(TQPainter *p, int _tx, int _ty, int w, int h, const RenderStyle *style, int lx, int lw); - RenderObject* tqfindLegend(); + RenderObject* findLegend(); }; // ------------------------------------------------------------------------- @@ -385,7 +385,7 @@ public: virtual const char *renderName() const { return "RenderSelect"; } virtual void calcMinMaxWidth(); - virtual void tqlayout(); + virtual void layout(); void setOptionsChanged(bool _optionsChanged); @@ -436,14 +436,14 @@ private slots: void slotReplaceText(const TQString&, int, int, int); void slotFindHighlight(const TQString&, int, int); private: - KFindDialog *m_tqfindDlg; - KFind *m_tqfind; + KFindDialog *m_findDlg; + KFind *m_find; KReplaceDialog *m_repDlg; - KReplace *m_tqreplace; - KAction *m_tqfindAction; - KAction *m_tqfindNextAction; - KAction *m_tqreplaceAction; - int m_tqfindIndex, m_tqfindPara; + KReplace *m_replace; + KAction *m_findAction; + KAction *m_findNextAction; + KAction *m_replaceAction; + int m_findIndex, m_findPara; int m_repIndex, m_repPara; }; @@ -459,7 +459,7 @@ public: virtual const char *renderName() const { return "RenderTextArea"; } virtual void calcMinMaxWidth(); - virtual void tqlayout(); + virtual void layout(); virtual void setStyle(RenderStyle *style); virtual void close ( ); diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp index cf94ffe15..3d06b7e6d 100644 --- a/khtml/rendering/render_frames.cpp +++ b/khtml/rendering/render_frames.cpp @@ -99,7 +99,7 @@ bool RenderFrameSet::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _t return inside || m_clientresizing; } -void RenderFrameSet::tqlayout( ) +void RenderFrameSet::layout( ) { KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); @@ -111,7 +111,7 @@ void RenderFrameSet::tqlayout( ) } #ifdef DEBUG_LAYOUT - kdDebug( 6040 ) << renderName() << "(FrameSet)::tqlayout( ) width=" << width() << ", height=" << height() << endl; + kdDebug( 6040 ) << renderName() << "(FrameSet)::layout( ) width=" << width() << ", height=" << height() << endl; #endif int remainingLen[2]; @@ -308,7 +308,7 @@ void RenderFrameSet::tqlayout( ) gridLayout[gridLen - 1] += remainingLen[k]; } - // now we have the final tqlayout, distribute the delta over it + // now we have the final layout, distribute the delta over it bool worked = true; for (int i = 0; i < gridLen; ++i) { if (gridLayout[i] && gridLayout[i] + gridDelta[i] <= 0) @@ -385,7 +385,7 @@ void RenderFrameSet::tqlayout( ) } } - RenderContainer::tqlayout(); + RenderContainer::layout(); end2: setNeedsLayout(false); } @@ -418,7 +418,7 @@ void RenderFrameSet::positionFrames() child->setWidth( m_gridLayout[1][c] ); child->setHeight( m_gridLayout[0][r] ); child->setNeedsLayout(true); - child->tqlayout(); + child->layout(); } xPos += m_gridLayout[1][c] + element()->border(); @@ -540,7 +540,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) m_gridDelta[0][m_hSplit+1] += delta; } - // this just schedules the retqlayout + // this just schedules the relayout // important, otherwise the moving indicator is not correctly erased setNeedsLayout(true); } @@ -583,7 +583,7 @@ void RenderFrameSet::setResizing(bool e) bool RenderFrameSet::canResize( int _x, int _y ) { - // if we haven't received a tqlayout, then the gridLayout doesn't contain useful data yet + // if we haven't received a layout, then the gridLayout doesn't contain useful data yet if (needsLayout() || !m_gridLayout[0] || !m_gridLayout[1] ) return false; // check if we're over a horizontal or vertical boundary @@ -641,7 +641,7 @@ void RenderPart::setWidget( TQWidget *widget ) setNeedsLayoutAndMinMaxRecalc(); // make sure the scrollbars are set correctly for restore - // ### tqfind better fix + // ### find better fix slotViewCleared(); } @@ -728,16 +728,16 @@ void RenderPartObject::updateWidget() HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>( child ); TQString aStr = p->name(); - aStr += TQString::tqfromLatin1("=\""); + aStr += TQString::fromLatin1("=\""); aStr += p->value(); - aStr += TQString::tqfromLatin1("\""); + aStr += TQString::fromLatin1("\""); TQString name_lower = p->name().lower(); - if (name_lower == TQString::tqfromLatin1("type") && objbase->id() != ID_APPLET) { + if (name_lower == TQString::fromLatin1("type") && objbase->id() != ID_APPLET) { objbase->setServiceType(p->value()); } else if (url.isEmpty() && - (name_lower == TQString::tqfromLatin1("src") || - name_lower == TQString::tqfromLatin1("movie") || - name_lower == TQString::tqfromLatin1("code"))) { + (name_lower == TQString::fromLatin1("src") || + name_lower == TQString::fromLatin1("movie") || + name_lower == TQString::fromLatin1("code"))) { url = p->value(); } params.append(aStr); @@ -754,8 +754,8 @@ void RenderPartObject::updateWidget() } } } - params.append( TQString::tqfromLatin1("__KHTML__PLUGINEMBED=\"YES\"") ); - params.append( TQString::tqfromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url())); + params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") ); + params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url())); HTMLEmbedElementImpl *embed = 0; TQString classId; @@ -775,18 +775,18 @@ void RenderPartObject::updateWidget() } classId = objbase->classId; - params.append( TQString::tqfromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) ); - params.append( TQString::tqfromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); + params.append( TQString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) ); + params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); if (!objbase->getAttribute(ATTR_WIDTH).isEmpty()) - params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) ); + params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) ); else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) { - params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) ); + params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) ); objbase->setAttribute(ATTR_WIDTH, embed->getAttribute(ATTR_WIDTH)); } if (!objbase->getAttribute(ATTR_HEIGHT).isEmpty()) - params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) ); + params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) ); else if (embed && !embed->getAttribute(ATTR_HEIGHT).isEmpty()) { - params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) ); + params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) ); objbase->setAttribute(ATTR_HEIGHT, embed->getAttribute(ATTR_HEIGHT)); } @@ -808,7 +808,7 @@ void RenderPartObject::updateWidget() serviceType = "application/x-activex-handler"; #endif - if(classId.tqfind(TQString::tqfromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) { + if(classId.find(TQString::fromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) { // It is ActiveX, but the nsplugin system handling // should also work, that's why we don't override the // serviceType with application/x-activex-handler @@ -817,17 +817,17 @@ void RenderPartObject::updateWidget() // with nspluginviewer (Niko) serviceType = "application/x-shockwave-flash"; } - else if(classId.tqfind(TQString::tqfromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0) + else if(classId.find(TQString::fromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0) serviceType = "audio/x-pn-realaudio-plugin"; - else if(classId.tqfind(TQString::tqfromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 || - objbase->classId.tqfind(TQString::tqfromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0) + else if(classId.find(TQString::fromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 || + objbase->classId.find(TQString::fromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0) serviceType = "application/x-java-applet"; // http://www.apple.com/quicktime/tools_tips/tutorials/activex.html - else if(classId.tqfind(TQString::tqfromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0) + else if(classId.find(TQString::fromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0) serviceType = "video/quicktime"; // http://msdn.microsoft.com/library/en-us/dnwmt/html/adding_windows_media_to_web_pages__etse.asp?frame=true - else if(objbase->classId.tqfind(TQString::tqfromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 || - classId.tqfind(TQString::tqfromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0) + else if(objbase->classId.find(TQString::fromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 || + classId.find(TQString::fromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0) serviceType = "video/x-msvideo"; else @@ -900,7 +900,7 @@ bool RenderPartObject::partLoadingErrorNotify( khtml::ChildFrame *childFrame, co void RenderPartObject::slotPartLoadingErrorNotify() { - // First we need to tqfind out the servicetype - again - this code is too duplicated ! + // First we need to find out the servicetype - again - this code is too duplicated ! HTMLEmbedElementImpl *embed = 0; TQString serviceType; if( element()->id()==ID_OBJECT ) { @@ -974,7 +974,7 @@ void RenderPartObject::slotPartLoadingErrorNotify() deref(); } -void RenderPartObject::tqlayout( ) +void RenderPartObject::layout( ) { KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); @@ -982,7 +982,7 @@ void RenderPartObject::tqlayout( ) calcWidth(); calcHeight(); - RenderPart::tqlayout(); + RenderPart::layout(); setNeedsLayout(false); } diff --git a/khtml/rendering/render_frames.h b/khtml/rendering/render_frames.h index d0867ba29..3dd7ed0d9 100644 --- a/khtml/rendering/render_frames.h +++ b/khtml/rendering/render_frames.h @@ -50,7 +50,7 @@ public: virtual const char *renderName() const { return "RenderFrameSet"; } virtual bool isFrameSet() const { return true; } - virtual void tqlayout(); + virtual void layout(); void positionFrames( ); @@ -61,7 +61,7 @@ public: bool canResize( int _x, int _y); void setResizing(bool e); - Qt::tqCursorShape cursorShape() const { return m_cursor; } + Qt::CursorShape cursorShape() const { return m_cursor; } bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside); @@ -73,7 +73,7 @@ public: #endif private: - Qt::tqCursorShape m_cursor; + Qt::CursorShape m_cursor; int m_oldpos; int m_gridLen[2]; int* m_gridDelta[2]; @@ -154,7 +154,7 @@ public: virtual void close(); - virtual void tqlayout( ); + virtual void layout( ); virtual void updateWidget(); virtual bool canHaveBorder() const { return true; } diff --git a/khtml/rendering/render_generated.cpp b/khtml/rendering/render_generated.cpp index b067d5b9d..17c65fc9c 100644 --- a/khtml/rendering/render_generated.cpp +++ b/khtml/rendering/render_generated.cpp @@ -36,14 +36,14 @@ RenderCounterBase::RenderCounterBase(DOM::NodeImpl* node) { } -void RenderCounterBase::tqlayout() +void RenderCounterBase::layout() { KHTMLAssert( needsLayout() ); if ( !minMaxKnown() ) calcMinMaxWidth(); - RenderText::tqlayout(); + RenderText::layout(); } void RenderCounterBase::calcMinMaxWidth() @@ -53,7 +53,7 @@ void RenderCounterBase::calcMinMaxWidth() generateContent(); if (str) str->deref(); - str = new DOM::DOMStringImpl(m_item.tqunicode(), m_item.length()); + str = new DOM::DOMStringImpl(m_item.unicode(), m_item.length()); str->ref(); RenderText::calcMinMaxWidth(); diff --git a/khtml/rendering/render_generated.h b/khtml/rendering/render_generated.h index 3b02bc338..6fa20e7cd 100644 --- a/khtml/rendering/render_generated.h +++ b/khtml/rendering/render_generated.h @@ -41,7 +41,7 @@ public: virtual const char *renderName() const { return "RenderCounterBase"; } - virtual void tqlayout( ); + virtual void layout( ); virtual void calcMinMaxWidth(); virtual bool isCounter() const { return true; } diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp index 5b438184c..120e75361 100644 --- a/khtml/rendering/render_image.cpp +++ b/khtml/rendering/render_image.cpp @@ -137,7 +137,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o) } berrorPic = o->isErrorImage(); - bool needtqlayout = false; + bool needlayout = false; // Image dimensions have been changed, see what needs to be done if( o->pixmap_size().width() != intrinsicWidth() || @@ -152,7 +152,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o) setIntrinsicHeight( o->pixmap_size().height() ); } - // lets see if we need to retqlayout at all.. + // lets see if we need to relayout at all.. int oldwidth = m_width; int oldheight = m_height; int oldminwidth = m_minWidth; @@ -164,7 +164,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o) } if(iwchanged || m_width != oldwidth || m_height != oldheight) - needtqlayout = true; + needlayout = true; m_minWidth = oldminwidth; m_width = oldwidth; @@ -175,7 +175,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o) if ( !parent() ) return; - if(needtqlayout) + if(needlayout) { if (!selfNeedsLayout()) setNeedsLayout(true); @@ -196,10 +196,10 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o) resizeCache = TQPixmap(); // for resized animations if(completeRepaint) - tqrepaintRectangle(borderLeft()+paddingLeft(), borderTop()+paddingTop(), contentWidth(), contentHeight()); + repaintRectangle(borderLeft()+paddingLeft(), borderTop()+paddingTop(), contentWidth(), contentHeight()); else { - tqrepaintRectangle(r.x() + borderLeft() + paddingLeft(), r.y() + borderTop() + paddingTop(), + repaintRectangle(r.x() + borderLeft() + paddingLeft(), r.y() + borderTop() + paddingTop(), r.width(), r.height()); } } @@ -213,7 +213,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) if (paintInfo.phase != PaintActionForeground && paintInfo.phase != PaintActionSelection) return; - // not visible or not even once tqlayouted? + // not visible or not even once layouted? if (style()->visibility() != VISIBLE || m_y <= -500000) return; _tx += m_x; @@ -376,7 +376,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) } } -void RenderImage::tqlayout() +void RenderImage::layout() { KHTMLAssert( needsLayout()); KHTMLAssert( minMaxKnown() ); @@ -416,7 +416,7 @@ void RenderImage::notifyFinished(CachedObject *finishedObj) if ( ( m_cachedImage == finishedObj || m_oldImage == finishedObj ) && m_oldImage ) { m_oldImage->deref( this ); m_oldImage = 0; - tqrepaint(); + repaint(); } RenderReplaced::notifyFinished(finishedObj); diff --git a/khtml/rendering/render_image.h b/khtml/rendering/render_image.h index 7fc7b4c4a..8c8bb9bef 100644 --- a/khtml/rendering/render_image.h +++ b/khtml/rendering/render_image.h @@ -45,7 +45,7 @@ public: virtual const char *renderName() const { return "RenderImage"; } virtual void paint( PaintInfo& i, int tx, int ty ); - virtual void tqlayout(); + virtual void layout(); virtual void setPixmap( const TQPixmap &, const TQRect&, CachedImage *); diff --git a/khtml/rendering/render_inline.cpp b/khtml/rendering/render_inline.cpp index bc783d8ab..c3eb08d4b 100644 --- a/khtml/rendering/render_inline.cpp +++ b/khtml/rendering/render_inline.cpp @@ -57,7 +57,7 @@ void RenderInline::setStyle(RenderStyle* _style) } if (attached()) { - // Update tqreplaced content + // Update replaced content updateReplacedContent(); // Update pseudos for ::before and ::after updatePseudoChildren(); @@ -864,7 +864,7 @@ void RenderInline::caretPos(int offset, int flags, int &_x, int &_y, int &width, RenderBlock *cb = containingBlock(); bool rtl = cb->style()->direction() == RTL; bool outsideEnd = flags & CFOutsideEnd; - // I need to explain that: outsideEnd tqcontains a meaningful value if + // I need to explain that: outsideEnd contains a meaningful value if // and only if flags & CFOutside is set. If it is not, then randomly // either the first or the last line box is returned. // This doesn't matter because the only case this can happen is on an diff --git a/khtml/rendering/render_inline.h b/khtml/rendering/render_inline.h index 3bb290392..5f4bf7b29 100644 --- a/khtml/rendering/render_inline.h +++ b/khtml/rendering/render_inline.h @@ -54,7 +54,7 @@ public: virtual void setStyle(RenderStyle* _style); virtual void attach(); - virtual void tqlayout() {} // Do nothing for tqlayout() + virtual void layout() {} // Do nothing for layout() virtual void paint(PaintInfo&, int tx, int ty); diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp index 8fce128da..2b7e93f1f 100644 --- a/khtml/rendering/render_layer.cpp +++ b/khtml/rendering/render_layer.cpp @@ -37,7 +37,7 @@ * version of this file only under the terms of one of those two * licenses (the MPL or the GPL) and not to allow others to use your * version of this file under the LGPL, indicate your decision by - * deletingthe provisions above and tqreplace them with the notice and + * deletingthe provisions above and replace them with the notice and * other provisions required by the MPL or the GPL, as the case may be. * If you do not delete the provisions above, a recipient may use your * version of this file under any of the LGPL, the MPL or the GPL. @@ -123,7 +123,7 @@ RenderLayer::~RenderLayer() void RenderLayer::updateLayerPosition() { - // The canvas is sized to the docWidth/Height over in RenderCanvas::tqlayout, so we + // The canvas is sized to the docWidth/Height over in RenderCanvas::layout, so we // don't need to ever update our layer position here. if (renderer()->isCanvas()) return; @@ -195,17 +195,17 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer) return r; } -void RenderLayer::tqrepaint( Priority p, bool markForRepaint ) +void RenderLayer::repaint( Priority p, bool markForRepaint ) { if (markForRepaint && m_markedForRepaint) return; for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) - child->tqrepaint( p, markForRepaint ); + child->repaint( p, markForRepaint ); TQRect layerBounds, damageRect, fgrect; calculateRects(renderer()->canvas()->layer(), renderer()->viewRect(), layerBounds, damageRect, fgrect); m_visibleRect = damageRect.intersect( layerBounds ); if (m_visibleRect.isValid()) - renderer()->canvas()->tqrepaintViewRectangle( m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority) ); + renderer()->canvas()->repaintViewRectangle( m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority) ); if (markForRepaint) m_markedForRepaint = true; } @@ -213,7 +213,7 @@ void RenderLayer::tqrepaint( Priority p, bool markForRepaint ) void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepaint, bool checkForRepaint) { if (doFullRepaint) { - m_object->tqrepaint(); + m_object->repaint(); checkForRepaint = doFullRepaint = false; } @@ -233,14 +233,14 @@ void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepain #ifdef APPLE_CHANGES // FIXME: Child object could override visibility. if (checkForRepaint && (m_object->style()->visibility() == VISIBLE)) - m_object->tqrepaintAfterLayoutIfNeeded(m_tqrepaintRect, m_fullRepaintRect); + m_object->repaintAfterLayoutIfNeeded(m_repaintRect, m_fullRepaintRect); #else if (checkForRepaint && m_markedForRepaint) { TQRect layerBounds, damageRect, fgrect; calculateRects(rootLayer, renderer()->viewRect(), layerBounds, damageRect, fgrect); TQRect vr = damageRect.intersect( layerBounds ); if (vr != m_visibleRect && vr.isValid()) { - renderer()->canvas()->tqrepaintViewRectangle( vr.x(), vr.y(), vr.width(), vr.height() ); + renderer()->canvas()->repaintViewRectangle( vr.x(), vr.y(), vr.width(), vr.height() ); m_visibleRect = vr; } } @@ -340,7 +340,7 @@ void RenderLayer::operator delete(void* ptr, size_t sz) { assert(inRenderLayerDetach); - // Stash size where detach can tqfind it. + // Stash size where detach can find it. *(size_t *)ptr = sz; } @@ -450,7 +450,7 @@ void RenderLayer::insertOnlyThisLayer() RenderLayer* parentLayer = renderer()->parent()->enclosingLayer(); if (parentLayer) parentLayer->addChild(this, - renderer()->parent()->tqfindNextLayer(parentLayer, renderer())); + renderer()->parent()->findNextLayer(parentLayer, renderer())); } // Remove all descendant layers from the hierarchy and add them to the new position. @@ -528,7 +528,7 @@ void RenderLayer::checkInlineRelOffset(const RenderObject* o, int& x, int& y) // Despite the positioned child being a block display type inside an inline, we still keep // its x locked to our left. Arguably the correct behavior would be to go flush left to - // the block that tqcontains us, but that isn't what other browsers do. + // the block that contains us, but that isn't what other browsers do. if (o->hasStaticX() && !isInlineType) // Avoid adding in the left border/padding of the containing block twice. Subtract it out. x += sx - (o->containingBlock()->borderLeft() + o->containingBlock()->paddingLeft()); @@ -537,7 +537,7 @@ void RenderLayer::checkInlineRelOffset(const RenderObject* o, int& x, int& y) y += sy; } -void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrepaint) +void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repaint) { if (renderer()->style()->overflowX() != OMARQUEE || !renderer()->hasOverflowClip()) { if (x < 0) x = 0; @@ -557,7 +557,7 @@ void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrep // blit, since the check for blitting is going to be very // complicated (since it will involve testing whether our layer // is either occluded by another layer or clipped by an enclosing - // layer or tqcontains fixed backgrounds, etc.). + // layer or contains fixed backgrounds, etc.). m_scrollX = x; m_scrollY = y; @@ -569,9 +569,9 @@ void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrep // Fire the scroll DOM event. m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false); - // Just schedule a full tqrepaint of our object. - if (tqrepaint) - m_object->tqrepaint(RealtimePriority); + // Just schedule a full repaint of our object. + if (repaint) + m_object->repaint(RealtimePriority); if (updateScrollbars) { if (m_hBar) @@ -637,7 +637,7 @@ int RenderLayer::verticalScrollbarWidth() #ifdef APPLE_CHANGES return m_vBar->width(); #else - return m_vBar->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); + return m_vBar->style().pixelMetric(TQStyle::PM_ScrollBarExtent); #endif } @@ -650,7 +650,7 @@ int RenderLayer::horizontalScrollbarHeight() #ifdef APPLE_CHANGES return m_hBar->height(); #else - return m_hBar->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); + return m_hBar->style().pixelMetric(TQStyle::PM_ScrollBarExtent); #endif } @@ -691,7 +691,7 @@ void RenderLayer::positionScrollbars(const TQRect& absBounds) TQScrollBar *b = m_hBar; if (!m_hBar) b = m_vBar; - int sw = b->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); + int sw = b->style().pixelMetric(TQStyle::PM_ScrollBarExtent); if (m_vBar) { TQRect vBarRect = TQRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1); @@ -761,9 +761,9 @@ void RenderLayer::checkScrollbarsAfterLayout() m_object->setNeedsLayout(true); if (m_object->isRenderBlock()) - static_cast<RenderBlock*>(m_object)->tqlayoutBlock(true); + static_cast<RenderBlock*>(m_object)->layoutBlock(true); else - m_object->tqlayout(); + m_object->layout(); return; } @@ -1017,7 +1017,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje updateZOrderLists(); updateOverflowList(); - // This variable tracks which layer the mouse ends up being inside. The minute we tqfind an insideLayer, + // This variable tracks which layer the mouse ends up being inside. The minute we find an insideLayer, // we are done and can return it. RenderLayer* insideLayer = 0; @@ -1044,7 +1044,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje } // Next we want to see if the mouse pos is inside the child RenderObjects of the layer. - if (tqcontainsPoint(xMousePos, yMousePos, fgRect) && + if (containsPoint(xMousePos, yMousePos, fgRect) && renderer()->nodeAtPoint(info, xMousePos, yMousePos, layerBounds.x() - renderer()->xPos(), layerBounds.y() - renderer()->yPos() + m_object->borderTopExtra(), @@ -1065,7 +1065,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje } // Next we want to see if the mouse pos is inside this layer but not any of its children. - if (tqcontainsPoint(xMousePos, yMousePos, bgRect) && + if (containsPoint(xMousePos, yMousePos, bgRect) && renderer()->nodeAtPoint(info, xMousePos, yMousePos, layerBounds.x() - renderer()->xPos(), layerBounds.y() - renderer()->yPos() + m_object->borderTopExtra(), @@ -1166,12 +1166,12 @@ bool RenderLayer::intersectsDamageRect(const TQRect& layerBounds, const TQRect& layerBounds.intersects(damageRect)); } -bool RenderLayer::tqcontainsPoint(int x, int y, const TQRect& damageRect) const +bool RenderLayer::containsPoint(int x, int y, const TQRect& damageRect) const { return (renderer()->isCanvas() || renderer()->isRoot() || renderer()->isBody() || renderer()->hasOverhangingFloats() || (renderer()->isInline() && !renderer()->isReplaced()) || - damageRect.tqcontains(x, y)); + damageRect.contains(x, y)); } // This code has been written to anticipate the addition of CSS3-::outside and ::inside generated diff --git a/khtml/rendering/render_layer.h b/khtml/rendering/render_layer.h index 0e9e60bef..b65047391 100644 --- a/khtml/rendering/render_layer.h +++ b/khtml/rendering/render_layer.h @@ -35,7 +35,7 @@ * version of this file only under the terms of one of those two * licenses (the MPL or the GPL) and not to allow others to use your * version of this file under the LGPL, indicate your decision by - * deletingthe provisions above and tqreplace them with the notice and + * deletingthe provisions above and replace them with the notice and * other provisions required by the MPL or the GPL, as the case may be. * If you do not delete the provisions above, a recipient may use your * version of this file under any of the LGPL, the MPL or the GPL. @@ -63,7 +63,7 @@ namespace khtml { class RenderObject; class RenderScrollMediator; -class RenderScrollMediator: public TQObject +class RenderScrollMediator: public QObject { Q_OBJECT public: @@ -78,7 +78,7 @@ private: }; // This class handles the auto-scrolling of layers with overflow: marquee. -class Marquee: public TQObject +class Marquee: public QObject { Q_OBJECT @@ -190,7 +190,7 @@ public: void checkInlineRelOffset(const RenderObject* o, int& x, int& y); short scrollXOffset() { return m_scrollX; } int scrollYOffset() { return m_scrollY; } - void scrollToOffset(int x, int y, bool updateScrollbars = true, bool tqrepaint = true); + void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true); void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); } void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); } void showScrollbar(Qt::Orientation, bool); @@ -202,7 +202,7 @@ public: void paintScrollbars(RenderObject::PaintInfo& pI); void checkScrollbarsAfterLayout(); void slotValueChanged(int); - void tqrepaint(Priority p=NormalPriority, bool markForRepaint = false); + void repaint(Priority p=NormalPriority, bool markForRepaint = false); void updateScrollPositionFromScrollbars(); void updateLayerPosition(); @@ -253,7 +253,7 @@ public: TQRect& posClipRect, TQRect& fixedClipRect); bool intersectsDamageRect(const TQRect& layerBounds, const TQRect& damageRect) const; - bool tqcontainsPoint(int x, int y, const TQRect& damageRect) const; + bool containsPoint(int x, int y, const TQRect& damageRect) const; void updateHoverActiveState(RenderObject::NodeInfo& info); @@ -322,7 +322,7 @@ protected: TQPtrVector<RenderLayer>* m_posZOrderList; TQPtrVector<RenderLayer>* m_negZOrderList; - // This list tqcontains our overflow child layers. + // This list contains our overflow child layers. TQValueList<RenderLayer*>* m_overflowList; bool m_zOrderListsDirty: 1; diff --git a/khtml/rendering/render_line.cpp b/khtml/rendering/render_line.cpp index d90a65a32..2bcbe366e 100644 --- a/khtml/rendering/render_line.cpp +++ b/khtml/rendering/render_line.cpp @@ -95,7 +95,7 @@ void InlineBox::operator delete(void* ptr, size_t sz) { assert(inInlineBoxDetach); - // Stash size where detach can tqfind it. + // Stash size where detach can find it. *(size_t *)ptr = sz; } @@ -119,7 +119,7 @@ void InlineBox::paint(RenderObject::PaintInfo& i, int tx, int ty) if ( i.phase == PaintActionOutline && !needsOutlinePhaseRepaint(object(), i, tx, ty) ) return; - // Paint all phases of tqreplaced elements atomically, as though the tqreplaced element established its + // Paint all phases of replaced elements atomically, as though the replaced element established its // own stacking context. (See Appendix E.2, section 6.4 on inline block/table elements in the CSS2.1 // specification.) bool paintSelectionOnly = i.phase == PaintActionSelection; @@ -139,7 +139,7 @@ void InlineBox::paint(RenderObject::PaintInfo& i, int tx, int ty) bool InlineBox::nodeAtPoint(RenderObject::NodeInfo& i, int x, int y, int tx, int ty) { - // Hit test all phases of tqreplaced elements atomically, as though the tqreplaced element established its + // Hit test all phases of replaced elements atomically, as though the replaced element established its // own stacking context. (See Appendix E.2, section 6.4 on inline block/table elements in the CSS2.1 // specification.) bool inside = false; @@ -180,7 +180,7 @@ void InlineFlowBox::removeFromLine(InlineBox *child) bool InlineBox::canAccommodateEllipsisBox(bool ltr, int blockEdge, int ellipsisWidth) { - // Non-tqreplaced elements can always accommodate an ellipsis. + // Non-replaced elements can always accommodate an ellipsis. if (!m_object || !m_object->isReplaced()) return true; @@ -636,7 +636,7 @@ bool InlineFlowBox::nodeAtPoint(RenderObject::NodeInfo& i, int x, int y, int tx, // Now check ourselves. TQRect rect(tx + m_x, ty + m_y, m_width, m_height); - if (object()->style()->visibility() == VISIBLE && rect.tqcontains(x, y)) { + if (object()->style()->visibility() == VISIBLE && rect.contains(x, y)) { object()->setInnerNode(i); return true; } @@ -770,7 +770,7 @@ static bool shouldDrawDecoration(RenderObject* obj) break; } else if (curr->isText() && !curr->isBR() && (curr->style()->preserveWS() || - !curr->element() || !curr->element()->tqcontainsOnlyWhitespace())) { + !curr->element() || !curr->element()->containsOnlyWhitespace())) { shouldDraw = true; break; } @@ -902,7 +902,7 @@ bool EllipsisBox::nodeAtPoint(RenderObject::NodeInfo& info, int _x, int _y, int } TQRect rect(_tx + m_x, _ty + m_y, m_width, m_height); - if (object()->style()->visibility() == VISIBLE && rect.tqcontains(_x, _y)) { + if (object()->style()->visibility() == VISIBLE && rect.contains(_x, _y)) { object()->setInnerNode(info); return true; } @@ -938,7 +938,7 @@ bool RootInlineBox::canAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxE if (width() - delta < ellipsisWidth) return false; - // Next iterate over all the line boxes on the line. If we tqfind a tqreplaced element that intersects + // Next iterate over all the line boxes on the line. If we find a replaced element that intersects // then we refuse to accommodate the ellipsis. Otherwise we're ok. return InlineFlowBox::canAccommodateEllipsisBox(ltr, blockEdge, ellipsisWidth); } @@ -956,7 +956,7 @@ void RootInlineBox::placeEllipsis(const DOMString& ellipsisStr, bool ltr, int b return; } - // Now attempt to tqfind the nearest glyph horizontally and place just to the right (or left in RTL) + // Now attempt to find the nearest glyph horizontally and place just to the right (or left in RTL) // of that glyph. Mark all of the objects that intersect the ellipsis box as not painting (as being // truncated). bool foundBox = false; diff --git a/khtml/rendering/render_line.h b/khtml/rendering/render_line.h index d00a060af..d42f2acb8 100644 --- a/khtml/rendering/render_line.h +++ b/khtml/rendering/render_line.h @@ -129,7 +129,7 @@ public: // FIXME: Would like to make this protected, but methods are accessing t InlineBox* m_next; // The next element on the same line as us. InlineBox* m_prev; // The previous element on the same line as us. - InlineFlowBox* m_parent; // The box that tqcontains us. + InlineFlowBox* m_parent; // The box that contains us. }; class InlineRunBox : public InlineBox diff --git a/khtml/rendering/render_list.cpp b/khtml/rendering/render_list.cpp index e290b9c33..b08ec6eb9 100644 --- a/khtml/rendering/render_list.cpp +++ b/khtml/rendering/render_list.cpp @@ -178,13 +178,13 @@ short RenderListItem::marginRight() const return RenderBlock::marginRight(); }*/ -void RenderListItem::tqlayout( ) +void RenderListItem::layout( ) { KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); updateMarkerLocation(); - RenderBlock::tqlayout(); + RenderBlock::layout(); } // ----------------------------------------------------------- @@ -194,7 +194,7 @@ RenderListMarker::RenderListMarker(DOM::NodeImpl* node) { // init RenderObject attributes setInline(true); // our object is Inline - setReplaced(true); // pretend to be tqreplaced + setReplaced(true); // pretend to be replaced // val = -1; // m_listImage = 0; } @@ -344,21 +344,21 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) if( style()->direction() == LTR) { p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, - TQString::tqfromLatin1(". ")); + TQString::fromLatin1(". ")); } else { - const TQString& punct(TQString::tqfromLatin1(" .")); + const TQString& punct(TQString::fromLatin1(" .")); p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, punct); p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); } } else { if (style()->direction() == LTR) { - const TQString& punct(TQString::tqfromLatin1(". ")); + const TQString& punct(TQString::fromLatin1(". ")); p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|Qt::DontClip, punct); p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|Qt::DontClip, m_item); } else { - const TQString& punct(TQString::tqfromLatin1(" .")); + const TQString& punct(TQString::fromLatin1(" .")); p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, punct); p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); } @@ -367,7 +367,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) } } -void RenderListMarker::tqlayout() +void RenderListMarker::layout() { KHTMLAssert( needsLayout() ); @@ -387,7 +387,7 @@ void RenderListMarker::setPixmap( const TQPixmap &p, const TQRect& r, CachedImag if(m_width != m_listImage->pixmap_size().width() || m_height != m_listImage->pixmap_size().height()) setNeedsLayoutAndMinMaxRecalc(); else - tqrepaintRectangle(0, 0, m_width, m_height); + repaintRectangle(0, 0, m_width, m_height); } void RenderListMarker::calcMinMaxWidth() @@ -543,7 +543,7 @@ void RenderListMarker::calcMinMaxWidth() default: KHTMLAssert(false); } - m_markerWidth = fm.width(m_item) + fm.width(TQString::tqfromLatin1(". ")); + m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". ")); } end: diff --git a/khtml/rendering/render_list.h b/khtml/rendering/render_list.h index 84c7d0906..b70132671 100644 --- a/khtml/rendering/render_list.h +++ b/khtml/rendering/render_list.h @@ -58,7 +58,7 @@ public: void setValue( long v ) { predefVal = v; } - virtual void tqlayout( ); + virtual void layout( ); virtual void detach( ); virtual void calcMinMaxWidth(); //virtual short marginLeft() const; @@ -89,11 +89,11 @@ public: virtual void setStyle(RenderStyle *style); virtual const char *renderName() const { return "RenderListMarker"; } - // so the marker gets to tqlayout itself. Only needed for + // so the marker gets to layout itself. Only needed for // list-style-position: inside virtual void paint(PaintInfo& i, int xoff, int yoff); - virtual void tqlayout( ); + virtual void layout( ); virtual void calcMinMaxWidth(); virtual short lineHeight( bool firstLine ) const; @@ -123,7 +123,7 @@ protected: }; // Implementation of list-item counter -// ### should tqreplace most list-item specific code in renderObject::getCounter +// ### should replace most list-item specific code in renderObject::getCounter /* class CounterListItem : public CounterNode { diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp index 309cd38a2..c5ee68720 100644 --- a/khtml/rendering/render_object.cpp +++ b/khtml/rendering/render_object.cpp @@ -71,8 +71,8 @@ using namespace khtml; #define COLOR_DARK_BS_FACTOR 30 #define COLOR_DARK_TS_FACTOR 50 -#define LIGHT_GRAY tqRgb(192, 192, 192) -#define DARK_GRAY tqRgb(96, 96, 96) +#define LIGHT_GRAY qRgb(192, 192, 192) +#define DARK_GRAY qRgb(96, 96, 96) #ifndef NDEBUG static void *baseOfRenderObjectBeingDeleted; @@ -89,7 +89,7 @@ void RenderObject::operator delete(void* ptr, size_t sz) { assert(baseOfRenderObjectBeingDeleted == ptr); - // Stash size where detach can tqfind it. + // Stash size where detach can find it. *(size_t *)ptr = sz; } @@ -171,14 +171,14 @@ RenderObject::RenderObject(DOM::NodeImpl* node) m_inline( true ), m_attached( false ), - m_tqreplaced( false ), + m_replaced( false ), m_mouseInside( false ), m_hasFirstLine( false ), m_isSelectionBorder( false ), m_isRoot( false ), m_afterPageBreak( false ), m_needsPageClear( false ), - m_tqcontainsPageBreak( false ), + m_containsPageBreak( false ), m_hasOverflowClip( false ), m_doNotDelete( false ) { @@ -319,9 +319,9 @@ static void addLayers(RenderObject* obj, RenderLayer* parentLayer, RenderObject* if (obj->layer()) { if (!beforeChild && newObject) { // We need to figure out the layer that follows newObject. We only do - // this the first time we tqfind a child layer, and then we update the + // this the first time we find a child layer, and then we update the // pointer values for newObject and beforeChild used by everyone else. - beforeChild = newObject->parent()->tqfindNextLayer(parentLayer, newObject); + beforeChild = newObject->parent()->findNextLayer(parentLayer, newObject); newObject = 0; } parentLayer->addChild(obj->layer(), beforeChild); @@ -372,10 +372,10 @@ void RenderObject::moveLayers(RenderLayer* oldParent, RenderLayer* newParent) curr->moveLayers(oldParent, newParent); } -RenderLayer* RenderObject::tqfindNextLayer(RenderLayer* parentLayer, RenderObject* startPoint, +RenderLayer* RenderObject::findNextLayer(RenderLayer* parentLayer, RenderObject* startPoint, bool checkParent) { - // Error check the parent layer passed in. If it's null, we can't tqfind anything. + // Error check the parent layer passed in. If it's null, we can't find anything. if (!parentLayer) return 0; @@ -385,25 +385,25 @@ RenderLayer* RenderObject::tqfindNextLayer(RenderLayer* parentLayer, RenderObjec return ourLayer; // Step 2: If we don't have a layer, or our layer is the desired parent, then descend - // into our siblings trying to tqfind the next layer whose parent is the desired parent. + // into our siblings trying to find the next layer whose parent is the desired parent. if (!ourLayer || ourLayer == parentLayer) { for (RenderObject* curr = startPoint ? startPoint->nextSibling() : firstChild(); curr; curr = curr->nextSibling()) { - RenderLayer* nextLayer = curr->tqfindNextLayer(parentLayer, 0, false); + RenderLayer* nextLayer = curr->findNextLayer(parentLayer, 0, false); if (nextLayer) return nextLayer; } } // Step 3: If our layer is the desired parent layer, then we're finished. We didn't - // tqfind anything. + // find anything. if (parentLayer == ourLayer) return 0; // Step 4: If |checkParent| is set, climb up to our parent and check its siblings that // follow us to see if we can locate a layer. if (checkParent && parent()) - return parent()->tqfindNextLayer(parentLayer, this, true); + return parent()->findNextLayer(parentLayer, this, true); return 0; } @@ -535,9 +535,9 @@ bool RenderObject::hasStaticY() const void RenderObject::setPixmap(const TQPixmap&, const TQRect& /*r*/, CachedImage* image) { - //tqrepaint bg when it finished loading - if(image && parent() && style() && style()->backgroundLayers()->tqcontainsImage(image)) { - isBody() ? canvas()->tqrepaint() : tqrepaint(); + //repaint bg when it finished loading + if(image && parent() && style() && style()->backgroundLayers()->containsImage(image)) { + isBody() ? canvas()->repaint() : repaint(); } } @@ -592,7 +592,7 @@ void RenderObject::markContainingBlocksForLayout() o = o->container(); } - last->scheduleRetqlayout(); + last->scheduleRelayout(); } RenderBlock *RenderObject::containingBlock() const @@ -1103,9 +1103,9 @@ void RenderObject::paint( PaintInfo&, int /*tx*/, int /*ty*/) { } -void RenderObject::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderObject::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) { - if(parent()) parent()->tqrepaintRectangle(x, y, w, h, p, f); + if(parent()) parent()->repaintRectangle(x, y, w, h, p, f); } #ifdef ENABLE_DUMP @@ -1164,15 +1164,15 @@ TQString RenderObject::information() const << " mB: " << marginBottom() << " qB: " << isBottomMarginQuirk() << "}" << (isTableCell() ? - ( TQString::tqfromLatin1(" [r=") + + ( TQString::fromLatin1(" [r=") + TQString::number( static_cast<const RenderTableCell *>(this)->row() ) + - TQString::tqfromLatin1(" c=") + + TQString::fromLatin1(" c=") + TQString::number( static_cast<const RenderTableCell *>(this)->col() ) + - TQString::tqfromLatin1(" rs=") + + TQString::fromLatin1(" rs=") + TQString::number( static_cast<const RenderTableCell *>(this)->rowSpan() ) + - TQString::tqfromLatin1(" cs=") + + TQString::fromLatin1(" cs=") + TQString::number( static_cast<const RenderTableCell *>(this)->colSpan() ) + - TQString::tqfromLatin1("]") ) : TQString::null ); + TQString::fromLatin1("]") ) : TQString::null ); if ( layer() ) ts << " layer=" << layer(); if ( continuation() ) @@ -1251,7 +1251,7 @@ void RenderObject::dump(TQTextStream &ts, const TQString &ind) const if (isRelPositioned()) { ts << " relPositioned"; } if (isText()) { ts << " text"; } if (isInline()) { ts << " inline"; } - if (isReplaced()) { ts << " tqreplaced"; } + if (isReplaced()) { ts << " replaced"; } if (shouldPaintBackgroundOrBorder()) { ts << " paintBackground"; } if (needsLayout()) { ts << " needsLayout"; } if (minMaxKnown()) { ts << " minMaxKnown"; } @@ -1283,11 +1283,11 @@ void RenderObject::setStyle(RenderStyle *style) m_style->outlineWidth() > style->outlineWidth() || (!m_style->hidesOverflow() && style->hidesOverflow()) || ( m_style->hasClip() && !(m_style->clip() == style->clip()) ) ) ) { - // schedule a tqrepaint with the old style + // schedule a repaint with the old style if (layer() && !isInlineFlow()) - layer()->tqrepaint(pri); + layer()->repaint(pri); else - tqrepaint(pri); + repaint(pri); } if ( ( isFloating() && m_style->floating() != style->floating() ) || @@ -1339,16 +1339,16 @@ void RenderObject::setStyle(RenderStyle *style) d = RenderStyle::Layout; if ( d > RenderStyle::Position) { - // we must perform a full tqlayout + // we must perform a full layout if (!isText() && d == RenderStyle::CbLayout) { dirtyFormattingContext( true ); } setNeedsLayoutAndMinMaxRecalc(); } else if (!isText() && d >= RenderStyle::Visible) { - // a tqrepaint is enough + // a repaint is enough if (layer()) { if (canvas() && canvas()->needsWidgetMasks()) { - // update our widget tqmasks + // update our widget masks RenderLayer *p, *d = 0; for (p=layer()->parent();p;p=p->parent()) if (p->hasOverlaidWidgets()) d=p; @@ -1357,9 +1357,9 @@ void RenderObject::setStyle(RenderStyle *style) } } if (layer() && !isInlineFlow()) - layer()->tqrepaint(pri); + layer()->repaint(pri); else - tqrepaint(pri); + repaint(pri); } } } @@ -1367,7 +1367,7 @@ void RenderObject::setStyle(RenderStyle *style) bool RenderObject::attemptDirectLayerTranslation() { // When the difference between two successive styles is only 'Position' - // we may attempt to save a tqlayout by directly updating the object position. + // we may attempt to save a layout by directly updating the object position. KHTMLAssert( m_style->position() != STATIC ); if (!layer()) @@ -1383,7 +1383,7 @@ bool RenderObject::attemptDirectLayerTranslation() calcHeight(); if (oldWidth != width() || oldHeight != height()) { // implicit size change or overconstrained dimensions: - // we'll need a tqlayout. + // we'll need a layout. setWidth(oldWidth); setHeight(oldHeight); // kdDebug() << "Layer translation failed for " << information() << endl; @@ -1423,14 +1423,14 @@ void RenderObject::dirtyFormattingContext( bool checkContainer ) m_parent->dirtyFormattingContext(false); } -void RenderObject::tqrepaintDuringLayout() +void RenderObject::repaintDuringLayout() { if (canvas()->needsFullRepaint() || isText()) return; if (layer() && !isInlineFlow()) { - layer()->tqrepaint( NormalPriority, true ); + layer()->repaint( NormalPriority, true ); } else { - tqrepaint(); + repaint(); canvas()->deferredRepaint( this ); } } @@ -1477,11 +1477,11 @@ void RenderObject::updateBackgroundImages(RenderStyle* oldStyle) const BackgroundLayer* oldLayers = oldStyle ? oldStyle->backgroundLayers() : 0; const BackgroundLayer* newLayers = m_style ? m_style->backgroundLayers() : 0; for (const BackgroundLayer* currOld = oldLayers; currOld; currOld = currOld->next()) { - if (currOld->backgroundImage() && (!newLayers || !newLayers->tqcontainsImage(currOld->backgroundImage()))) + if (currOld->backgroundImage() && (!newLayers || !newLayers->containsImage(currOld->backgroundImage()))) currOld->backgroundImage()->deref(this); } for (const BackgroundLayer* currNew = newLayers; currNew; currNew = currNew->next()) { - if (currNew->backgroundImage() && (!oldLayers || !oldLayers->tqcontainsImage(currNew->backgroundImage()))) + if (currNew->backgroundImage() && (!oldLayers || !oldLayers->containsImage(currNew->backgroundImage()))) currNew->backgroundImage()->ref(this); } } @@ -1571,7 +1571,7 @@ RenderObject *RenderObject::container() const // (2) For normal flow elements, it just returns the parent. // (3) For absolute positioned elements, it will return a relative positioned inline. // containingBlock() simply skips relpositioned inlines and lets an enclosing block handle - // the tqlayout of the positioned object. This does mean that calcAbsoluteHorizontal and + // the layout of the positioned object. This does mean that calcAbsoluteHorizontal and // calcAbsoluteVertical have to use container(). EPosition pos = m_style->position(); RenderObject *o = 0; @@ -1617,7 +1617,7 @@ void RenderObject::removeFromObjectLists() if (isFloating()) { RenderBlock* outermostBlock = containingBlock(); - for (RenderBlock* p = outermostBlock; p && !p->isCanvas() && p->tqcontainsFloat(this);) { + for (RenderBlock* p = outermostBlock; p && !p->isCanvas() && p->containsFloat(this);) { outermostBlock = p; if (p->isFloatingOrPositioned()) break; @@ -1710,11 +1710,11 @@ FindSelectionResult RenderObject::checkSelectionPoint( int _x, int _y, int _tx, if (child->isText() && !static_cast<RenderText *>(child)->inlineTextBoxCount()) continue; -// kdDebug(6040) << "iterating " << (child ? child->renderName() : "") << "@" << child << (child->isText() ? " tqcontains: \"" + TQConstString(static_cast<RenderText *>(child)->text(), kMin(static_cast<RenderText *>(child)->length(), 10u)).string() + "\"" : TQString::null) << endl; +// kdDebug(6040) << "iterating " << (child ? child->renderName() : "") << "@" << child << (child->isText() ? " contains: \"" + TQConstString(static_cast<RenderText *>(child)->text(), kMin(static_cast<RenderText *>(child)->length(), 10u)).string() + "\"" : TQString::null) << endl; // kdDebug(6040) << "---------- checkSelectionPoint recursive -----------" << endl; khtml::FindSelectionResult pos = child->checkSelectionPoint(_x, _y, _tx+xPos(), _ty+yPos(), nod, off, state); // kdDebug(6040) << "-------- end checkSelectionPoint recursive ---------" << endl; -// kdDebug(6030) << this << " child->tqfindSelectionNode returned result=" << pos << " nod=" << nod << " off=" << off << endl; +// kdDebug(6030) << this << " child->findSelectionNode returned result=" << pos << " nod=" << nod << " off=" << off << endl; switch(pos) { case SelectionPointBeforeInLine: case SelectionPointInside: @@ -1779,7 +1779,7 @@ bool RenderObject::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, int ol = overflowLeft(); int ot = overflowTop(); TQRect overflowRect( tx+ol, ty+ot, overflowWidth()-ol, overflowHeight()-ot ); - inOverflowRect = overflowRect.tqcontains( _x, _y ); + inOverflowRect = overflowRect.contains( _x, _y ); } // ### table should have its own, more performant method @@ -1850,7 +1850,7 @@ short RenderObject::getVerticalPosition( bool firstLine, RenderObject* ref ) con bool checkParent = ref->isInline() && !ref->isReplacedBlock() && !( ref->style()->verticalAlign() == TOP || ref->style()->verticalAlign() == BOTTOM ); vpos = checkParent ? ref->verticalPositionHint( firstLine ) : 0; - // don't allow elements nested inside text-top to have a different vtqalignment. + // don't allow elements nested inside text-top to have a different valignment. if ( va == BASELINE ) return vpos; else if ( va == LENGTH ) @@ -1881,7 +1881,7 @@ short RenderObject::getVerticalPosition( bool firstLine, RenderObject* ref ) con short RenderObject::lineHeight( bool firstLine ) const { - // Inline blocks are tqreplaced elements. Otherwise, just pass off to + // Inline blocks are replaced elements. Otherwise, just pass off to // the base class. If we're being queried as though we're the root line // box, then the fact that we're an inline-block is irrelevant, and we behave // just like a block. @@ -1911,7 +1911,7 @@ short RenderObject::lineHeight( bool firstLine ) const short RenderObject::baselinePosition( bool firstLine ) const { - // Inline blocks are tqreplaced elements. Otherwise, just pass off to + // Inline blocks are replaced elements. Otherwise, just pass off to // the base class. If we're being queried as though we're the root line // box, then the fact that we're an inline-block is irrelevant, and we behave // just like a block. @@ -1923,12 +1923,12 @@ short RenderObject::baselinePosition( bool firstLine ) const return fm.ascent() + ( lineHeight( firstLine) - fm.height() ) / 2; } -void RenderObject::tqinvalidateVerticalPositions() +void RenderObject::invalidateVerticalPositions() { m_verticalPosition = PositionUndefined; RenderObject *child = firstChild(); while( child ) { - child->tqinvalidateVerticalPositions(); + child->invalidateVerticalPositions(); child = child->nextSibling(); } } @@ -1961,7 +1961,7 @@ void RenderObject::recalcMinMaxWidths() child = child->nextSibling(); } - // we need to recalculate, if the tqcontains inline children, as the change could have + // we need to recalculate, if the contains inline children, as the change could have // happened somewhere deep inside the child tree if ( ( !isInline() || isReplacedBlock() ) && childrenInline() ) m_minMaxKnown = false; @@ -1971,12 +1971,12 @@ void RenderObject::recalcMinMaxWidths() m_recalcMinMax = false; } -void RenderObject::scheduleRetqlayout(RenderObject *clippedObj) +void RenderObject::scheduleRelayout(RenderObject *clippedObj) { if (!isCanvas()) return; KHTMLView *view = static_cast<RenderCanvas *>(this)->view(); if ( view ) - view->scheduleRetqlayout(clippedObj); + view->scheduleRelayout(clippedObj); } @@ -2223,7 +2223,7 @@ CounterNode* RenderObject::lookupCounter(const TQString& counter) const { TQDict<khtml::CounterNode>* counters = document()->counters(this); if (counters) - return counters->tqfind(counter); + return counters->find(counter); else return 0; } @@ -2274,7 +2274,7 @@ void RenderObject::updateWidgetMasks() { curr->height()-pby-curr->borderBottom()-curr->paddingBottom())); #ifdef MASK_DEBUG TQMemArray<TQRect> ar = r.rects(); - kdDebug(6040) << "|| Setting widget tqmask for " << curr->information() << endl; + kdDebug(6040) << "|| Setting widget mask for " << curr->information() << endl; for (int i = 0; i < ar.size() ; ++i) { kdDebug(6040) << " " << ar[i] << endl; } diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h index a80121820..f7f772387 100644 --- a/khtml/rendering/render_object.h +++ b/khtml/rendering/render_object.h @@ -61,7 +61,7 @@ class KHTMLView; * a recursive descent into the layer's render objects. The first phase is the background phase. * The backgrounds and borders of all blocks are painted. Inlines are not painted at all. * Floats must paint above block backgrounds but entirely below inline content that can overlap them. - * In the foreground phase, all inlines are fully painted. Inline tqreplaced elements will get all + * In the foreground phase, all inlines are fully painted. Inline replaced elements will get all * three phases invoked on them during this phase. */ @@ -161,7 +161,7 @@ public: void addLayers(RenderLayer* parentLayer, RenderObject* newObject); void removeLayers(RenderLayer* parentLayer); void moveLayers(RenderLayer* oldParent, RenderLayer* newParent); - RenderLayer* tqfindNextLayer(RenderLayer* parentLayer, RenderObject* startPoint, + RenderLayer* findNextLayer(RenderLayer* parentLayer, RenderObject* startPoint, bool checkParent=true); virtual void positionChildLayers() { } virtual bool requiresLayer() const { @@ -297,7 +297,7 @@ public: bool isCompact() const { return style()->display() == COMPACT; } // compact bool isRunIn() const { return style()->display() == RUN_IN; } // run-in object bool mouseInside() const; - bool isReplaced() const { return m_tqreplaced; } + bool isReplaced() const { return m_replaced; } bool isReplacedBlock() const { return isInline() && isReplaced() && isRenderBlock(); } bool shouldPaintBackgroundOrBorder() const { return m_paintBackground; } bool needsLayout() const { return m_needsLayout || m_normalChildNeedsLayout || m_posChildNeedsLayout; } @@ -327,7 +327,7 @@ public: void setOverhangingContents(bool p=true); void markContainingBlocksForLayout(); void dirtyFormattingContext( bool checkContainer ); - void tqrepaintDuringLayout(); + void repaintDuringLayout(); void setNeedsLayout(bool b, bool markParents = true); void setChildNeedsLayout(bool b, bool markParents = true); void setMinMaxKnown(bool b=true) { @@ -353,11 +353,11 @@ public: void setMouseInside(bool b=true) { m_mouseInside = b; } void setShouldPaintBackgroundOrBorder(bool b=true) { m_paintBackground = b; } void setRenderText() { m_isText = true; } - void setReplaced(bool b=true) { m_tqreplaced = b; } + void setReplaced(bool b=true) { m_replaced = b; } void setHasOverflowClip(bool b = true) { m_hasOverflowClip = b; } void setIsSelectionBorder(bool b=true) { m_isSelectionBorder = b; } - void scheduleRetqlayout(RenderObject *clippedObj = 0); + void scheduleRelayout(RenderObject *clippedObj = 0); void updateBackgroundImages(RenderStyle* oldStyle); @@ -402,7 +402,7 @@ public: * * when a element has a fixed size, m_minWidth and m_maxWidth should be * set to the same value. This has the special meaning that m_width, - * tqcontains the actual value. + * contains the actual value. * * assumes calcMinMaxWidth has already been called for all children. */ @@ -427,21 +427,21 @@ public: /* * This function should cause the Element to calculate its - * width and height and the tqlayout of its content + * width and height and the layout of its content * - * when the Element calls setNeedsLayout(false), tqlayout() is no - * longer called during retqlayouts, as long as there is no + * when the Element calls setNeedsLayout(false), layout() is no + * longer called during relayouts, as long as there is no * style sheet change. When that occurs, m_needsLayout will be - * set to true and the Element receives tqlayout() calls + * set to true and the Element receives layout() calls * again. */ - virtual void tqlayout() = 0; + virtual void layout() = 0; - /* This function performs a tqlayout only if one is needed. */ - void tqlayoutIfNeeded() { if (needsLayout()) tqlayout(); } + /* This function performs a layout only if one is needed. */ + void layoutIfNeeded() { if (needsLayout()) layout(); } // used for element state updates that can not be fixed with a - // tqrepaint and do not need a retqlayout + // repaint and do not need a relayout virtual void updateFromElement() {} // Called immediately after render-object is inserted @@ -464,11 +464,11 @@ public: virtual bool needsPageClear() const { return m_needsPageClear; } /* - * ContainsPageBreak indicates the object tqcontains a clean page-break. - * ### should be removed and tqreplaced with (crossesPageBreak && !needsPageClear) + * ContainsPageBreak indicates the object contains a clean page-break. + * ### should be removed and replaced with (crossesPageBreak && !needsPageClear) */ - void setContainsPageBreak(bool b = true) { m_tqcontainsPageBreak = b; } - virtual bool tqcontainsPageBreak() const { return m_tqcontainsPageBreak; } + void setContainsPageBreak(bool b = true) { m_containsPageBreak = b; } + virtual bool containsPageBreak() const { return m_containsPageBreak; } virtual int pageTopAfter(int y) const { if (parent()) return parent()->pageTopAfter(y); else return 0; } @@ -485,7 +485,7 @@ public: virtual bool afterPageBreak() const { return m_afterPageBreak; } virtual bool beforePageBreak() const { return m_beforePageBreak; } - // does a query on the rendertree and tqfinds the innernode + // does a query on the rendertree and finds the innernode // and overURL for the given position // if readonly == false, it will recalc hover styles accordingly class NodeInfo @@ -522,7 +522,7 @@ public: bool m_active; }; - /** tqcontains stateful information for a checkSelectionPoint call + /** contains stateful information for a checkSelectionPoint call */ struct SelPointState { /** last node that was before the current position */ @@ -557,7 +557,7 @@ public: virtual short contentWidth() const { return 0; } virtual int contentHeight() const { return 0; } - // intrinsic extend of tqreplaced elements. undefined otherwise + // intrinsic extend of replaced elements. undefined otherwise virtual short intrinsicWidth() const { return 0; } virtual int intrinsicHeight() const { return 0; } @@ -681,9 +681,9 @@ public: // Used by collapsed border tables. virtual void collectBorders(TQValueList<CollapsedBorderValue>& borderStyles); - // force a complete tqrepaint - virtual void tqrepaint(Priority p = NormalPriority) { if(m_parent) m_parent->tqrepaint(p); } - virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + // force a complete repaint + virtual void repaint(Priority p = NormalPriority) { if(m_parent) m_parent->repaint(p); } + virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); virtual unsigned int length() const { return 1; } @@ -693,7 +693,7 @@ public: bool isFloatingOrPositioned() const { return (isFloating() || isPositioned()); }; virtual bool hasOverhangingFloats() const { return false; } virtual bool hasFloats() const { return false; } - virtual bool tqcontainsFloat(RenderObject* /*o*/) const { return false; } + virtual bool containsFloat(RenderObject* /*o*/) const { return false; } virtual void markAllDescendantsWithFloatsForLayout(RenderObject* /*floatToRemove*/ = 0) {} bool flowAroundFloats() const; @@ -747,8 +747,8 @@ public: virtual int leftmostPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; } virtual int highestPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; } - // recursively tqinvalidate current tqlayout - // unused: void tqinvalidateLayout(); + // recursively invalidate current layout + // unused: void invalidateLayout(); virtual void calcVerticalMargins() {} void removeFromObjectLists(); @@ -790,7 +790,7 @@ protected: virtual TQRect viewRect() const; void remove(); - void tqinvalidateVerticalPositions(); + void invalidateVerticalPositions(); bool attemptDirectLayerTranslation(); void updateWidgetMasks(); @@ -827,7 +827,7 @@ private: bool m_inline : 1; bool m_attached : 1; - bool m_tqreplaced : 1; + bool m_replaced : 1; bool m_mouseInside : 1; bool m_hasFirstLine : 1; bool m_isSelectionBorder : 1; @@ -838,7 +838,7 @@ private: bool m_afterPageBreak : 1; bool m_needsPageClear : 1; - bool m_tqcontainsPageBreak : 1; + bool m_containsPageBreak : 1; bool m_hasOverflowClip : 1; diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp index 60d91535d..157d1b76d 100644 --- a/khtml/rendering/render_replaced.cpp +++ b/khtml/rendering/render_replaced.cpp @@ -183,7 +183,7 @@ bool RenderWidget::event( TQEvent *e ) return true; QWidgetResizeEvent *re = static_cast<QWidgetResizeEvent *>(e); m_widget->resize( re->w, re->h ); - tqrepaint(); + repaint(); } // eat all events - except if this is a frame (in which case KHTMLView handles it all) if ( ::qt_cast<KHTMLView *>( m_widget ) ) @@ -217,7 +217,7 @@ void RenderWidget::setQWidget(TQWidget *widget) if (m_widget->focusPolicy() > TQWidget::StrongFocus) m_widget->setFocusPolicy(TQWidget::StrongFocus); - // if we've already received a tqlayout, apply the calculated space to the + // if we've already received a layout, apply the calculated space to the // widget immediately, but we have to have really been full constructed (with a non-null // style pointer). if (!needsLayout() && style()) { @@ -234,7 +234,7 @@ void RenderWidget::setQWidget(TQWidget *widget) } } -void RenderWidget::tqlayout( ) +void RenderWidget::layout( ) { KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); @@ -387,7 +387,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty) if (!m_widget || !m_view || paintInfo.phase != PaintActionForeground) return; - // not visible or not even once tqlayouted + // not visible or not even once layouted if (style()->visibility() != VISIBLE || m_y <= -500000 || m_resizePending ) return; @@ -449,7 +449,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty) // is still needed. If not, it shrinks down to the biggest size < maxPixelBuffering // that was requested during the overflow lapse. -class PaintBuffer: public TQObject +class PaintBuffer: public QObject { public: static const int maxPixelBuffering = 320*200; @@ -533,7 +533,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, for (; it.current(); ++it) { TQWidget* const w = ::qt_cast<TQWidget *>(it.current()); if ( w && !w->isTopLevel() && !w->isHidden()) { - TQRect r2 = w->tqgeometry(); + TQRect r2 = w->geometry(); blit -= r2; r2 = r2.intersect( r ); r2.moveBy(-w->x(), -w->y()); @@ -557,7 +557,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, if ( external ) { // even hackier! TQPainter pt( pm ); - const TQColor c = widget->tqcolorGroup().base(); + const TQColor c = widget->colorGroup().base(); for (int i = 0; i < cnt; ++i) pt.fillRect( br[i], c ); } else { @@ -667,11 +667,11 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) break; case TQEvent::Wheel: - if (widget()->tqparentWidget() == view()->viewport()) { + if (widget()->parentWidget() == view()->viewport()) { // don't allow the widget to react to wheel event unless its // currently focused. this avoids accidentally changing a select box // or something while wheeling a webpage. - if (tqApp->tqfocusWidget() != widget() && + if (qApp->focusWidget() != widget() && widget()->focusPolicy() <= TQWidget::StrongFocus) { static_cast<TQWheelEvent*>(e)->ignore(); TQApplication::sendEvent(view(), e); @@ -908,14 +908,14 @@ FindSelectionResult RenderReplaced::checkSelectionPoint(int _x, int _y, int _tx, } if ( _x > _tx + xPos() + width() ) { // to the right - // ### how to regard bidi in tqreplaced elements? (LS) + // ### how to regard bidi in replaced elements? (LS) offset = 1; return SelectionPointAfterInLine; } // The Y matches, check if we're on the left if ( _x < _tx + xPos() ) { - // ### how to regard bidi in tqreplaced elements? (LS) + // ### how to regard bidi in replaced elements? (LS) return SelectionPointBeforeInLine; } diff --git a/khtml/rendering/render_replaced.h b/khtml/rendering/render_replaced.h index b63d9879c..8432f170e 100644 --- a/khtml/rendering/render_replaced.h +++ b/khtml/rendering/render_replaced.h @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA. * */ -#ifndef render_tqreplaced_h -#define render_tqreplaced_h +#ifndef render_replaced_h +#define render_replaced_h #include "rendering/render_block.h" #include <tqobject.h> @@ -56,7 +56,7 @@ public: virtual void position(InlineBox*, int, int, bool); - // Return before, after (offset set to max), or inside the tqreplaced element, + // Return before, after (offset set to max), or inside the replaced element, // at @p offset virtual FindSelectionResult checkSelectionPoint( int _x, int _y, int _tx, int _ty, DOM::NodeImpl*& node, int & offset, @@ -95,7 +95,7 @@ public: virtual bool isFrame() const { return false; } virtual void detach( ); - virtual void tqlayout( ); + virtual void layout( ); virtual void updateFromElement(); diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp index 22052b6be..a71dd4116 100644 --- a/khtml/rendering/render_style.cpp +++ b/khtml/rendering/render_style.cpp @@ -723,16 +723,16 @@ bool RenderStyle::inheritedNotEqual( RenderStyle *other ) const compares two styles. The result gives an idea of the action that needs to be taken when replacing the old style with a new one. - CbLayout: The containing block of the object needs a retqlayout. - Layout: the RenderObject needs a retqlayout after the style change - Visible: The change is visible, but no retqlayout is needed - NonVisible: The object does need neither tqrepaint nor retqlayout after + CbLayout: The containing block of the object needs a relayout. + Layout: the RenderObject needs a relayout after the style change + Visible: The change is visible, but no relayout is needed + NonVisible: The object does need neither repaint nor relayout after the change. ### TODO: A lot can be optimised here based on the display type, lots of optimisations are unimplemented, and currently result in the - worst case result causing a retqlayout of the containing block. + worst case result causing a relayout of the containing block. */ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const { @@ -743,8 +743,8 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const // ECursor _cursor_style : 4; // EUserInput _user_input : 2; as long as :enabled is not impl'd -// ### this needs work to know more exactly if we need a retqlayout -// or just a tqrepaint +// ### this needs work to know more exactly if we need a relayout +// or just a repaint // non-inherited attributes // DataRef<StyleBoxData> box; @@ -775,18 +775,18 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const // _border_collapse // EEmptyCell _empty_cells : 2 ; // ECaptionSide _caption_side : 2; -// ETableLayout _table_tqlayout : 1; +// ETableLayout _table_layout : 1; // EPosition _position : 2; // EFloat _floating : 2; if ( ((int)noninherited_flags.f._display) >= TABLE ) { if ( !(inherited_flags.f._empty_cells == other->inherited_flags.f._empty_cells) || !(inherited_flags.f._caption_side == other->inherited_flags.f._caption_side) || !(inherited_flags.f._border_collapse == other->inherited_flags.f._border_collapse) || - !(noninherited_flags.f._table_tqlayout == other->noninherited_flags.f._table_tqlayout) || + !(noninherited_flags.f._table_layout == other->noninherited_flags.f._table_layout) || !(noninherited_flags.f._position == other->noninherited_flags.f._position) || !(noninherited_flags.f._floating == other->noninherited_flags.f._floating) || !(noninherited_flags.f._flowAroundFloats == other->noninherited_flags.f._flowAroundFloats) || - !(noninherited_flags.f._tqunicodeBidi == other->noninherited_flags.f._tqunicodeBidi) ) + !(noninherited_flags.f._unicodeBidi == other->noninherited_flags.f._unicodeBidi) ) return CbLayout; } @@ -813,7 +813,7 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const ) return Layout; - // Overflow returns a tqlayout hint. + // Overflow returns a layout hint. if (noninherited_flags.f._overflowX != other->noninherited_flags.f._overflowX || noninherited_flags.f._overflowY != other->noninherited_flags.f._overflowY) return Layout; diff --git a/khtml/rendering/render_style.h b/khtml/rendering/render_style.h index c54309b46..29b369ca1 100644 --- a/khtml/rendering/render_style.h +++ b/khtml/rendering/render_style.h @@ -220,7 +220,7 @@ public: } bool isTransparent() const { - return color.isValid() && tqAlpha(color.rgb()) == 0; + return color.isValid() && qAlpha(color.rgb()) == 0; } bool operator==(const BorderValue& o) const @@ -503,7 +503,7 @@ public: return !(*this == o); } - bool tqcontainsImage(CachedImage* c) const { if (c == m_image) return true; if (m_next) return m_next->tqcontainsImage(c); return false; } + bool containsImage(CachedImage* c) const { if (c == m_image) return true; if (m_next) return m_next->containsImage(c); return false; } bool hasImage() const { if (m_image) @@ -888,7 +888,7 @@ protected: unsigned int unused : 27; } f; - TQ_UINT64 _iflags; + Q_UINT64 _iflags; }; } inherited_flags; @@ -910,7 +910,7 @@ protected: EClear _clear : 2; EPosition _position : 2; EFloat _floating : 3; - ETableLayout _table_tqlayout : 1; + ETableLayout _table_layout : 1; bool _flowAroundFloats :1; EPageBreak _page_break_before : 3; @@ -919,14 +919,14 @@ protected: PseudoId _styleType : 4; bool _hasClip : 1; unsigned _pseudoBits : 8; - EUnicodeBidi _tqunicodeBidi : 2; + EUnicodeBidi _unicodeBidi : 2; // non CSS2 non-inherited bool _textOverflow : 1; // Whether or not lines that spill out should be truncated with "..." unsigned int unused : 11; } f; - TQ_UINT64 _niflags; + Q_UINT64 _niflags; }; } noninherited_flags; @@ -984,14 +984,14 @@ protected: noninherited_flags.f._clear = initialClear(); noninherited_flags.f._position = initialPosition(); noninherited_flags.f._floating = initialFloating(); - noninherited_flags.f._table_tqlayout = initialTableLayout(); + noninherited_flags.f._table_layout = initialTableLayout(); noninherited_flags.f._flowAroundFloats= initialFlowAroundFloats(); noninherited_flags.f._page_break_before = initialPageBreak(); noninherited_flags.f._page_break_after = initialPageBreak(); noninherited_flags.f._styleType = NOPSEUDO; noninherited_flags.f._hasClip = false; noninherited_flags.f._pseudoBits = 0; - noninherited_flags.f._tqunicodeBidi = initialUnicodeBidi(); + noninherited_flags.f._unicodeBidi = initialUnicodeBidi(); noninherited_flags.f._textOverflow = initialTextOverflow(); noninherited_flags.f.unused = 0; } @@ -1029,7 +1029,7 @@ public: bool hasOffset() const { return surround->offset.nonZero(); } bool hasBackground() const { - if (backgroundColor().isValid() && tqAlpha(backgroundColor().rgb()) > 0) + if (backgroundColor().isValid() && qAlpha(backgroundColor().rgb()) > 0) return true; else return background->m_background.hasImage(); @@ -1108,10 +1108,10 @@ public: LengthBox clip() const { return visual->clip; } bool hasClip() const { return noninherited_flags.f._hasClip; } - EUnicodeBidi tqunicodeBidi() const { return noninherited_flags.f._tqunicodeBidi; } + EUnicodeBidi unicodeBidi() const { return noninherited_flags.f._unicodeBidi; } EClear clear() const { return noninherited_flags.f._clear; } - ETableLayout tableLayout() const { return noninherited_flags.f._table_tqlayout; } + ETableLayout tableLayout() const { return noninherited_flags.f._table_layout; } const TQFont & font() const { return inherited->font.f; } // use with care. call font->update() after modifications @@ -1272,10 +1272,10 @@ public: void setClip( Length top, Length right, Length bottom, Length left ); void setHasClip( bool b ) { noninherited_flags.f._hasClip = b; } - void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._tqunicodeBidi = b; } + void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._unicodeBidi = b; } void setClear(EClear v) { noninherited_flags.f._clear = v; } - void setTableLayout(ETableLayout v) { noninherited_flags.f._table_tqlayout = v; } + void setTableLayout(ETableLayout v) { noninherited_flags.f._table_layout = v; } bool setFontDef(const khtml::FontDef & v) { // bah, this doesn't compare pointers. broken! (Dirk) if (!(inherited->font.fontDef == v)) { diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp index 8fc1d7246..2cf1bf1f9 100644 --- a/khtml/rendering/render_table.cpp +++ b/khtml/rendering/render_table.cpp @@ -99,12 +99,12 @@ void RenderTable::setStyle(RenderStyle *_style) if ( !tableLayout || style()->tableLayout() != oldTableLayout ) { delete tableLayout; - // According to the CSS2 spec, you only use fixed table tqlayout if an - // explicit width is specified on the table. Auto width implies auto table tqlayout. + // According to the CSS2 spec, you only use fixed table layout if an + // explicit width is specified on the table. Auto width implies auto table layout. if (style()->tableLayout() == TFIXED && !style()->width().isVariable()) { tableLayout = new FixedTableLayout(this); #ifdef DEBUG_LAYOUT - kdDebug( 6040 ) << "using fixed table tqlayout" << endl; + kdDebug( 6040 ) << "using fixed table layout" << endl; #endif } else tableLayout = new AutoTableLayout(this); @@ -113,7 +113,7 @@ void RenderTable::setStyle(RenderStyle *_style) short RenderTable::lineHeight(bool b) const { - // Inline tables are tqreplaced elements. Otherwise, just pass off to + // Inline tables are replaced elements. Otherwise, just pass off to // the base class. if (isReplaced()) return height()+marginTop()+marginBottom(); @@ -122,7 +122,7 @@ short RenderTable::lineHeight(bool b) const short RenderTable::baselinePosition(bool b) const { - // Inline tables are tqreplaced elements. Otherwise, just pass off to + // Inline tables are replaced elements. Otherwise, just pass off to // the base class. if (isReplaced()) return height()+marginTop()+marginBottom(); @@ -263,7 +263,7 @@ void RenderTable::calcWidth() calcHorizontalMargins(style()->marginLeft(),style()->marginRight(),availableWidth); } -void RenderTable::tqlayout() +void RenderTable::layout() { KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); @@ -271,13 +271,13 @@ void RenderTable::tqlayout() if (posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) { // All we have to is lay out our positioned objects. - tqlayoutPositionedObjects(true); + layoutPositionedObjects(true); setNeedsLayout(false); return; } if (markedForRepaint()) { - tqrepaintDuringLayout(); + repaintDuringLayout(); setMarkedForRepaint(false); } @@ -292,29 +292,29 @@ void RenderTable::tqlayout() tCaption->setChildNeedsLayout(true); // the optimization below doesn't work since the internal table - // tqlayout could have changed. we need to add a flag to the table - // tqlayout that tells us if something has changed in the min max + // layout could have changed. we need to add a flag to the table + // layout that tells us if something has changed in the min max // calculations to do it correctly. // if ( oldWidth != m_width || columns.size() + 1 != columnPos.size() ) - tableLayout->tqlayout(); + tableLayout->layout(); #ifdef DEBUG_LAYOUT - kdDebug( 6040 ) << renderName() << "(Table)::tqlayout1() width=" << width() << ", marginLeft=" << marginLeft() << " marginRight=" << marginRight() << endl; + kdDebug( 6040 ) << renderName() << "(Table)::layout1() width=" << width() << ", marginLeft=" << marginLeft() << " marginRight=" << marginRight() << endl; #endif setCellWidths(); - // tqlayout child objects + // layout child objects int calculatedHeight = 0; RenderObject *child = firstChild(); while( child ) { // FIXME: What about a form that has a display value that makes it a table section? if ( child->needsLayout() && !(child->element() && child->element()->id() == ID_FORM) ) - child->tqlayout(); + child->layout(); if ( child->isTableSection() ) { static_cast<RenderTableSection *>(child)->calcRowHeight(); - calculatedHeight += static_cast<RenderTableSection *>(child)->tqlayoutRows( 0 ); + calculatedHeight += static_cast<RenderTableSection *>(child)->layoutRows( 0 ); } child = child->nextSibling(); } @@ -346,7 +346,7 @@ void RenderTable::tqlayout() else if (h.isPercent()) th += calcPercentageHeight(h); - // tqlayout rows + // layout rows if ( th > calculatedHeight ) { // we have to redistribute that height to get the constraint correctly // just force the first body to the height needed @@ -354,7 +354,7 @@ void RenderTable::tqlayout() // accordingly. For now this should be good enough if (firstBody) { firstBody->calcRowHeight(); - firstBody->tqlayoutRows( th - calculatedHeight ); + firstBody->layoutRows( th - calculatedHeight ); } else if (!style()->htmlHacks()) { // Completely empty tables (with no sections or anything) should at least honor specified height @@ -394,12 +394,12 @@ void RenderTable::tqlayout() if (canvas()->pagedMode()) { RenderObject *child = firstChild(); - // retqlayout taking real position into account + // relayout taking real position into account while( child ) { if ( !(child->element() && child->element()->id() == ID_FORM) ) { child->setNeedsLayout(true); - child->tqlayout(); - if (child->tqcontainsPageBreak()) setContainsPageBreak(true); + child->layout(); + if (child->containsPageBreak()) setContainsPageBreak(true); if (child->needsPageClear()) setNeedsPageClear(true); } child = child->nextSibling(); @@ -410,7 +410,7 @@ void RenderTable::tqlayout() // table can be containing block of positioned elements. // ### only pass true if width or height changed. - tqlayoutPositionedObjects( true ); + layoutPositionedObjects( true ); m_overflowHeight = m_height; @@ -1078,7 +1078,7 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row ) int nCols = columns.size(); // ### mozilla still seems to do the old HTML way, even for strict DTD - // (see the annotation on table cell tqlayouting in the CSS specs and the testcase below: + // (see the annotation on table cell layouting in the CSS specs and the testcase below: // <TABLE border> // <TR><TD>1 <TD rowspan="2">2 <TD>3 <TD>4 // <TR><TD colspan="2">5 @@ -1246,7 +1246,7 @@ void RenderTableSection::calcRowHeight() o->setChildNeedsLayout(true, false); } if (pagedMode) cell->setNeedsLayout(true); - cell->tqlayoutIfNeeded(); + cell->layoutIfNeeded(); } ch = cell->style()->height().width(0); @@ -1261,7 +1261,7 @@ void RenderTableSection::calcRowHeight() if ( pos > rowPos[r+1] ) rowPos[r+1] = pos; - // tqfind out the baseline + // find out the baseline EVerticalAlign va = cell->style()->verticalAlign(); if (va == BASELINE || va == TEXT_BOTTOM || va == TEXT_TOP || va == SUPER || va == SUB) @@ -1294,7 +1294,7 @@ void RenderTableSection::calcRowHeight() } } -int RenderTableSection::tqlayoutRows( int toAdd ) +int RenderTableSection::layoutRows( int toAdd ) { int rHeight; int rindx; @@ -1306,14 +1306,14 @@ int RenderTableSection::tqlayoutRows( int toAdd ) m_width = table()->contentWidth(); if (markedForRepaint()) { - tqrepaintDuringLayout(); + repaintDuringLayout(); setMarkedForRepaint(false); } if (toAdd && totalRows && (rowPos[totalRows] || !nextSibling())) { int totalHeight = rowPos[totalRows] + toAdd; -// qDebug("tqlayoutRows: totalHeight = %d", totalHeight ); +// qDebug("layoutRows: totalHeight = %d", totalHeight ); int dh = toAdd; int totalPercent = 0; @@ -1443,7 +1443,7 @@ int RenderTableSection::tqlayoutRows( int toAdd ) cell->setCellPercentageHeight(kMax(0, rHeight - cell->borderTop() - cell->paddingTop() - cell->borderBottom() - cell->paddingBottom())); - cell->tqlayoutIfNeeded(); + cell->layoutIfNeeded(); } { @@ -1507,7 +1507,7 @@ bool RenderTableSection::flexCellChildren(RenderObject* p) const while (o) { if (!o->isText() && o->style()->height().isPercent()) { if (o->isWidget()) { - // cancel resizes from transitory retqlayouts + // cancel resizes from transitory relayouts static_cast<RenderWidget *>(o)->cancelPendingResize(); } o->setNeedsLayout(true, false); @@ -1608,7 +1608,7 @@ int RenderTableSection::highestPosition(bool includeOverflowInterior, bool inclu } // Search from first_row to last_row for the row containing y -static unsigned int tqfindRow(unsigned int first_row, unsigned int last_row, +static unsigned int findRow(unsigned int first_row, unsigned int last_row, const TQMemArray<int> &rowPos, int y) { unsigned int under = first_row; @@ -1628,7 +1628,7 @@ static unsigned int tqfindRow(unsigned int first_row, unsigned int last_row, return under; } -static void tqfindRowCover(unsigned int &startrow, unsigned int &endrow, +static void findRowCover(unsigned int &startrow, unsigned int &endrow, const TQMemArray<int> &rowPos, int min_y, int max_y) { @@ -1656,9 +1656,9 @@ static void tqfindRowCover(unsigned int &startrow, unsigned int &endrow, } // Binary search for startrow - startrow = tqfindRow(startrow, endrow, rowPos, min_y); + startrow = findRow(startrow, endrow, rowPos, min_y); // Binary search for endrow - endrow = tqfindRow(startrow, endrow, rowPos, max_y) + 1; + endrow = findRow(startrow, endrow, rowPos, max_y) + 1; if (endrow > totalRows) endrow = totalRows; } @@ -1682,7 +1682,7 @@ void RenderTableSection::paint( PaintInfo& pI, int tx, int ty ) int os = 2*maximalOutlineSize(pI.phase); unsigned int startrow = 0; unsigned int endrow = totalRows; - tqfindRowCover(startrow, endrow, rowPos, y - os - ty - kMax(cbsw21, os), y + h + os - ty + kMax(cbsw2, os)); + findRowCover(startrow, endrow, rowPos, y - os - ty - kMax(cbsw21, os), y + h + os - ty + kMax(cbsw2, os)); // A binary search is probably not worthwhile for coloumns unsigned int startcol = 0; @@ -1877,11 +1877,11 @@ static RenderTableCell *seekCell(RenderTableSection *section, int row, int col) * a renderer. * @return the element or @p base if no suitable element found. */ -static NodeImpl *tqfindLastSelectableNode(NodeImpl *base) +static NodeImpl *findLastSelectableNode(NodeImpl *base) { NodeImpl *last = base; // Look for last text/cdata node that has a renderer, - // or last childless tqreplaced element + // or last childless replaced element while ( last && !(last->renderer() && ((last->nodeType() == Node::TEXT_NODE || last->nodeType() == Node::CDATA_SECTION_NODE) || (last->renderer()->isReplaced() && !last->renderer()->lastChild())))) @@ -1920,7 +1920,7 @@ FindSelectionResult RenderTableSection::checkSelectionPoint( int _x, int _y, int // else if (_y >= _ty + height()) save_last = true; // Find the row containing the pointer - int row_idx = tqfindRow(0, totalRows, rowPos, _y - _ty); + int row_idx = findRow(0, totalRows, rowPos, _y - _ty); int col_idx; if ( style()->direction() == LTR ) { @@ -1967,7 +1967,7 @@ FindSelectionResult RenderTableSection::checkSelectionPoint( int _x, int _y, int NodeImpl *element = cell->element(); if (!element) return SelectionPointBefore; - element = tqfindLastSelectableNode(element); + element = findLastSelectableNode(element); state.m_lastNode = element; state.m_lastOffset = element->maxOffset(); @@ -2082,7 +2082,7 @@ void RenderTableRow::addChild(RenderObject *child, RenderObject *beforeChild) section()->setNeedCellRecalc(); } -void RenderTableRow::tqlayout() +void RenderTableRow::layout() { KHTMLAssert( needsLayout() ); KHTMLAssert( minMaxKnown() ); @@ -2095,18 +2095,18 @@ void RenderTableRow::tqlayout() if (pagedMode) { cell->setNeedsLayout(true); int oldHeight = child->height(); - cell->tqlayout(); - if (oldHeight > 0 && child->tqcontainsPageBreak() && child->height() != oldHeight) + cell->layout(); + if (oldHeight > 0 && child->containsPageBreak() && child->height() != oldHeight) section()->addSpaceAt(child->yPos()+1, child->height() - oldHeight); } else if ( child->needsLayout() ) { if (markedForRepaint()) cell->setMarkedForRepaint( true ); cell->calcVerticalMargins(); - cell->tqlayout(); + cell->layout(); cell->setCellTopExtra(0); cell->setCellBottomExtra(0); - if (child->tqcontainsPageBreak()) setContainsPageBreak(true); + if (child->containsPageBreak()) setContainsPageBreak(true); } } child = child->nextSibling(); @@ -2298,9 +2298,9 @@ void RenderTableCell::setWidth( int width ) } } -void RenderTableCell::tqlayout() +void RenderTableCell::layout() { - tqlayoutBlock( m_widthChanged ); + layoutBlock( m_widthChanged ); m_widthChanged = false; } @@ -2319,9 +2319,9 @@ bool RenderTableCell::requiresLayer() const { return /* style()->opacity() < 1.0f || */ hasOverflowClip() || isRelPositioned(); } -void RenderTableCell::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderTableCell::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) { - RenderBlock::tqrepaintRectangle(x, y, w, h + _topExtra + _bottomExtra, p, f); + RenderBlock::repaintRectangle(x, y, w, h + _topExtra + _bottomExtra, p, f); } bool RenderTableCell::absolutePosition(int &xPos, int &yPos, bool f) const @@ -2800,7 +2800,7 @@ public: static void addBorderStyle(TQValueList<CollapsedBorderValue>& borderStyles, CollapsedBorderValue borderValue) { - if (!borderValue.exists() || borderStyles.tqcontains(borderValue)) + if (!borderValue.exists() || borderStyles.contains(borderValue)) return; TQValueListIterator<CollapsedBorderValue> it = borderStyles.begin(); diff --git a/khtml/rendering/render_table.h b/khtml/rendering/render_table.h index e6da166cb..a6de6cfaf 100644 --- a/khtml/rendering/render_table.h +++ b/khtml/rendering/render_table.h @@ -87,7 +87,7 @@ public: virtual void addChild(RenderObject *child, RenderObject *beforeChild = 0); virtual void paint( PaintInfo&, int tx, int ty); virtual void paintBoxDecorations(PaintInfo&, int _tx, int _ty); - virtual void tqlayout(); + virtual void layout(); virtual void calcMinMaxWidth(); virtual void close(); @@ -224,7 +224,7 @@ public: void setCellWidths(); void calcRowHeight(); - int tqlayoutRows( int height ); + int layoutRows( int height ); RenderTable *table() const { return static_cast<RenderTable *>(parent()); } @@ -315,7 +315,7 @@ public: virtual bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction action, bool inside); - virtual void tqlayout(); + virtual void layout(); virtual RenderObject* removeChildNode(RenderObject* child); @@ -336,7 +336,7 @@ class RenderTableCell : public RenderBlock public: RenderTableCell(DOM::NodeImpl* node); - virtual void tqlayout(); + virtual void layout(); virtual void detach(); virtual const char *renderName() const { return "RenderTableCell"; } @@ -396,7 +396,7 @@ public: // lie position to outside observers virtual int yPos() const { return m_y + _topExtra; } - virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); virtual bool absolutePosition(int &xPos, int &yPos, bool f = false) const; virtual short baselinePosition( bool = false ) const; @@ -455,7 +455,7 @@ public: virtual short lineHeight( bool ) const { return 0; } virtual void position(InlineBox*, int, int, bool) {} - virtual void tqlayout() {} + virtual void layout() {} virtual bool requiresLayer() const { return false; } virtual void updateFromElement(); diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp index a45fc8583..0bded06fc 100644 --- a/khtml/rendering/render_text.cpp +++ b/khtml/rendering/render_text.cpp @@ -88,7 +88,7 @@ void InlineTextBox::operator delete(void* ptr, size_t sz) { assert(inInlineTextBoxDetach); - // Stash size where detach can tqfind it. + // Stash size where detach can find it. *(size_t *)ptr = sz; } @@ -230,7 +230,7 @@ void InlineTextBox::paintSelection(const Font *f, RenderText *text, TQPainter *p // In this case, simply swap the colors, thus in compliance with // NN4 (win32 only), IE, and Mozilla. if (!khtml::hasSufficientContrast(hbg, bg)) - tqSwap(hc, hbg); + qSwap(hc, hbg); } p->setPen(hc); @@ -319,9 +319,9 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, const int w = m_width+2*thickness; const int h = m_height+2*thickness; const QRgb color = shadow->color.rgb(); - const int gray = tqGray(color); + const int gray = qGray(color); const bool inverse = (gray < 100); - const QRgb bgColor = (inverse) ? tqRgb(255,255,255) : tqRgb(0,0,0); + const QRgb bgColor = (inverse) ? qRgb(255,255,255) : qRgb(0,0,0); TQPixmap pixmap(w, h); pixmap.fill(bgColor); TQPainter p; @@ -365,7 +365,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, for(int i=thickness; i<w-thickness; i++) { QRgb col= img.pixel(i,j); if (col == bgColor) continue; - float g = tqGray(col); + float g = qGray(col); if (inverse) g = (255-g)/(255-gray); else @@ -383,9 +383,9 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, TQImage res(w,h,32); res.setAlphaBuffer(true); - int r = tqRed(color); - int g = tqGreen(color); - int b = tqBlue(color); + int r = qRed(color); + int g = qGreen(color); + int b = qBlue(color); // divide by factor factor = 1.0/factor; @@ -394,7 +394,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, for(int i=0; i<w; i++) { int a = (int)(amap[i+j*w] * factor * 255.0); if (a > 255) a = 255; - res.setPixel(i,j, tqRgba(r,g,b,a)); + res.setPixel(i,j, qRgba(r,g,b,a)); } } @@ -494,7 +494,7 @@ FindSelectionResult InlineTextBox::checkSelectionPoint(int _x, int _y, int _tx, int InlineTextBox::offsetForPoint(int _x, int &ax) const { - // Do binary search for tqfinding out offset, saves some time for long + // Do binary search for finding out offset, saves some time for long // runs. int start = 0; int end = m_len; @@ -643,7 +643,7 @@ int InlineTextBoxArray::compareItems( Item d1, Item d2 ) } // remove this once QVector::bsearch is fixed -int InlineTextBoxArray::tqfindFirstMatching(Item d) const +int InlineTextBoxArray::findFirstMatching(Item d) const { int len = count(); @@ -758,7 +758,7 @@ DOM::DOMStringImpl* RenderText::originalString() const return element() ? element()->string() : 0; } -InlineTextBox * RenderText::tqfindInlineTextBox( int offset, int &pos, bool checkFirstLetter ) +InlineTextBox * RenderText::findInlineTextBox( int offset, int &pos, bool checkFirstLetter ) { // The text boxes point to parts of the rendertext's str string // (they don't include '\n') @@ -775,7 +775,7 @@ InlineTextBox * RenderText::tqfindInlineTextBox( int offset, int &pos, bool chec RenderText *letterText = static_cast<RenderText *>(firstLetter->firstChild()); //kdDebug(6040) << "lettertext: " << letterText << " minOfs: " << letterText->minOffset() << " maxOfs: " << letterText->maxOffset() << endl; if (offset >= letterText->minOffset() && offset <= letterText->maxOffset()) { - InlineTextBox *result = letterText->tqfindInlineTextBox(offset, pos, false); + InlineTextBox *result = letterText->findInlineTextBox(offset, pos, false); //kdDebug(6040) << "result: " << result << endl; if (result) return result; } @@ -927,7 +927,7 @@ void RenderText::caretPos(int offset, int flags, int &_x, int &_y, int &width, i } int pos; - InlineTextBox * s = tqfindInlineTextBox( offset, pos, true ); + InlineTextBox * s = findInlineTextBox( offset, pos, true ); RenderText *t = s->renderText(); // kdDebug(6040) << "offset="<<offset << " pos="<<pos << endl; @@ -963,7 +963,7 @@ void RenderText::caretPos(int offset, int flags, int &_x, int &_y, int &width, i long RenderText::minOffset() const { if (!m_lines.count()) return 0; - // FIXME: it is *not* guaranteed that the first run tqcontains the lowest offset + // FIXME: it is *not* guaranteed that the first run contains the lowest offset // Either make this a linear search (slow), // or maintain an index (needs much mem), // or calculate and store it in bidi.cpp (needs calculation even if not needed) @@ -975,7 +975,7 @@ long RenderText::maxOffset() const { int count = m_lines.count(); if (!count) return str->l; - // FIXME: it is *not* guaranteed that the last run tqcontains the highest offset + // FIXME: it is *not* guaranteed that the last run contains the highest offset // Either make this a linear search (slow), // or maintain an index (needs much mem), // or calculate and store it in bidi.cpp (needs calculation even if not needed) @@ -995,7 +995,7 @@ bool RenderText::posOfChar(int chr, int &x, int &y) parent()->absolutePosition( x, y, false ); int pos; - InlineTextBox * s = tqfindInlineTextBox( chr, pos ); + InlineTextBox * s = findInlineTextBox( chr, pos ); if ( s ) { // s is the line containing the character @@ -1036,7 +1036,7 @@ void RenderText::calcMinMaxWidth() bool firstLine = true; for(int i = 0; i < len; i++) { - unsigned short c = str->s[i].tqunicode(); + unsigned short c = str->s[i].unicode(); bool isNewline = false; // If line-breaks survive to here they are preserved @@ -1056,7 +1056,7 @@ void RenderText::calcMinMaxWidth() continue; int wordlen = 0; - while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].tqunicode() != SOFT_HYPHEN) && + while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].unicode() != SOFT_HYPHEN) && !(isBreakable( str->s, i+wordlen, str->l )) ) wordlen++; @@ -1071,7 +1071,7 @@ void RenderText::calcMinMaxWidth() currMaxWidth += w; // Add in wordspacing to our maxwidth, but not if this is the last word. - if (wordSpacing && !tqcontainsOnlyWhitespace(i+wordlen, len-(i+wordlen))) + if (wordSpacing && !containsOnlyWhitespace(i+wordlen, len-(i+wordlen))) currMaxWidth += wordSpacing; if (firstWord) { @@ -1175,7 +1175,7 @@ void RenderText::setText(DOMStringImpl *text, bool force) RenderObject *o; bool runOnString = false; - // tqfind previous non-empty text renderer if one exists + // find previous non-empty text renderer if one exists for (o = previousRenderer(); o; o = o->previousRenderer()) { if (!o->isInlineFlow()) { if (!o->isText()) @@ -1259,7 +1259,7 @@ void RenderText::position(InlineBox* box, int from, int len, bool reverse) { //kdDebug(6040) << "position: from="<<from<<" len="<<len<<endl; // ### should not be needed!!! - // asserts sometimes with pre (that unibw-hamburg testcase). ### tqfind out why + // asserts sometimes with pre (that unibw-hamburg testcase). ### find out why //KHTMLAssert(!(len == 0 || (str->l && len == 1 && *(str->s+from) == '\n') )); // It is now needed. BRs need text boxes too otherwise caret navigation // gets stuck (LS) @@ -1328,11 +1328,11 @@ short RenderText::width() const return w; } -void RenderText::tqrepaint(Priority p) +void RenderText::repaint(Priority p) { RenderObject *cb = containingBlock(); if(cb) - cb->tqrepaint(p); + cb->repaint(p); } bool RenderText::isFixedWidthFont() const @@ -1368,7 +1368,7 @@ const Font *RenderText::htmlFont(bool firstLine) const return f; } -bool RenderText::tqcontainsOnlyWhitespace(unsigned int from, unsigned int len) const +bool RenderText::containsOnlyWhitespace(unsigned int from, unsigned int len) const { unsigned int currPos; for (currPos = from; @@ -1390,7 +1390,7 @@ void RenderText::trimmedMinMaxWidth(short& beginMinW, bool& beginWS, stripFrontSpaces = false; int len = str->l; - if (len == 0 || (stripFrontSpaces && str->tqcontainsOnlyWhitespace())) { + if (len == 0 || (stripFrontSpaces && str->containsOnlyWhitespace())) { maxW = 0; hasBreak = false; return; @@ -1470,7 +1470,7 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s) } else if (c == '"') { result += "\\\""; } else { - ushort u = c.tqunicode(); + ushort u = c.unicode(); if (u >= 0x20 && u < 0x7F) { result += c; } else { diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h index f5356b6c7..d91782b47 100644 --- a/khtml/rendering/render_text.h +++ b/khtml/rendering/render_text.h @@ -36,7 +36,7 @@ class TQPainter; class TQFontMetrics; -// Define a constant for soft hyphen's tqunicode value. +// Define a constant for soft hyphen's unicode value. #define SOFT_HYPHEN 173 const int cNoTruncation = -1; @@ -154,7 +154,7 @@ public: InlineTextBox* first(); - int tqfindFirstMatching( Item ) const; + int findFirstMatching( Item ) const; virtual int compareItems( Item, Item ); }; @@ -183,7 +183,7 @@ public: virtual InlineBox* createInlineBox(bool, bool); - virtual void tqlayout() {assert(false);} + virtual void layout() {assert(false);} virtual bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inBox); @@ -217,7 +217,7 @@ public: short& beginMaxW, short& endMaxW, short& minW, short& maxW, bool& stripFrontSpaces); - bool tqcontainsOnlyWhitespace(unsigned int from, unsigned int len) const; + bool containsOnlyWhitespace(unsigned int from, unsigned int len) const; ushort startMin() const { return m_startMin; } ushort endMin() const { return m_endMin; } @@ -247,7 +247,7 @@ public: virtual short marginLeft() const { return style()->marginLeft().minWidth(0); } virtual short marginRight() const { return style()->marginRight().minWidth(0); } - virtual void tqrepaint(Priority p=NormalPriority); + virtual void repaint(Priority p=NormalPriority); bool hasBreakableChar() const { return m_hasBreakableChar; } const TQFontMetrics &metrics(bool firstLine) const; @@ -285,7 +285,7 @@ public: * boxes, if available. * @return the text box, or 0 if no match has been found */ - InlineTextBox * tqfindInlineTextBox( int offset, int &pos, + InlineTextBox * findInlineTextBox( int offset, int &pos, bool checkFirstLetter = false ); protected: // members diff --git a/khtml/rendering/table_layout.cpp b/khtml/rendering/table_layout.cpp index a9c40a272..7b5215d02 100644 --- a/khtml/rendering/table_layout.cpp +++ b/khtml/rendering/table_layout.cpp @@ -32,19 +32,19 @@ using namespace khtml; /* The text below is from the CSS 2.1 specs. - Fixed table tqlayout + Fixed table layout ------------------ - With this (fast) algorithm, the horizontal tqlayout of the table does + With this (fast) algorithm, the horizontal layout of the table does not depend on the contents of the cells; it only depends on the table's width, the width of the columns, and borders or cell spacing. The table's width may be specified explicitly with the 'width' property. A value of 'auto' (for both 'display: table' and 'display: - inline-table') means use the automatic table tqlayout algorithm. + inline-table') means use the automatic table layout algorithm. - In the fixed table tqlayout algorithm, the width of each column is + In the fixed table layout algorithm, the width of each column is determined as follows: 1. A column element with a value other than 'auto' for the 'width' @@ -73,7 +73,7 @@ using namespace khtml; _____________________________________________________ This is not quite true when comparing to IE. IE always honors - table-tqlayout:fixed and treats a variable table width as 100%. Makes + table-layout:fixed and treats a variable table width as 100%. Makes a lot of sense, and is implemented here the same way. */ @@ -223,7 +223,7 @@ int FixedTableLayout::calcWidthArray() void FixedTableLayout::calcMinMaxWidth() { // we might want to wait until we have all of the first row before - // tqlayouting for the first time. + // layouting for the first time. // only need to calculate the minimum width as the sum of the // cols/cells with a fixed width. @@ -258,13 +258,13 @@ void FixedTableLayout::calcMinMaxWidth() #endif } -void FixedTableLayout::tqlayout() +void FixedTableLayout::layout() { int tableWidth = table->width() - table->bordersPaddingAndSpacing(); int available = tableWidth; int nEffCols = table->numEffCols(); #ifdef DEBUG_LAYOUT - qDebug("FixedTableLayout::tqlayout: tableWidth=%d, numEffCols=%d", tableWidth, nEffCols); + qDebug("FixedTableLayout::layout: tableWidth=%d, numEffCols=%d", tableWidth, nEffCols); #endif @@ -293,7 +293,7 @@ void FixedTableLayout::tqlayout() base = available; #ifdef DEBUG_LAYOUT - qDebug("FixedTableLayout::tqlayout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent); + qDebug("FixedTableLayout::layout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent); #endif for ( int i = 0; available > 0 && i < nEffCols; i++ ) { if ( width[i].isPercent() ) { @@ -369,13 +369,13 @@ AutoTableLayout::~AutoTableLayout() { } -/* recalculates the full structure needed to do tqlayouting and minmax calculations. +/* recalculates the full structure needed to do layouting and minmax calculations. This is usually calculated on the fly, but needs to be done fully when table cells change dynamically */ void AutoTableLayout::recalcColumn( int effCol ) { - Layout &l = tqlayoutStruct[effCol]; + Layout &l = layoutStruct[effCol]; RenderObject *child = table->firstChild(); // first we iterate over all rows. @@ -478,8 +478,8 @@ void AutoTableLayout::fullRecalc() effWidthDirty = true; int nEffCols = table->numEffCols(); - tqlayoutStruct.resize( nEffCols ); - tqlayoutStruct.fill( Layout() ); + layoutStruct.resize( nEffCols ); + layoutStruct.fill( Layout() ); spanCells.fill( 0 ); RenderObject *child = table->firstChild(); @@ -504,9 +504,9 @@ void AutoTableLayout::fullRecalc() #endif if ( !w.isVariable() && span == 1 && cEffCol < nEffCols ) { if ( table->spanOfEffCol( cEffCol ) == 1 ) { - tqlayoutStruct[cEffCol].width = w; - if (w.isFixed() && tqlayoutStruct[cEffCol].maxWidth < w.value()) - tqlayoutStruct[cEffCol].maxWidth = w.value(); + layoutStruct[cEffCol].width = w; + if (w.isFixed() && layoutStruct[cEffCol].maxWidth < w.value()) + layoutStruct[cEffCol].maxWidth = w.value(); } } cCol += span; @@ -577,16 +577,16 @@ void AutoTableLayout::calcMinMaxWidth() int maxNonPercent = 0; int remainingPercent = 100; - for ( unsigned int i = 0; i < tqlayoutStruct.size(); i++ ) { - minWidth += tqlayoutStruct[i].effMinWidth; - maxWidth += tqlayoutStruct[i].effMaxWidth; - if ( tqlayoutStruct[i].effWidth.isPercent() ) { - int percent = kMin(tqlayoutStruct[i].effWidth.value(), remainingPercent); - int pw = ( tqlayoutStruct[i].effMaxWidth * 100) / kMax(percent, 1); + for ( unsigned int i = 0; i < layoutStruct.size(); i++ ) { + minWidth += layoutStruct[i].effMinWidth; + maxWidth += layoutStruct[i].effMaxWidth; + if ( layoutStruct[i].effWidth.isPercent() ) { + int percent = kMin(layoutStruct[i].effWidth.value(), remainingPercent); + int pw = ( layoutStruct[i].effMaxWidth * 100) / kMax(percent, 1); remainingPercent -= percent; maxPercent = kMax( pw, maxPercent ); } else { - maxNonPercent += tqlayoutStruct[i].effMaxWidth; + maxNonPercent += layoutStruct[i].effMaxWidth; } } @@ -624,15 +624,15 @@ int AutoTableLayout::calcEffectiveWidth() { int tMaxWidth = 0; - unsigned int nEffCols = tqlayoutStruct.size(); + unsigned int nEffCols = layoutStruct.size(); int hspacing = table->borderHSpacing(); #ifdef DEBUG_LAYOUT qDebug("AutoTableLayout::calcEffectiveWidth for %d cols", nEffCols ); #endif for ( unsigned int i = 0; i < nEffCols; i++ ) { - tqlayoutStruct[i].effWidth = tqlayoutStruct[i].width; - tqlayoutStruct[i].effMinWidth = tqlayoutStruct[i].minWidth; - tqlayoutStruct[i].effMaxWidth = tqlayoutStruct[i].maxWidth; + layoutStruct[i].effWidth = layoutStruct[i].width; + layoutStruct[i].effMinWidth = layoutStruct[i].minWidth; + layoutStruct[i].effMaxWidth = layoutStruct[i].maxWidth; } for ( unsigned int i = 0; i < spanCells.size(); i++ ) { @@ -660,14 +660,14 @@ int AutoTableLayout::calcEffectiveWidth() int cSpan = span; #endif while ( lastCol < nEffCols && span > 0 ) { - switch( tqlayoutStruct[lastCol].width.type() ) { + switch( layoutStruct[lastCol].width.type() ) { case Percent: - totalPercent += tqlayoutStruct[lastCol].width.value(); + totalPercent += layoutStruct[lastCol].width.value(); allColsAreFixed = false; break; case Fixed: - if (tqlayoutStruct[lastCol].width.value() > 0) { - fixedWidth += tqlayoutStruct[lastCol].width.value(); + if (layoutStruct[lastCol].width.value() > 0) { + fixedWidth += layoutStruct[lastCol].width.value(); allColsArePercent = false; // IE resets effWidth to Variable here, but this breaks the konqueror about page and seems to be some bad // legacy behavior anyway. mozilla doesn't do this so I decided we don't either. @@ -685,17 +685,17 @@ int AutoTableLayout::calcEffectiveWidth() // <tr><td>1</td><td colspan=2>2-3</tr> // <tr><td>1</td><td colspan=2 width=100%>2-3</td></tr> // </table> - if (!tqlayoutStruct[lastCol].effWidth.isPercent()) { - tqlayoutStruct[lastCol].effWidth = Length(); + if (!layoutStruct[lastCol].effWidth.isPercent()) { + layoutStruct[lastCol].effWidth = Length(); allColsArePercent = false; } else - totalPercent += tqlayoutStruct[lastCol].effWidth.value(); + totalPercent += layoutStruct[lastCol].effWidth.value(); allColsAreFixed = false; } span -= table->spanOfEffCol( lastCol ); - minWidth += tqlayoutStruct[lastCol].effMinWidth; - maxWidth += tqlayoutStruct[lastCol].effMaxWidth; + minWidth += layoutStruct[lastCol].effMinWidth; + maxWidth += layoutStruct[lastCol].effMaxWidth; lastCol++; cMinWidth -= hspacing; cMaxWidth -= hspacing; @@ -720,22 +720,22 @@ int AutoTableLayout::calcEffectiveWidth() int percentMissing = w.value() - totalPercent; int totalWidth = 0; for ( unsigned int pos = col; pos < lastCol; pos++ ) { - if ( !(tqlayoutStruct[pos].width.isPercent() ) ) - totalWidth += tqlayoutStruct[pos].effMaxWidth; + if ( !(layoutStruct[pos].width.isPercent() ) ) + totalWidth += layoutStruct[pos].effMaxWidth; } for ( unsigned int pos = col; pos < lastCol && totalWidth > 0; pos++ ) { - if ( !(tqlayoutStruct[pos].width.isPercent() ) ) { - int percent = percentMissing * tqlayoutStruct[pos].effMaxWidth / totalWidth; + if ( !(layoutStruct[pos].width.isPercent() ) ) { + int percent = percentMissing * layoutStruct[pos].effMaxWidth / totalWidth; #ifdef DEBUG_LAYOUT - qDebug(" col %d: setting percent value %d effMaxWidth=%d totalWidth=%d", pos, percent, tqlayoutStruct[pos].effMaxWidth, totalWidth ); + qDebug(" col %d: setting percent value %d effMaxWidth=%d totalWidth=%d", pos, percent, layoutStruct[pos].effMaxWidth, totalWidth ); #endif - totalWidth -= tqlayoutStruct[pos].effMaxWidth; + totalWidth -= layoutStruct[pos].effMaxWidth; percentMissing -= percent; if ( percent > 0 ) - tqlayoutStruct[pos].effWidth = Length( percent, Percent ); + layoutStruct[pos].effWidth = Length( percent, Percent ); else - tqlayoutStruct[pos].effWidth = Length(); + layoutStruct[pos].effWidth = Length(); } } @@ -749,13 +749,13 @@ int AutoTableLayout::calcEffectiveWidth() qDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d accroding to fixed sum %d", col, lastCol-1, cMinWidth, minWidth, fixedWidth ); #endif for ( unsigned int pos = col; fixedWidth > 0 && pos < lastCol; pos++ ) { - int w = kMax( int( tqlayoutStruct[pos].effMinWidth ), cMinWidth * tqlayoutStruct[pos].width.value() / fixedWidth ); + int w = kMax( int( layoutStruct[pos].effMinWidth ), cMinWidth * layoutStruct[pos].width.value() / fixedWidth ); #ifdef DEBUG_LAYOUT - qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, tqlayoutStruct[pos].effMinWidth, tqlayoutStruct[pos].effMinWidth, w ); + qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w ); #endif - fixedWidth -= tqlayoutStruct[pos].width.value(); + fixedWidth -= layoutStruct[pos].width.value(); cMinWidth -= w; - tqlayoutStruct[pos].effMinWidth = w; + layoutStruct[pos].effMinWidth = w; } } else if ( allColsArePercent ) { @@ -764,17 +764,17 @@ int AutoTableLayout::calcEffectiveWidth() int cminw = cMinWidth; for ( unsigned int pos = col; maxw > 0 && pos < lastCol; pos++ ) { - if ( tqlayoutStruct[pos].effWidth.isPercent() && tqlayoutStruct[pos].effWidth.value()>0 && fixedWidth <= cMinWidth) { - int w = tqlayoutStruct[pos].effMinWidth; - w = kMax( w, cminw*tqlayoutStruct[pos].effWidth.value()/totalPercent ); - w = kMin(tqlayoutStruct[pos].effMinWidth+(cMinWidth-minw), w); + if ( layoutStruct[pos].effWidth.isPercent() && layoutStruct[pos].effWidth.value()>0 && fixedWidth <= cMinWidth) { + int w = layoutStruct[pos].effMinWidth; + w = kMax( w, cminw*layoutStruct[pos].effWidth.value()/totalPercent ); + w = kMin(layoutStruct[pos].effMinWidth+(cMinWidth-minw), w); #ifdef DEBUG_LAYOUT - qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, tqlayoutStruct[pos].effMinWidth, tqlayoutStruct[pos].effMinWidth, w ); + qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w ); #endif - maxw -= tqlayoutStruct[pos].effMaxWidth; - minw -= tqlayoutStruct[pos].effMinWidth; + maxw -= layoutStruct[pos].effMaxWidth; + minw -= layoutStruct[pos].effMinWidth; cMinWidth -= w; - tqlayoutStruct[pos].effMinWidth = w; + layoutStruct[pos].effMinWidth = w; } } } else { @@ -786,31 +786,31 @@ int AutoTableLayout::calcEffectiveWidth() // Give min to variable first, to fixed second, and to others third. for ( unsigned int pos = col; maxw > 0 && pos < lastCol; pos++ ) { - if ( tqlayoutStruct[pos].width.isFixed() && haveVariable && fixedWidth <= cMinWidth ) { - int w = kMax( int( tqlayoutStruct[pos].effMinWidth ), tqlayoutStruct[pos].width.value() ); - fixedWidth -= tqlayoutStruct[pos].width.value(); - minw -= tqlayoutStruct[pos].effMinWidth; + if ( layoutStruct[pos].width.isFixed() && haveVariable && fixedWidth <= cMinWidth ) { + int w = kMax( int( layoutStruct[pos].effMinWidth ), layoutStruct[pos].width.value() ); + fixedWidth -= layoutStruct[pos].width.value(); + minw -= layoutStruct[pos].effMinWidth; #ifdef DEBUG_LAYOUT - qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, tqlayoutStruct[pos].effMinWidth, tqlayoutStruct[pos].effMinWidth, w ); + qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w ); #endif - maxw -= tqlayoutStruct[pos].effMaxWidth; + maxw -= layoutStruct[pos].effMaxWidth; cMinWidth -= w; - tqlayoutStruct[pos].effMinWidth = w; + layoutStruct[pos].effMinWidth = w; } } for ( unsigned int pos = col; maxw > 0 && pos < lastCol && minw < cMinWidth; pos++ ) { - if ( !(tqlayoutStruct[pos].width.isFixed() && haveVariable && fixedWidth <= cMinWidth) ) { - int w = kMax( int( tqlayoutStruct[pos].effMinWidth ), cMinWidth * tqlayoutStruct[pos].effMaxWidth / maxw ); - w = kMin(tqlayoutStruct[pos].effMinWidth+(cMinWidth-minw), w); + if ( !(layoutStruct[pos].width.isFixed() && haveVariable && fixedWidth <= cMinWidth) ) { + int w = kMax( int( layoutStruct[pos].effMinWidth ), cMinWidth * layoutStruct[pos].effMaxWidth / maxw ); + w = kMin(layoutStruct[pos].effMinWidth+(cMinWidth-minw), w); #ifdef DEBUG_LAYOUT - qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, tqlayoutStruct[pos].effMinWidth, tqlayoutStruct[pos].effMinWidth, w ); + qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w ); #endif - maxw -= tqlayoutStruct[pos].effMaxWidth; - minw -= tqlayoutStruct[pos].effMinWidth; + maxw -= layoutStruct[pos].effMaxWidth; + minw -= layoutStruct[pos].effMinWidth; cMinWidth -= w; - tqlayoutStruct[pos].effMinWidth = w; + layoutStruct[pos].effMinWidth = w; } } } @@ -821,18 +821,18 @@ int AutoTableLayout::calcEffectiveWidth() qDebug("extending maxWidth of cols %d-%d to %dpx", col, lastCol-1, cMaxWidth ); #endif for ( unsigned int pos = col; maxWidth > 0 && pos < lastCol; pos++ ) { - int w = kMax( int( tqlayoutStruct[pos].effMaxWidth ), cMaxWidth * tqlayoutStruct[pos].effMaxWidth / maxWidth ); + int w = kMax( int( layoutStruct[pos].effMaxWidth ), cMaxWidth * layoutStruct[pos].effMaxWidth / maxWidth ); #ifdef DEBUG_LAYOUT - qDebug(" col %d: max=%d, effMax=%d, new=%d", pos, tqlayoutStruct[pos].effMaxWidth, tqlayoutStruct[pos].effMaxWidth, w ); + qDebug(" col %d: max=%d, effMax=%d, new=%d", pos, layoutStruct[pos].effMaxWidth, layoutStruct[pos].effMaxWidth, w ); #endif - maxWidth -= tqlayoutStruct[pos].effMaxWidth; + maxWidth -= layoutStruct[pos].effMaxWidth; cMaxWidth -= w; - tqlayoutStruct[pos].effMaxWidth = w; + layoutStruct[pos].effMaxWidth = w; } } } else { for ( unsigned int pos = col; pos < lastCol; pos++ ) - tqlayoutStruct[pos].maxWidth = kMax(tqlayoutStruct[pos].maxWidth, int(tqlayoutStruct[pos].minWidth) ); + layoutStruct[pos].maxWidth = kMax(layoutStruct[pos].maxWidth, int(layoutStruct[pos].minWidth) ); } } effWidthDirty = false; @@ -868,20 +868,20 @@ void AutoTableLayout::insertSpanCell( RenderTableCell *cell ) } -void AutoTableLayout::tqlayout() +void AutoTableLayout::layout() { - // table tqlayout based on the values collected in the tqlayout structure. + // table layout based on the values collected in the layout structure. int tableWidth = table->width() - table->bordersPaddingAndSpacing(); int available = tableWidth; int nEffCols = table->numEffCols(); - if ( nEffCols != (int)tqlayoutStruct.size() ) { - qWarning("WARNING: nEffCols is not equal to tqlayoutstruct!" ); + if ( nEffCols != (int)layoutStruct.size() ) { + qWarning("WARNING: nEffCols is not equal to layoutstruct!" ); fullRecalc(); nEffCols = table->numEffCols(); } #ifdef DEBUG_LAYOUT - qDebug("AutoTableLayout::tqlayout()"); + qDebug("AutoTableLayout::layout()"); #endif if ( effWidthDirty ) @@ -891,11 +891,11 @@ void AutoTableLayout::tqlayout() qDebug(" tableWidth=%d, nEffCols=%d", tableWidth, nEffCols ); for ( int i = 0; i < nEffCols; i++ ) { qDebug(" effcol %d is of type %d value %d, minWidth=%d, maxWidth=%d", - i, tqlayoutStruct[i].width.type(), tqlayoutStruct[i].width.value(), - tqlayoutStruct[i].minWidth, tqlayoutStruct[i].maxWidth ); + i, layoutStruct[i].width.type(), layoutStruct[i].width.value(), + layoutStruct[i].minWidth, layoutStruct[i].maxWidth ); qDebug(" effective: type %d value %d, minWidth=%d, maxWidth=%d", - tqlayoutStruct[i].effWidth.type(), tqlayoutStruct[i].effWidth.value(), - tqlayoutStruct[i].effMinWidth, tqlayoutStruct[i].effMaxWidth ); + layoutStruct[i].effWidth.type(), layoutStruct[i].effWidth.value(), + layoutStruct[i].effMinWidth, layoutStruct[i].effMaxWidth ); } #endif @@ -911,10 +911,10 @@ void AutoTableLayout::tqlayout() // fill up every cell with it's minWidth for ( int i = 0; i < nEffCols; i++ ) { - int w = tqlayoutStruct[i].effMinWidth; - tqlayoutStruct[i].calcWidth = w; + int w = layoutStruct[i].effMinWidth; + layoutStruct[i].calcWidth = w; available -= w; - Length& width = tqlayoutStruct[i].effWidth; + Length& width = layoutStruct[i].effWidth; switch( width.type()) { case Percent: havePercent = true; @@ -926,13 +926,13 @@ void AutoTableLayout::tqlayout() break; case Fixed: numFixed++; - totalFixed += tqlayoutStruct[i].effMaxWidth; + totalFixed += layoutStruct[i].effMaxWidth; // fall through break; case Variable: case Static: numVariable++; - totalVariable += tqlayoutStruct[i].effMaxWidth; + totalVariable += layoutStruct[i].effMaxWidth; allocVariable += w; } } @@ -940,25 +940,25 @@ void AutoTableLayout::tqlayout() // allocate width to percent cols if ( available > 0 && havePercent ) { for ( int i = 0; i < nEffCols; i++ ) { - const Length &width = tqlayoutStruct[i].effWidth; + const Length &width = layoutStruct[i].effWidth; if ( width.isPercent() ) { - int w = kMax ( int( tqlayoutStruct[i].effMinWidth ), width.minWidth( tableWidth ) ); - available += tqlayoutStruct[i].calcWidth - w; - tqlayoutStruct[i].calcWidth = w; + int w = kMax ( int( layoutStruct[i].effMinWidth ), width.minWidth( tableWidth ) ); + available += layoutStruct[i].calcWidth - w; + layoutStruct[i].calcWidth = w; } } if ( totalPercent > 100 ) { // remove overallocated space from the last columns int excess = tableWidth*(totalPercent-100)/100; for ( int i = nEffCols-1; i >= 0; i-- ) { - if ( tqlayoutStruct[i].effWidth.isPercent() ) { - int w = tqlayoutStruct[i].calcWidth; + if ( layoutStruct[i].effWidth.isPercent() ) { + int w = layoutStruct[i].calcWidth; int reduction = kMin( w, excess ); // the lines below might look inconsistent, but that's the way it's handled in mozilla excess -= reduction; - int newWidth = kMax( int (tqlayoutStruct[i].effMinWidth), w - reduction ); + int newWidth = kMax( int (layoutStruct[i].effMinWidth), w - reduction ); available += w - newWidth; - tqlayoutStruct[i].calcWidth = newWidth; + layoutStruct[i].calcWidth = newWidth; //qDebug("col %d: reducing to %d px (reduction=%d)", i, newWidth, reduction ); } } @@ -971,10 +971,10 @@ void AutoTableLayout::tqlayout() // then allocate width to fixed cols if ( available > 0 ) { for ( int i = 0; i < nEffCols; ++i ) { - const Length &width = tqlayoutStruct[i].effWidth; - if ( width.isFixed() && width.value() > tqlayoutStruct[i].calcWidth ) { - available += tqlayoutStruct[i].calcWidth - width.value(); - tqlayoutStruct[i].calcWidth = width.value(); + const Length &width = layoutStruct[i].effWidth; + if ( width.isFixed() && width.value() > layoutStruct[i].calcWidth ) { + available += layoutStruct[i].calcWidth - width.value(); + layoutStruct[i].calcWidth = width.value(); } } } @@ -985,12 +985,12 @@ void AutoTableLayout::tqlayout() // now satisfy relative if ( available > 0 ) { for ( int i = 0; i < nEffCols; i++ ) { - const Length &width = tqlayoutStruct[i].effWidth; + const Length &width = layoutStruct[i].effWidth; if ( width.isRelative() && width.value() ) { // width=0* gets effMinWidth. int w = width.value()*tableWidth/totalRelative; - available += tqlayoutStruct[i].calcWidth - w; - tqlayoutStruct[i].calcWidth = w; + available += layoutStruct[i].calcWidth - w; + layoutStruct[i].calcWidth = w; } } } @@ -1000,13 +1000,13 @@ void AutoTableLayout::tqlayout() available += allocVariable; // this gets redistributed //qDebug("redistributing %dpx to %d variable columns. totalVariable=%d", available, numVariable, totalVariable ); for ( int i = 0; i < nEffCols; i++ ) { - const Length &width = tqlayoutStruct[i].effWidth; + const Length &width = layoutStruct[i].effWidth; if ( width.isVariable() && totalVariable != 0 ) { - int w = kMax( int ( tqlayoutStruct[i].calcWidth ), - available * tqlayoutStruct[i].effMaxWidth / totalVariable ); + int w = kMax( int ( layoutStruct[i].calcWidth ), + available * layoutStruct[i].effMaxWidth / totalVariable ); available -= w; - totalVariable -= tqlayoutStruct[i].effMaxWidth; - tqlayoutStruct[i].calcWidth = w; + totalVariable -= layoutStruct[i].effMaxWidth; + layoutStruct[i].calcWidth = w; } } } @@ -1018,12 +1018,12 @@ void AutoTableLayout::tqlayout() if ( available > 0 && numFixed) { // still have some width to spread, distribute to fixed columns for ( int i = 0; i < nEffCols; i++ ) { - const Length &width = tqlayoutStruct[i].effWidth; + const Length &width = layoutStruct[i].effWidth; if ( width.isFixed() ) { - int w = available * tqlayoutStruct[i].effMaxWidth / totalFixed; + int w = available * layoutStruct[i].effMaxWidth / totalFixed; available -= w; - totalFixed -= tqlayoutStruct[i].effMaxWidth; - tqlayoutStruct[i].calcWidth += w; + totalFixed -= layoutStruct[i].effMaxWidth; + layoutStruct[i].calcWidth += w; } } } @@ -1036,12 +1036,12 @@ void AutoTableLayout::tqlayout() if ( available > 0 && hasPercent && totalPercent < 100) { // still have some width to spread, distribute weighted to percent columns for ( int i = 0; i < nEffCols; i++ ) { - const Length &width = tqlayoutStruct[i].effWidth; + const Length &width = layoutStruct[i].effWidth; if ( width.isPercent() ) { int w = available * width.value() / totalPercent; available -= w; totalPercent -= width.value(); - tqlayoutStruct[i].calcWidth += w; + layoutStruct[i].calcWidth += w; if (!available || !totalPercent) break; } } @@ -1060,7 +1060,7 @@ void AutoTableLayout::tqlayout() int w = available / total; available -= w; total--; - tqlayoutStruct[i].calcWidth += w; + layoutStruct[i].calcWidth += w; } } @@ -1079,17 +1079,17 @@ void AutoTableLayout::tqlayout() if (available < 0) { int mw = 0; for ( int i = nEffCols-1; i >= 0; i-- ) { - Length &width = tqlayoutStruct[i].effWidth; + Length &width = layoutStruct[i].effWidth; if (width.isVariable()) - mw += tqlayoutStruct[i].calcWidth - tqlayoutStruct[i].effMinWidth; + mw += layoutStruct[i].calcWidth - layoutStruct[i].effMinWidth; } for ( int i = nEffCols-1; i >= 0 && mw > 0; i-- ) { - Length &width = tqlayoutStruct[i].effWidth; + Length &width = layoutStruct[i].effWidth; if (width.isVariable()) { - int minMaxDiff = tqlayoutStruct[i].calcWidth-tqlayoutStruct[i].effMinWidth; + int minMaxDiff = layoutStruct[i].calcWidth-layoutStruct[i].effMinWidth; int reduce = available * minMaxDiff / mw; - tqlayoutStruct[i].calcWidth += reduce; + layoutStruct[i].calcWidth += reduce; available -= reduce; mw -= minMaxDiff; if ( available >= 0 ) @@ -1101,17 +1101,17 @@ void AutoTableLayout::tqlayout() if (available < 0) { int mw = 0; for ( int i = nEffCols-1; i >= 0; i-- ) { - Length &width = tqlayoutStruct[i].effWidth; + Length &width = layoutStruct[i].effWidth; if (width.isRelative()) - mw += tqlayoutStruct[i].calcWidth - tqlayoutStruct[i].effMinWidth; + mw += layoutStruct[i].calcWidth - layoutStruct[i].effMinWidth; } for ( int i = nEffCols-1; i >= 0 && mw > 0; i-- ) { - Length &width = tqlayoutStruct[i].effWidth; + Length &width = layoutStruct[i].effWidth; if (width.isRelative()) { - int minMaxDiff = tqlayoutStruct[i].calcWidth-tqlayoutStruct[i].effMinWidth; + int minMaxDiff = layoutStruct[i].calcWidth-layoutStruct[i].effMinWidth; int reduce = available * minMaxDiff / mw; - tqlayoutStruct[i].calcWidth += reduce; + layoutStruct[i].calcWidth += reduce; available -= reduce; mw -= minMaxDiff; if ( available >= 0 ) @@ -1123,17 +1123,17 @@ void AutoTableLayout::tqlayout() if (available < 0) { int mw = 0; for ( int i = nEffCols-1; i >= 0; i-- ) { - Length &width = tqlayoutStruct[i].effWidth; + Length &width = layoutStruct[i].effWidth; if (width.isFixed()) - mw += tqlayoutStruct[i].calcWidth - tqlayoutStruct[i].effMinWidth; + mw += layoutStruct[i].calcWidth - layoutStruct[i].effMinWidth; } for ( int i = nEffCols-1; i >= 0 && mw > 0; i-- ) { - Length &width = tqlayoutStruct[i].effWidth; + Length &width = layoutStruct[i].effWidth; if (width.isFixed()) { - int minMaxDiff = tqlayoutStruct[i].calcWidth-tqlayoutStruct[i].effMinWidth; + int minMaxDiff = layoutStruct[i].calcWidth-layoutStruct[i].effMinWidth; int reduce = available * minMaxDiff / mw; - tqlayoutStruct[i].calcWidth += reduce; + layoutStruct[i].calcWidth += reduce; available -= reduce; mw -= minMaxDiff; if ( available >= 0 ) @@ -1145,17 +1145,17 @@ void AutoTableLayout::tqlayout() if (available < 0) { int mw = 0; for ( int i = nEffCols-1; i >= 0; i-- ) { - Length &width = tqlayoutStruct[i].effWidth; + Length &width = layoutStruct[i].effWidth; if (width.isPercent()) - mw += tqlayoutStruct[i].calcWidth - tqlayoutStruct[i].effMinWidth; + mw += layoutStruct[i].calcWidth - layoutStruct[i].effMinWidth; } for ( int i = nEffCols-1; i >= 0 && mw > 0; i-- ) { - Length &width = tqlayoutStruct[i].effWidth; + Length &width = layoutStruct[i].effWidth; if (width.isPercent()) { - int minMaxDiff = tqlayoutStruct[i].calcWidth-tqlayoutStruct[i].effMinWidth; + int minMaxDiff = layoutStruct[i].calcWidth-layoutStruct[i].effMinWidth; int reduce = available * minMaxDiff / mw; - tqlayoutStruct[i].calcWidth += reduce; + layoutStruct[i].calcWidth += reduce; available -= reduce; mw -= minMaxDiff; if ( available >= 0 ) @@ -1170,10 +1170,10 @@ void AutoTableLayout::tqlayout() int pos = 0; for ( int i = 0; i < nEffCols; i++ ) { #ifdef DEBUG_LAYOUT - qDebug("col %d: %d (width %d)", i, pos, tqlayoutStruct[i].calcWidth ); + qDebug("col %d: %d (width %d)", i, pos, layoutStruct[i].calcWidth ); #endif table->columnPos[i] = pos; - pos += tqlayoutStruct[i].calcWidth + table->borderHSpacing(); + pos += layoutStruct[i].calcWidth + table->borderHSpacing(); } table->columnPos[table->columnPos.size()-1] = pos; @@ -1183,9 +1183,9 @@ void AutoTableLayout::tqlayout() void AutoTableLayout::calcPercentages() const { total_percent = 0; - for ( unsigned int i = 0; i < tqlayoutStruct.size(); i++ ) { - if ( tqlayoutStruct[i].width.isPercent() ) - total_percent += tqlayoutStruct[i].width.value(); + for ( unsigned int i = 0; i < layoutStruct.size(); i++ ) { + if ( layoutStruct[i].width.isPercent() ) + total_percent += layoutStruct[i].width.value(); } percentagesDirty = false; } diff --git a/khtml/rendering/table_layout.h b/khtml/rendering/table_layout.h index 1a8b2da53..cbaf6d3a7 100644 --- a/khtml/rendering/table_layout.h +++ b/khtml/rendering/table_layout.h @@ -40,7 +40,7 @@ public: virtual ~TableLayout() {} virtual void calcMinMaxWidth() = 0; - virtual void tqlayout() = 0; + virtual void layout() = 0; protected: RenderTable *table; @@ -55,7 +55,7 @@ public: ~FixedTableLayout(); void calcMinMaxWidth(); - void tqlayout(); + void layout(); protected: int calcWidthArray(); @@ -72,7 +72,7 @@ public: ~AutoTableLayout(); void calcMinMaxWidth(); - void tqlayout(); + void layout(); protected: @@ -100,7 +100,7 @@ protected: short calcWidth; }; - TQMemArray<Layout> tqlayoutStruct; + TQMemArray<Layout> layoutStruct; TQMemArray<RenderTableCell *>spanCells; bool hasPercent : 1; mutable bool percentagesDirty : 1; diff --git a/khtml/rendering/table_layout.txt b/khtml/rendering/table_layout.txt index 770dba06f..14a74bd1e 100644 --- a/khtml/rendering/table_layout.txt +++ b/khtml/rendering/table_layout.txt @@ -1,14 +1,14 @@ -CSS describes two ways of tqlayouting tables. Auto tqlayout (the NS4 -compliant HTML table tqlayout) and fixed tqlayout. The fixed tqlayout +CSS describes two ways of layouting tables. Auto layout (the NS4 +compliant HTML table layout) and fixed layout. The fixed layout strategy is described in detail in the CSS specs and will not be repeated here. -Due to the fact that two tqlayout strategies exist, it is rather natural -to encapsulate the tqlayouting process in a TableLayout class. Two types +Due to the fact that two layout strategies exist, it is rather natural +to encapsulate the layouting process in a TableLayout class. Two types (FixedTableLayout and AutoTableLayout) exist. AutoTableLayout is the default and also need a quirks flags for NS compatibility mode. FixedTableLayout will be used if a style rule sets the -table-tqlayout property to fixed. +table-layout property to fixed. The grid of table cells is stored in each table section, as spans can't pass section borders. Changing the number of cols in the grid @@ -25,10 +25,10 @@ structure. -NS & Mozilla compliant table tqlayouting algorithm (AutoTableLayout) +NS & Mozilla compliant table layouting algorithm (AutoTableLayout) ------------------------------------------------------------------ -The table tqlayout algorithm computes a set of tqlayout hints from the +The table layout algorithm computes a set of layout hints from the informations in the table cells, <col> elements and style sheets. Hints from different sources are treated a bit differently in the collection stage. @@ -37,17 +37,17 @@ In addition certain operations are only done in quirks (NS4 compat) mode. Resizing the table doesn't require you to build up this information -again. All that is needed is a list of tqlayout hints for each column. +again. All that is needed is a list of layout hints for each column. The algorithm below describes to the best of our knowledge the way table alyouting is handled in a NS compatible way. There are two stages, the collection stage (assocaited with calcMinMaxWidth() in khtml) and the stage assigning width to cells -(associated with tqlayout()). +(associated with layout()). -A set of hinted widths are used to determine the final table tqlayout in -the tqlayouting stage. +A set of hinted widths are used to determine the final table layout in +the layouting stage. enum hintType { MinWidth, @@ -62,7 +62,7 @@ enum hintType { }; One width (in pixels) for each hintType describes how the column -wishes to be tqlayouted. The tqlayouting stage operates only on an array +wishes to be layouted. The layouting stage operates only on an array of hints for each column. An additional totalCellSpacing variable is used to know about the |