diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml')
243 files changed, 2764 insertions, 2764 deletions
diff --git a/khtml/ChangeLog b/khtml/ChangeLog index 31037ed20..8c7c88bb9 100644 --- a/khtml/ChangeLog +++ b/khtml/ChangeLog @@ -33,7 +33,7 @@ * ecma/kjs_window.cpp (executeOpenWindow): fixed location href and pathname for about:blank windows - * khtml_part.cpp (tqfindFrameParent): made frame name lookup locale + * khtml_part.cpp (findFrameParent): made frame name lookup locale independant. Was mostly problematic with non-ascii names. * html/html_formimpl.cpp (gatherWalletData): prevent crash occuring @@ -79,16 +79,16 @@ . Correct drawing of borders on iframes and objects (#118277/#56109) . Frameborder attribute for iframes (http://www.w3.org/TR/html401/present/frames.html#adef-frameborder) - . Fix widget counter-tqmask not being updated in time, thus sometimes missing a tqrepaint (e.g: http://lequipe.fr) + . Fix widget counter-mask not being updated in time, thus sometimes missing a repaint (e.g: http://lequipe.fr) * html/html_baseimpl.{h,cpp} (HTMLIFrameElementImpl::parseAttribute): parse frameborder attribute. Defaults to true as per specification. (HTMLIFrameElementImpl::updateFrame/attach): apply/remove frameborder style at attachment time. - * khtmlview.cpp (drawContents): fix counter-tqmask problem. Widget tqgeometry is not accurate before painting, so we must + * khtmlview.cpp (drawContents): fix counter-mask problem. Widget geometry is not accurate before painting, so we must use the RenderObject's. * rendering/render_frames.h (paddingTop/paddingBottom/paddingLeft/paddingRight): reimplement. Frames have no padding. (RenderPartObject::canHaveBorder): reimplement. True. - * rendering/render_object.cpp (RenderObject::updateWidgetMasks): clip tqmask to correct width/height, though it doesn't matter much on X11. - * rendering/render_tqreplaced.h (RenderWidget::borderTop/borderBottom/borderLeft/borderRight): percolated down from RenderForm. + * rendering/render_object.cpp (RenderObject::updateWidgetMasks): clip mask to correct width/height, though it doesn't matter much on X11. + * rendering/render_replaced.h (RenderWidget::borderTop/borderBottom/borderLeft/borderRight): percolated down from RenderForm. Frames/Iframes also need that reimplementation. 2006-06-22 Germain Garand <germain@ebooksfrance.org> @@ -96,7 +96,7 @@ Implement floating auto-width table quirk * rendering/render_block.cpp (positionNewFloats): in quirkmode, floated auto-width - tables try to fit within remaining linewidth, so look for minWidth, and retqlayout if + tables try to fit within remaining linewidth, so look for minWidth, and relayout if position found ends up being narrower than current table width. 2006-06-20 Germain Garand <germain@ebooksfrance.org> @@ -106,7 +106,7 @@ * rendering/render_block.cpp (calcInlineMinMaxWidth/calcBlockMinMaxWidth): lazzily check available width so floats don't overflow it if they can break line. * rendering/render_box.{h,cpp} (availableWidth{,Using}): new. Like availableHeight{,Using} - * rendering/render_canvas.cpp (RenderCanvas::tqlayout): set m_viewportWidth before recalculating minmax, as + * rendering/render_canvas.cpp (RenderCanvas::layout): set m_viewportWidth before recalculating minmax, as availableWidth needs it. 2006-06-15 Allan Sandfeld Jensen <kde@carewolf.com> @@ -124,7 +124,7 @@ 2006-06-14 Allan Sandfeld Jensen <kde@carewolf.com> - Implement tqreplaced CSS(3) content, and fix various details in generated pseudo elements for CSS 2.1 + Implement replaced CSS(3) content, and fix various details in generated pseudo elements for CSS 2.1 * rendering/render_style.{h,cpp}: Add REPLACED and MARKER pseudo styles * rendering/render_container.{h,cpp}: @@ -138,7 +138,7 @@ * rendering/render_generated.{h,cpp}: Add new class RenderGlyph to render list-style glyphs (square, disc, etc.) * xml/dom_nodeimpl.cpp: (NodeImpl::diff) detect changes in content and return Detach - * css/css_base.{h,cpp}: Add marker and tqreplaced pseudo-styles + * css/css_base.{h,cpp}: Add marker and replaced pseudo-styles * css/cssstyleselector.cpp: (checkOneSelector) Allow content on more elements (precomputeAttributeDependencies) Track attributes inside :not elements as well @@ -158,7 +158,7 @@ (RenderBox::calcAbsoluteHorizontalValues): (RenderBox::calcAbsoluteVertical): (RenderBox::calcAbsoluteVerticalValues): - (RenderBox::calcAbsoluteHorizontalReplaced): Handle tqreplaced case separately. + (RenderBox::calcAbsoluteHorizontalReplaced): Handle replaced case separately. (RenderBox::calcAbsoluteVerticalReplaced): ditto. 2006-04-20 Allan Sandfeld Jensen <kde@carewolf.com> @@ -209,7 +209,7 @@ * misc/stringit.h (TokenizerQueue): a LIFO stack of TokenizerStrings * html/htmltokenizer.{h,cpp} (scriptHandler/write/notifyFinished): use a TokenizerQueue to store postponed fragments while executing/loading scripts. - (fixUpChar): unrelated - fill in missing tqunicode tqreplacements. + (fixUpChar): unrelated - fill in missing unicode replacements. 2006-03-20 Dirk Mueller <mueller@kde.org> @@ -225,27 +225,27 @@ 2006-03-07 Germain Garand <germain@ebooksfrance.org> - Scope: retqlayout/tqrepaint/widget tqmasks fixes. Refine stacking context exploration. Optimise. + Scope: relayout/repaint/widget masks fixes. Refine stacking context exploration. Optimise. - * khtmlview.cpp (drawContents): use widget tqgeometry rather than the RenderWidget's rect (fixes widget borders not being updated) + * khtmlview.cpp (drawContents): use widget geometry rather than the RenderWidget's rect (fixes widget borders not being updated) Check if widget is in the dirty rect before doing any work. - * rendering/render_block.cpp (tqlayoutBlockChildren): I meant !child->isPositioned() here, not isPositioned(). No need to - dirty positioned children as this is handled by the containing block chain through tqlayoutPositionedObjects - (tqlayoutPositionedObjects): always retqlayout fixed objects. + * rendering/render_block.cpp (layoutBlockChildren): I meant !child->isPositioned() here, not isPositioned(). No need to + dirty positioned children as this is handled by the containing block chain through layoutPositionedObjects + (layoutPositionedObjects): always relayout fixed objects. - * rendering/render_canvas.cpp (tqlayout): check canvas dimensions and call tqlayoutBlock directly with retqlayoutChildren boolean. + * rendering/render_canvas.cpp (layout): check canvas dimensions and call layoutBlock directly with relayoutChildren boolean. - * rendering/render_layer.{h,cpp} (paintedRegion): constrain our tqshape to the visibleRect. Use convertToLayerCoords to get a correct - visibleFlowRegion (updateWidgetMasks): don't forget to update the tqmask if it reverts to none at all. + * rendering/render_layer.{h,cpp} (paintedRegion): constrain our shape to the visibleRect. Use convertToLayerCoords to get a correct + visibleFlowRegion (updateWidgetMasks): don't forget to update the mask if it reverts to none at all. * rendering/render_object.{h,cpp} (containingBlock): for relpos inlines, return the nearest block (skipping to next containingBlock gives - stalled tqlayout flags problems - #121653). (updateWidgetMasks): tqmask the content box, not the border box. + stalled layout flags problems - #121653). (updateWidgetMasks): mask the content box, not the border box. (enclosingStackingContext) new. Returns the layer defining current stacking context. - * rendering/render_tqreplaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets. - (detach/resizeWidget/setQWidget/tqlayout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's - Only allow !khtml widgets to register in the view (only those need tqmasking). + * rendering/render_replaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets. + (detach/resizeWidget/setQWidget/layout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's + Only allow !khtml widgets to register in the view (only those need masking). 2006-03-05 Charles Samuels <charles@kde.org> * link not accessable with negative text-indent (#96275) @@ -259,20 +259,20 @@ get iframes, objects and some other overlaid widgets to obey their stacking context (#31121) - * khtmlview.cpp: tqmask widgets more precisely (i.e. allow layers to paint over overlaid widgets, + * khtmlview.cpp: mask widgets more precisely (i.e. allow layers to paint over overlaid widgets, when they ought to). - * rendering/render_canvas.{cpp,h}: update widget tqmasks after pos child tqlayout/positioning; + * rendering/render_canvas.{cpp,h}: update widget masks after pos child layout/positioning; set a boolean m_needsWidgetMasks to optimise for common case (where we have no such widgets). - * rendering/render_layer.{cpp,h} (updateWidgetMasks/paintedRegion): build a rough tqmask for the positive Z order - childs. We'll apply that tqmask later to widgets that are under our aegis. + * rendering/render_layer.{cpp,h} (updateWidgetMasks/paintedRegion): build a rough mask for the positive Z order + childs. We'll apply that mask later to widgets that are under our aegis. - * rendering/render_object.{cpp,h} (visibleFlowRegion): helper for calculation of broad region we want to tqmask in flows. - (updateWidgetMasks): walk our children looking for widgets suitable to tqmasking. Apply our enclosingLayer's tqmask, + * rendering/render_object.{cpp,h} (visibleFlowRegion): helper for calculation of broad region we want to mask in flows. + (updateWidgetMasks): walk our children looking for widgets suitable to masking. Apply our enclosingLayer's mask, transformis transformandi. - * rendering/render_tqreplaced.cpp: overlaid widgets must advertise their existence to the enclosing layer. + * rendering/render_replaced.cpp: overlaid widgets must advertise their existence to the enclosing layer. 2006-03-01 Germain Garand <germain@ebooksfrance.org> @@ -295,11 +295,11 @@ 2006-02-28 Germain Garand <germain@ebooksfrance.org> - * rendering/render_block.cpp (tqlayoutBlockChildren): be more efficient with regard to positioned objects retqlayout. + * rendering/render_block.cpp (layoutBlockChildren): be more efficient with regard to positioned objects relayout. Merge WC margin-collapse regression fix (WC/#3508). - (tqlayoutPositionedObjects) Objects with staticX() need a retqlayout too. - * rendering/render_canvas.cpp (tqlayout): no need to retqlayout positioned objects here. This would mark entire branches of the tree - as needing a tqlayout, thus stalling update requests in those branches (#116626) + (layoutPositionedObjects) Objects with staticX() need a relayout too. + * rendering/render_canvas.cpp (layout): no need to relayout positioned objects here. This would mark entire branches of the tree + as needing a layout, thus stalling update requests in those branches (#116626) 2006-01-14 Allan Sandfeld Jensen <kde@carewolf.com> @@ -313,14 +313,14 @@ 2005-12-09 Germain Garand <germain@ebooksfrance.org> - implement quirky HTML tqalignment ; introduce special float values + implement quirky HTML alignment ; introduce special float values -khtml-left/-khtml-right to this effect. * css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also. * css/cssstyleselector.cpp: ditto. * css/html4.css: set as default style for table[align="left/right"] * html/html_tableimpl.cpp (parseAttribute): remove setting of float property - * rendering/render_block{h,cpp}: quirky HTML tqalignment never clears, and never cause fafs to clear. + * rendering/render_block{h,cpp}: quirky HTML alignment never clears, and never cause fafs to clear. Only examine the last floating object on line, so as to match MSIE behaviour. * rendering/render_style.h: extra float enumeration values * css/css_renderstyledeclarationimpl.cpp (getPropertyCSSValue): adjust @@ -345,19 +345,19 @@ * rendering/render_table.{cpp,h}: had member booleans to hold whether flexing of cells in a row is - needed, and in the affirmative, whether we need to mark our anonymous childs for retqlayout (hence go one level deeper). + needed, and in the affirmative, whether we need to mark our anonymous childs for relayout (hence go one level deeper). Part of line 1394 comes from WebCore. - Also: don't allow negative offset in vertical tqalignment when content overflows ; matches MSIE better. + Also: don't allow negative offset in vertical alignment when content overflows ; matches MSIE better. 2005-10-28 Germain Garand <germain@ebooksfrance.org> - * rendering/table_tqlayout.cpp (calcEffectiveWidth): do proportional distribution of overflowing minwidth + * rendering/table_layout.cpp (calcEffectiveWidth): do proportional distribution of overflowing minwidth when all cols are percent (#104156) 2005-10-21 Germain Garand <germain@ebooksfrance.org> - * rendering/bidi.cpp (tqfindNextLineBreak): implement needed quirk for line breaking of - tqreplaced elements within table cells. + * rendering/bidi.cpp (findNextLineBreak): implement needed quirk for line breaking of + replaced elements within table cells. * rendering/render_block.cpp (calcInlineMinMaxWidth): ditto. Bugs #93745, #72457 @@ -397,7 +397,7 @@ Port soft-hyphen support from WebCore - * rendering/bidi.cpp (tqfindNextLineBreak): main skipping/breaking logic + * rendering/bidi.cpp (findNextLineBreak): main skipping/breaking logic * rendering/render_text.{cpp,h} (calcMinMaxWidth): account for soft hyphen @@ -416,7 +416,7 @@ 2005-10-07 Germain Garand <germain@ebooksfrance.org> - * rendering/bidi.cpp (tqfindNextLineBreak): integrate all positioned inlines in the lineboxes to get a correct static position + * rendering/bidi.cpp (findNextLineBreak): integrate all positioned inlines in the lineboxes to get a correct static position in initial whitespace. Use some midpoints voodoo to take care of whitespace. cf. unsorted/113527.html @@ -442,7 +442,7 @@ Implementation of real page-breaking algorithm respecting the CSS 2.1 specification. * khtmlview.cpp: - Do tqlayout for page-breaks before printing. + Do layout for page-breaks before printing. Use screen resolution as default instead of 72DPI. * css/html4.css: Add the print media default styles * rendering/render_style.*: Add RenderPageStyle as the style for the page-context. Not yet used. @@ -454,12 +454,12 @@ (deleteLastLineBox) new function to remove the last line (in order to redo it). * rendering/render_line.*: (removeFromLine) ditto - * rendering/bidi.cpp: New algorithm in tqlayoutInlineChildren for doing page-breaks at tqlayout-time, + * rendering/bidi.cpp: New algorithm in layoutInlineChildren for doing page-breaks at layout-time, and respecting orphans/widows CSS settings. * rendering/render_block.cpp: (makePageBreakAvoidBlocks) Function for collecting runs of page-break-after/before: avoid blocks, so they can be moved across page-breaks collectively. - (tqlayoutBlockChildren) New algorithm for doing page-breaks at tqlayout time, + (layoutBlockChildren) New algorithm for doing page-breaks at layout time, and respecting page-break-after/before/inside * rendering/render_table.cpp: Force page-breaks to happen inside cells and not between rows. (RenderTableSection::addSpaceAt) moves later table-rows down when one cell expands to handle a @@ -494,7 +494,7 @@ 2005-08-02 Allan Sandfeld Jensen <kde@carewolf.com> - * rendering/render_block.{h,cpp}: Split tqlayoutBlockChildren into several auxilary functions. + * rendering/render_block.{h,cpp}: Split layoutBlockChildren into several auxilary functions. 2005-07-26 Andreas Kling <kling@impul.se> @@ -507,7 +507,7 @@ 2005-07-25 Andreas Kling <kling@impul.se> Make new ad filters have instant effect (either hide affected elements - tqreplace them with the "blocked" pixmap.) + replace them with the "blocked" pixmap.) * khtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration() * khtml_ext.cpp: Call KHTMLPart::reparseConfiguration() after adding new filters. @@ -535,7 +535,7 @@ vertical-align fixes * rendering/render_object.cpp (getVerticalPosition): block level - elements must ignore vertical tqalignment (#92118). For Length values, check the parent + elements must ignore vertical alignment (#92118). For Length values, check the parent too. Don't use the parent's position if it's top/bottom - it's waiting for our subtree's to complete! (cf. css/vertical-align.html) @@ -721,7 +721,7 @@ * khtmlview.cpp (dispatchKeyEvent): Don't send DOM keypress if the DOM keydown that precedes it was blocked by javascript, as in IE. - * rendering/render_tqreplaced.cpp (handleEvent): send Qt::KeyPress to the + * rendering/render_replaced.cpp (handleEvent): send Qt::KeyPress to the widget for DOM keypress and not DOM keydown to allow sites to block a key with onkeypress, #99749. @@ -753,7 +753,7 @@ * khtml_popupmenu.rc: ditto * khtml_settings.{cc,h}: Add adFilter settings and helper functions * html/htmlparser.cpp: Strip blocked IMG tags - * misc/loader.{cpp,h}: Return tqreplacement blocked images and refuse to load blocked scripts. + * misc/loader.{cpp,h}: Return replacement blocked images and refuse to load blocked scripts. * misc/blocked_icon.{cpp,png}: Image for above * xml/dom_docimpl.cpp: isURLAllowed returns false for blocked URL's @@ -780,7 +780,7 @@ - Make sure percentage min-height goes to 0 and not auto when the percentage does not apply. * renderer/render_table.cpp: - Make sure empty tables honor CSS-specified height in strict mode. - - Fix baseline tqalignment within table cells to use the bottom of empty blocks. + - Fix baseline alignment within table cells to use the bottom of empty blocks. 2005-04-30 Harri Porten <porten@kde.org> @@ -810,10 +810,10 @@ 2005-04-06 Lubos Lunak <l.lunak@kde.org> - * khtmlview.{h,cpp}: Use KActions for type ahead tqfind. + * khtmlview.{h,cpp}: Use KActions for type ahead find. * khtml_part.{h,cpp}: ditto. * khtml_part.{h,cpp}: Add Find Previous action. - * khtml_part.cpp (tqfindTextNext): Fix changing direction while searching text. + * khtml_part.cpp (findTextNext): Fix changing direction while searching text. 2005-04-05 Lubos Lunak <l.lunak@kde.org> @@ -821,7 +821,7 @@ 2005-04-04 Lubos Lunak <l.lunak@kde.org> - * khtmlview.cpp: Don't use keyboard grab for type-ahead tqfind. + * khtmlview.cpp: Don't use keyboard grab for type-ahead find. 2005-04-03 Allan Sandfeld Jensen <kde@carewolf.com> @@ -839,15 +839,15 @@ * ecma/kjs_dom.cpp (putValueProperty): scrollLeft/scrollTop need an up-to-date rendering. - * rendering/render_box.cpp (tqrepaintRectangle): apply scroll offset - to the tqrepaint rectangle (overflow != visible objects). + * rendering/render_box.cpp (repaintRectangle): apply scroll offset + to the repaint rectangle (overflow != visible objects). - * rendering/render_layer.{h,cpp} (tqrepaint): rename markForRepaint to - less equivocal tqrepaint. + * rendering/render_layer.{h,cpp} (repaint): rename markForRepaint to + less equivocal repaint. (updateLayerPositions): small fixes. (scrollToOffset): update our child layers (#102235) - * rendering/render_object.cpp (setStyle/tqrepaintDuringLayout): rename ditto. + * rendering/render_object.cpp (setStyle/repaintDuringLayout): rename ditto. 2005-03-29 Germain Garand <germain@ebooksfrance.org> @@ -906,7 +906,7 @@ 2005-03-17 Leo Savernik <l.savernik@aon.at> - * rendering/render_flow.cpp (tqrepaint): Calculate height, do not simply + * rendering/render_flow.cpp (repaint): Calculate height, do not simply use the bottom overflow of the root line box. 2005-03-16 George Staikos <staikos@kde.org> @@ -941,7 +941,7 @@ 2005-03-04 Germain Garand <germain@ebooksfrance.org> - * rendering/render_block.cpp (tqlayoutBlockChildren): percent width + * rendering/render_block.cpp (layoutBlockChildren): percent width children behaves like fixed width children with regard to float clearing. In both cases we need to check if current line as enough width to hold the (flowing-around-float) child. If not, we need to clear. @@ -980,7 +980,7 @@ 2005-02-28 David Faure <faure@kde.org> * html/html_formimpl.cpp (setName): Also set ATTR_NAME so that - form.foo tqfinds the input element. Testcase forms/input_setName.html. + form.foo finds the input element. Testcase forms/input_setName.html. 2005-02-27 Leo Savernik <l.savernik@aon.at> @@ -1002,14 +1002,14 @@ needs to use QWidget::focusNextPrevChild. (defaultEventHandler): only handle key tab if it wasn't accepted by the widget (#58247) - * rendering/render_tqreplaced.cpp (RenderWidget::handleEvent): return + * rendering/render_replaced.cpp (RenderWidget::handleEvent): return something meaningful. 2005-02-18 Germain Garand <germain@ebooksfrance.org> - scope: table percentage height, tqreplaced element height calculation. + scope: table percentage height, replaced element height calculation. - * rendering/render_body.cpp (tqlayout): pre-calculate our margins in + * rendering/render_body.cpp (layout): pre-calculate our margins in quirk mode, to be able to compute calcPercentageHeight in a const way. * rendering/render_box.{h,cpp} @@ -1020,7 +1020,7 @@ Looking for available height is an IE quirk and is thusly only done in quirk mode now. When it is not computable, it behaves like 'auto', so use the intrinsicHeight (cf.10.6.2). - * rendering/render_table.cpp (tqlayoutRows): fix vertical tqalignment within + * rendering/render_table.cpp (layoutRows): fix vertical alignment within percentage driven cells. Subtract the cell's PB from cellPercentageHeight. 2005-02-18 Leo Savernik <l.savernik@aon.at> @@ -1066,14 +1066,14 @@ * rendering/counter_tree.{h,cpp}: Adds a dynamic counter-tree to keep counter values up-to-date * rendering/render_generated.{h,cpp}: New renderCounter class to renders counters as text * rendering/render_container.cpp: Content now only inherits style from the pseudo-container rather than use an exact duplicate. - * rendering/render_object.cpp: Add new functions to tqfind and attach counter-tree nodes. + * rendering/render_object.cpp: Add new functions to find and attach counter-tree nodes. * rendering/render_style.cpp: New counter content and counter acts * rendering/render_list.cpp: Use the new counters to count lists 2005-02-14 Leo Savernik <l.savernik@aon.at> - * rendering/render_flow.cpp (tqrepaint): Only include top and bottom - overflow while not retqlayouting, otherwise root inline box may not be + * rendering/render_flow.cpp (repaint): Only include top and bottom + overflow while not relayouting, otherwise root inline box may not be available yet. 2005-02-14 David Faure <faure@kde.org> @@ -1087,15 +1087,15 @@ * rendering/render_block.{cpp,h} (paintObject): Added parameter to only paint the block's outline on demand. - * rendering/render_flow.cpp (tqrepaint): Fix tqrepaint rectangle to also + * rendering/render_flow.cpp (repaint): Fix repaint rectangle to also encompass the top and bottom overflow of the root inline box. * rendering/render_line.{cpp,h} (InlineBox::root): Ported over from WebCore. Returns the root inline box of this box. - * rendering/render_table.{cpp,h} (RenderTableCell::tqrepaintRectangle): + * rendering/render_table.{cpp,h} (RenderTableCell::repaintRectangle): Use full height of table cell, otherwise outline won't be fully - tqrepainted. + repainted. (RenderTableCell::paint): Paint outline of table cells explicitly, and keep the underlying render block from painting it itself. (RenderTableCell::paintObject): Removed. Nowhere used anymore. @@ -1144,7 +1144,7 @@ the according RenderTableRows, and call their paintRow routine. Fixed overflow size of damage rectangle. (RenderTableRow::paintRow): Added. Can't use paint() because - RenderTableRow is not a RenderBox, and hence doesn't store tqlayout + RenderTableRow is not a RenderBox, and hence doesn't store layout information. (RenderTableCell::paint): Added painting of the table cell's outline herein instead in RenderBlock to encompass the extra table cell top @@ -1157,7 +1157,7 @@ Blockquote and DL don't by any stretch of the mind, so clear this property for those. Also, don't center fieldset. - * rendering/render_block.cpp (tqlayoutBlock): make flowAroundFloats encompass their own floats + * rendering/render_block.cpp (layoutBlock): make flowAroundFloats encompass their own floats (#85984). 2005-02-02 Leo Savernik <l.savernik@aon.at> @@ -1200,7 +1200,7 @@ 2005-01-25 Germain Garand <germain@ebooksfrance.org> - * khtmlview.cpp (viewportWheelEvent): discard wheel events occuring before the first retqlayout (avoids blanking the view). + * khtmlview.cpp (viewportWheelEvent): discard wheel events occuring before the first relayout (avoids blanking the view). Also support Horizontal wheel events (needs qt-copy/patch #61). 2005-01-25 Germain Garand <germain@ebooksfrance.org> @@ -1219,7 +1219,7 @@ 2005-01-12 Allan Sandfeld Jensen <kde@carewolf.com> - * css/cssstyleselector.cpp: Match :tqcontains() against innerText on HTMLElements + * css/cssstyleselector.cpp: Match :contains() against innerText on HTMLElements 2005-01-11 Leo Savernik <l.savernik@aon.at> @@ -1304,39 +1304,39 @@ 2004-12-12 Germain Garand <germain@ebooksfrance.org> - Pragmatic incremental tqrepaints: be accurate on layered objects, conservative on - objects in normal flow. Fix performance issues on repeated retqlayouts (#53114) + Pragmatic incremental repaints: be accurate on layered objects, conservative on + objects in normal flow. Fix performance issues on repeated relayouts (#53114) * khtmlview.{cpp,h}: add needsFullRepaint flag, mostly similar to WebCore's. - (tqlayout): don't tqrepaint the canvas systematically anymore. + (layout): don't repaint the canvas systematically anymore. - * rendering/bidi.cpp (tqlayoutInlineChildren): schedule a tqrepaint on + * rendering/bidi.cpp (layoutInlineChildren): schedule a repaint on old rectangle and future rectangle, if marked dirty. - * rendering/render_block.cpp (tqlayoutBlock/tqlayoutBlockChildren/tqlayoutPositionedObjects): ditto. + * rendering/render_block.cpp (layoutBlock/layoutBlockChildren/layoutPositionedObjects): ditto. - * rendering/render_table.cpp (tqlayout): ditto. + * rendering/render_table.cpp (layout): ditto. * rendering/render_box.cpp (calcAbsoluteHorizontal): no more updateLayerPosition() here. Layers positioning now happen in a separate pass. * rendering/render_canvas.{cpp,h} - (needsFullRepaint): new - used to determine if we need to do incremental tqrepaint at all. Don't waste time if the whole canvas is dirty. - (tqrepaintViewRectangle): new - schedule a tqrepaint in absolute coordinates. - (deferredRepaint): new - append argument to a list of objects needing a post-tqlayout tqrepaint. - (scheduleDeferredRepaints): new - tqrepaint all objects in list described above, at the end of tqlayout. + (needsFullRepaint): new - used to determine if we need to do incremental repaint at all. Don't waste time if the whole canvas is dirty. + (repaintViewRectangle): new - schedule a repaint in absolute coordinates. + (deferredRepaint): new - append argument to a list of objects needing a post-layout repaint. + (scheduleDeferredRepaints): new - repaint all objects in list described above, at the end of layout. - * rendering/render_layer.{cpp,h} (markForRepaint): new - schedule a tqrepaint of a layer, calculating its visible rectangle, - and optionnally marking it as needing a post-tqlayout tqrepaint. + * rendering/render_layer.{cpp,h} (markForRepaint): new - schedule a repaint of a layer, calculating its visible rectangle, + and optionnally marking it as needing a post-layout repaint. (updateLayerPositions): merged++ from WebCore. Position layers. Repaint layers marked by the above. (calculateClipRects/calculateRects): no more updateLayerPosition call there. * rendering/render_object.cpp - (setNeedsLayout): when marking for tqlayout, also mark the formatting context for tqrepaint (m_markedForRepaint boolean) + (setNeedsLayout): when marking for layout, also mark the formatting context for repaint (m_markedForRepaint boolean) (setChildNeedsLayout): merge WebCore guard against multiple dirtying. (setStyle): based on the Style diff, decide whether to dirty only the current formatting context, or also the parent's. (dirtyFormattingContext): new. - (tqrepaintDuringLayout): new - schedule a pre/post-tqlayout tqrepaint on the object, if it makes sense. + (repaintDuringLayout): new - schedule a pre/post-layout repaint on the object, if it makes sense. 2004-12-12 Germain Garand <germain@ebooksfrance.org> @@ -1411,9 +1411,9 @@ 2004-11-27 Germain Garand <germain@ebooksfrance.org> - merge WebCore differences in logic for Auto table tqlayout + merge WebCore differences in logic for Auto table layout - * rendering/table_tqlayout.cpp (calcEffectiveWidth/tqlayout): + * rendering/table_layout.cpp (calcEffectiveWidth/layout): distribute remaining width starting with fixed rather than percent (#88104). 2004-11-26 Germain Garand <germain@ebooksfrance.org> @@ -1432,17 +1432,17 @@ The later because the not-function is unique in its parsing. * css/tokenizer.cpp: Manually merge output from flex :( * css/parser.y: Update parsing of pseudo-functions. - Also enables correct parsing of :lang and :tqcontains. + Also enables correct parsing of :lang and :contains. * css/css_base.{h,cpp}: Add new pseudoselectors * css/cssstyleselector.cpp: Implement new selectors 2004-11-22 Germain Garand <germain@ebooksfrance.org> - * rendering/bidi.cpp (tqlayoutInlineChildren): for elements with some kind of + * rendering/bidi.cpp (layoutInlineChildren): for elements with some kind of scrolling overflow and a variable height, include the scrollbar height in - calculations to avoid tqmasking content (#89136). + calculations to avoid masking content (#89136). - * rendering/render_block.cpp (tqlayoutBlock/tqlayoutBlockChildren): ditto. + * rendering/render_block.cpp (layoutBlock/layoutBlockChildren): ditto. * rendering/render_box.cpp (contentWidth/contentHeight): subtract scrollbars height/width when applicable. @@ -1457,7 +1457,7 @@ * css/html4.css: Make -khtml-native default border-style for form-widgets * render/render_style.h: Add BNATIVE * render/render_object.cpp: Treat BNATIVE like BNONE - * render/render_tqreplaced.cpp: Remove native, and paint CSS border when allowed + * render/render_replaced.cpp: Remove native, and paint CSS border when allowed 2004-11-21 Germain Garand <germain@ebooksfrance.org> @@ -1465,8 +1465,8 @@ * css/html4.css: make fieldset -khtml-around-floats (#92979) - * rendering/render_block.cpp (tqlayoutBlockChildren): cleanup float/flowAroundFloats - logic. Merges: add better RTL tqlayouting of fAFs. + * rendering/render_block.cpp (layoutBlockChildren): cleanup float/flowAroundFloats + logic. Merges: add better RTL layouting of fAFs. (lineWidth): guard against negative values (clearFloats): don't copy floats if element defines a new block formatting context (#93511) @@ -1480,7 +1480,7 @@ * rendering/render_box.cpp (calcWidth): use containingBlockWidth * rendering/render_object.cpp (isHR): new. Evil but useful for quirkmode (cf. usesLineWidth). - (flowAroundFloats): add tqreplaced and overflowClip elements + (flowAroundFloats): add replaced and overflowClip elements (usesLineWidth): adapt to above. * rendering/render_table.cpp (calcWidth): style()->flowAroundFloats => flowAroundFloats() @@ -1500,15 +1500,15 @@ 2004-11-16 Germain Garand <germain@ebooksfrance.org> - * rendering/render_tqreplaced.{cpp,h} (cancelPendingResize): allow + * rendering/render_replaced.{cpp,h} (cancelPendingResize): allow canceling of scheduled widget resizes, to avoid flicker when we - had to perform temporary tqlayouts. + had to perform temporary layouts. - * rendering/render_table.cpp (calcRowHeight): displace resetting tqlayout of cells with + * rendering/render_table.cpp (calcRowHeight): displace resetting layout of cells with percent children here and mark those dirty, or we might get zero-height widgets on resize (cf. map24.com) - (tqlayout): ditto. - (tqlayoutRows): cancel widget resizes from temporary tqlayouts. + (layout): ditto. + (layoutRows): cancel widget resizes from temporary layouts. 2004-11-16 Stephan Kulow <coolo@kde.org> @@ -1556,7 +1556,7 @@ 2004-11-05 Germain Garand <germain@ebooksfrance.org> * khtml_part.cpp (closeURL/slotData/restoreState): avoid triggering - full tqrepaints of the view before the first tqlayout is done. + full repaints of the view before the first layout is done. 2004-11-05 Germain Garand <germain@ebooksfrance.com> @@ -1571,12 +1571,12 @@ 2004-11-03 Germain Garand <germain@ebooksfrance.com> - * khtmlview.cpp (slotScrollBarMoved): make sure we are tqlayouted before + * khtmlview.cpp (slotScrollBarMoved): make sure we are layouted before scrolling if we are still loading (#51473) 2004-11-02 Stephan Kulow <coolo@kde.org> - * rendering/render_tqreplaced.cpp (setStyle): set hidden widgets to invisible + * rendering/render_replaced.cpp (setStyle): set hidden widgets to invisible * xml/dom_docimpl.cpp (recalcStyleSelector): avoid invalid casts on XML documents @@ -1588,7 +1588,7 @@ 2004-11-01 Sandro Giessl <sandro@giessl.com> - * rendering/render_tqreplaced.cpp (copyWidget): don't fill the + * rendering/render_replaced.cpp (copyWidget): don't fill the background of QFrames. they paint their own background now 2004-10-30 Stephan Kulow <coolo@kde.org> @@ -1684,13 +1684,13 @@ * css/cssstyleselector.cpp (adjustRenderStyle): remember our original display * rendering/bidi.cpp (appendRun): include positioned objects with static X/Y, now that we use those. - (tqfindNextLineBreak): adjust static position + (findNextLineBreak): adjust static position - * rendering/render_block.cpp (tqlayoutBlockChildren): ditto. + * rendering/render_block.cpp (layoutBlockChildren): ditto. * rendering/render_box.cpp (containingBlockWidth): use usesLineWidth (position): activate static position logic - (calcAbsoluteHorizontal): tqreplace static position calculation + (calcAbsoluteHorizontal): replace static position calculation (calcAbsoluteVertical): ditto. * rendering/render_object.cpp (removeChild): fix typo @@ -1704,7 +1704,7 @@ 2004-10-18 Allan Sandfeld Jensen <kde@carewolf.com> - * rendering/render_table.cpp: Merge tqlayout fixes from Webcore + * rendering/render_table.cpp: Merge layout fixes from Webcore 2004-10-17 Stephan Kulow <coolo@kde.org> @@ -1731,14 +1731,14 @@ * html/html_formimpl.cpp (defaultEventHandler): propagate events to QScrollView - * khtmlview.{cpp,h}: QScrollview needs fast tqrepaints. Fix + * khtmlview.{cpp,h}: QScrollview needs fast repaints. Fix background color of QFrames. * rendering/render_form.cpp (createListBox/TextAreaWidget): make those widgets z-ordered as well. - * rendering/render_tqreplaced.cpp (paintWidget): optimize painting by - avoiding unnecessary background tqrepaints and by using a shared + * rendering/render_replaced.cpp (paintWidget): optimize painting by + avoiding unnecessary background repaints and by using a shared paint buffer. 2004-10-15 Germain Garand <germain@ebooksfrance.org> @@ -1748,7 +1748,7 @@ * rendering/bidi.cpp: remove checks for display: compact, not needed anymore. - * rendering/render_block.cpp (tqlayoutBlockChildren): + * rendering/render_block.cpp (layoutBlockChildren): simpler implementation for compact display: do not insert the compact child within the next block anymore. Solves lot of problems with host blocks having non-inline children. @@ -1767,7 +1767,7 @@ ("htmlCompat") lookup of tags and attributes (but not in CSS parser). (#86446) 2004-10-14 Allan Sandfeld Jensen <kde@carewolf.com> - * rendering/*.*: WebCore merge/port of tqlayouted->needsLayout + * rendering/*.*: WebCore merge/port of layouted->needsLayout 2004-10-11 David Faure <faure@kde.org> @@ -1793,7 +1793,7 @@ setStyle/close. Better drilling logic. Use RenderTextFragment to correctly handle text-transform on first-letter(#76078). (addChildToFlow): ditto. fix display: block on pseudo-elements (#90917) - (tqlayoutBlockChildren): only clear if floats actually changed our + (layoutBlockChildren): only clear if floats actually changed our height. * rendering/render_object.h (node): accessor to m_node * rendering/render_text.{cpp,h}: merge RenderTextFragment class @@ -1867,7 +1867,7 @@ (HTMLTextAreaElementImpl::setValue): Mark element as initialized after setting. * render_form.cpp (RenderTextArea::setStyle): - Block signals on call to QTextEdit::tqsetAlignment. Otherwise, a bogus + Block signals on call to QTextEdit::setAlignment. Otherwise, a bogus textChanged signal is emitted. 2004-08-27 Germain Garand <germain@ebooksfrance.org> @@ -1881,7 +1881,7 @@ (gotoAnchor): "top" and "" anchors mean top of document. (checkCompleted): entrust the view to emit completed on our behalf - after any pending tqlayout/tqrepaint is done. + after any pending layout/repaint is done. * khtmlview.{cpp,h}: ditto @@ -1915,19 +1915,19 @@ 2004-08-18 Leo Savernik <l.savernik@aon.at> - * rendering/render_block.cpp (tqlayoutBlock, tqlayoutBlockChildren, - tqlayoutPositionedObject): Ensure that m_overflowWidth/m_overflowHeight + * rendering/render_block.cpp (layoutBlock, layoutBlockChildren, + layoutPositionedObject): Ensure that m_overflowWidth/m_overflowHeight get updated properly to include relatively positioned elements, but to exclude the overflow-area of clipped children. - * rendering/render_box.cpp (tqrepaint): Removed superfluous null ptr check. + * rendering/render_box.cpp (repaint): Removed superfluous null ptr check. Use effectiveWidth/Height instead of overflowWidth/Height. * rendering/render_canvas.cpp (docHeight): Fixed superfluous vertical scrollbars on clipped children. (docWidth): Fixed superfluous horizontal scrollbars on clipped children. - * rendering/render_flow.cpp (tqrepaint): + * rendering/render_flow.cpp (repaint): Use effectiveWidth/Height instead of overflowWidth/Height. * rendering/render_object.h: Added effectiveWidth/Height. @@ -1935,7 +1935,7 @@ 2004-08-05 Germain Garand <germain@ebooksfrance.org> - * rendering/render_block.cpp (tqlayoutBlockChildren): when positionning floats, + * rendering/render_block.cpp (layoutBlockChildren): when positionning floats, use the margin tracking variables, and not the prevFlow -there might be self-collapsing blocks in between (#85150). (calcMinMaxWidth): better calculation merged from WebCore. Fixes a few testcases. @@ -1944,7 +1944,7 @@ they are virtuals reimplemented for RenderBlock. * rendering/render_object.cpp (createObject): do not set the style before - the renderer is assigned to a node. Fixes Marquee initial tqlayout + the renderer is assigned to a node. Fixes Marquee initial layout (unsorted/RESOLVED-57087-1342.html) failing because of 'element()->renderer() == this' checks. * xml/dom_elementimpl.cpp (attach): ditto @@ -1952,10 +1952,10 @@ 2004-08-04 Germain Garand <germain@ebooksfrance.org> * khtmlview.cpp (resizeEvent): take care, in case we are shrinking, - not to pass past the content limits yet. Next tqlayout will calculate + not to pass past the content limits yet. Next layout will calculate if we positively need scrollbars or not (#84798). - * rendering/render_canvas.cpp (tqlayout): remove scrollbar flickering turnarounds. + * rendering/render_canvas.cpp (layout): remove scrollbar flickering turnarounds. instead, account for a scrollbar hysteresis level when sizing the content (#61730). 2004-07-30 Jean-Baptiste Mardelle <bj@altern.org> @@ -2025,8 +2025,8 @@ * rendering/render_object.cpp: (getVerticalPosition): fix inverted logic. cf.unsorted/74399.html - (lineHeight/baselinePosition): inline-blocks behaves like tqreplaced elements - only after they are tqlayouted. + (lineHeight/baselinePosition): inline-blocks behaves like replaced elements + only after they are layouted. * rendering/render_table.h (position): remove empty reimplementation: inline-tables need positioning. cf.webcore/fast/inline-block/001.html @@ -2053,8 +2053,8 @@ * rendering/render_block.cpp: (setStyle): do not overwrite inline status (makeChildrenNonInline): change assert - (tqlayoutBlock): account for inline-blocks - (tqlayoutBlockChildren): ditto + (layoutBlock): account for inline-blocks + (layoutBlockChildren): ditto (clearFloats): ditto. bail out. * rendering/render_box.cpp: @@ -2062,8 +2062,8 @@ (calcHeight): fix logic * rendering/render_form.cpp: - (tqlayoutLegend): merges from WebCore-125 - (tqfindLegend): ditto + (layoutLegend): merges from WebCore-125 + (findLegend): ditto (paintBoxDecorations): ditto (setStyle): cf.webcore/fast/forms/007.html @@ -2073,7 +2073,7 @@ * rendering/bidi.cpp (Bidinext): simplified logic. Do not return each InlineFlow twice. - (tqlayoutInlineChildren): clear InlineBoxes on retqlayout. + (layoutInlineChildren): clear InlineBoxes on relayout. * rendering/render_object.{cpp,h}: (deleteInlineBoxes): new virtual method. @@ -2084,7 +2084,7 @@ * rendering/render_flow.{cpp,h}: (createInlineBox/deleteInlineBoxes): ditto. - * rendering/render_tqreplaced.cpp (detach): call deleteLineBoxes + * rendering/render_replaced.cpp (detach): call deleteLineBoxes * rendering/render_text.{cpp,h} (deleteInlineBoxes): reimplemented, replacing deleteTextBoxes @@ -2116,7 +2116,7 @@ * htmlattrs.{c,h}: Regenerated. * htmlattrs.in: Added behavior, direction, loop, scrollamount, scrolldelay, truespeed attribute keywords. - * rendering/bidi.cpp: (RenderBlock::tqfindNextLineBreak): marquee-related extensions. + * rendering/bidi.cpp: (RenderBlock::findNextLineBreak): marquee-related extensions. * rendering/render_block.{cpp,h}: Updated lowestPosition, rightmostPosition, added leftmostPosition. * rendering/render_box.{cpp,h}: Updated lowestPosition, rightmostPosition, added @@ -2198,7 +2198,7 @@ * html/htmltokenizer.cpp (parseEntity): Fix to make 8-character hexadecimal entities work in khtml from Darin Adler. Testcase at - http://www.alanwood.net/tqunicode/deseret.html + http://www.alanwood.net/unicode/deseret.html 2004-06-06 Zack Rusin <zack@kde.org> @@ -2362,7 +2362,7 @@ * rendering/render_text.h: Merged inlineTextBoxes function, needed by firstRunAt, lastRunAt. - (tqfindInlineTextBox): Make it public. + (findInlineTextBox): Make it public. 2004-04-15 Leo Savernik <l.savernik@aon.at> @@ -2385,7 +2385,7 @@ flags to denote outside positions. Add RenderObject::isRenderReplaced. - * rendering/render_tqreplaced.h: Add RenderReplaced::isRenderReplaced + * rendering/render_replaced.h: Add RenderReplaced::isRenderReplaced returning true. * rendering/render_text.{cpp,h}: (RenderText::caretPos) Handle flags. @@ -2416,14 +2416,14 @@ * khtml_part.cpp/.h: if text in a link is highlighted, the link now receives focus. - * khtmlview.cpp: made type-ahead tqfind more aggressive by grabbing the keyboard + * khtmlview.cpp: made type-ahead find more aggressive by grabbing the keyboard when active, this way it temporarily overrules single-letter shortcuts as seen in KMail. Note it immediately releases the keyboard when it looses focus. 2004-03-20 Arend van Beelen jr. <arend@auton.nl> * khtml_part.cpp/.h: finished new searching API. - * khtmlview.cpp/.h: implemented type-ahead tqfind (#51259). + * khtmlview.cpp/.h: implemented type-ahead find (#51259). 2004-03-21 Dirk Mueller <mueller@kde.org> @@ -2459,10 +2459,10 @@ * html/html_documentimpl.cpp (determineParseMode): treat xhtml transitional that way (#76449). - * rendering/bidi.cpp (tqfindNextLineBreak): make sure we move - tqreplaced elements, that don't fit on a line below the floats (#74609). + * rendering/bidi.cpp (findNextLineBreak): make sure we move + replaced elements, that don't fit on a line below the floats (#74609). - * rendering/render_tqreplaced.cpp (calcMinMaxWidth): respect + * rendering/render_replaced.cpp (calcMinMaxWidth): respect padding and borders (#65788). * rendering/render_form.h (RenderFormElement): make sure we never @@ -2477,8 +2477,8 @@ 2004-02-28 Germain Garand <germain@ebooksfrance.org> - * rendering/render_block.cpp (tqlayoutBlockChildren): - - displace the check for if we need to retqlayout our childs + * rendering/render_block.cpp (layoutBlockChildren): + - displace the check for if we need to relayout our childs because of a float. It was outside of loop (#71445) - remove check for floatBottom() > m_y has it seems outdated. @@ -2497,7 +2497,7 @@ * misc/htmlattrs.h: don't export getAttrName symbol. * rendering/render_object.h (class RenderObject): move background - tqrepaint handling over here, since TableSections don't inherit RenderBox, + repaint handling over here, since TableSections don't inherit RenderBox, but still have a background. * khtml_settings.cc (init)/html4.css: MediumFontSize up to 12. Form elements @@ -2512,7 +2512,7 @@ to KEYUP/DOWN_EVENT. Add events needed for XMLHttpRequest. * rendering/render_object.h (class RenderObject): introduce a PaintInfo - struct that tqcontains the information necessary for all those paint..() methods. + struct that contains the information necessary for all those paint..() methods. Requires much less parameters to pass and is therefore faster. While being at it, eliminate the unnecessary virtual method paintObject. @@ -2620,7 +2620,7 @@ (Bidinext): merge skipInline bool to avoid leak. (RenderBlock::bidiReorderLine): handle whitespace count through category separator_Space - (RenderBlock::tqfindNextLineBreak): account for empty InlineFlow + (RenderBlock::findNextLineBreak): account for empty InlineFlow * rendering/font.cpp (drawText, width): whitespace handling @@ -2635,7 +2635,7 @@ * rendering/render_object.cpp (offsetLeft/offsetTop): adjust (hasStaticX/hasStaticY): merged non-virtual methods - * rendering/render_tqreplaced.cpp (position): do not add margin anymore + * rendering/render_replaced.cpp (position): do not add margin anymore * rendering/render_text.cpp: whitespace handling. No more p/b/m. @@ -2718,11 +2718,11 @@ state machine goes out of sync. * rendering/render_image.cpp: avoid shoot-out effect when neither oimage nor - image are fully loaded. do a tqrepaint when the new image finished loading, so + image are fully loaded. do a repaint when the new image finished loading, so that it actually updates. avoid reloading images on news.google.com on hover. - * khtmlview.cpp (scheduleRepaint): make scheduling not starvating tqrepaints. - Fix tqrepainting logic to optimize for reduced X server load and minimum CPU + * khtmlview.cpp (scheduleRepaint): make scheduling not starvating repaints. + Fix repainting logic to optimize for reduced X server load and minimum CPU usage in traversing the render tree (#72575). 2004-01-25 Dirk Mueller <mueller@kde.org> @@ -2738,7 +2738,7 @@ * html/html_objectimpl.cpp (renderAlternative): give the alternative rendering some time to avoid ugly deletion races. - * rendering/render_canvas.cpp (tqlayout): don't recurse when printing (#72775). + * rendering/render_canvas.cpp (layout): don't recurse when printing (#72775). * rendering/render_image.cpp (setPixmap): handle cases when we're not inserted in the tree yet, but the image is already loaded @@ -2783,7 +2783,7 @@ done by setNamedItem * xml/dom_elementimpl.cpp (setNamedItem): if attribute exists already, - return it, to fix DOMTS-Core-level1 test hc_elementtqreplaceattributewithself + return it, to fix DOMTS-Core-level1 test hc_elementreplaceattributewithself 2004-01-21 Leo Savernik <l.savernik@aon.at> @@ -2797,7 +2797,7 @@ 2004-01-21 Germain Garand <germain@ebooksfrance.org> - * rendering/render_block.cpp (tqlayoutBlockChildren): use maxTopMargin + * rendering/render_block.cpp (layoutBlockChildren): use maxTopMargin again, for correct margin-top determination (#67527) 2004-01-20 Dirk Mueller <mueller@kde.org> @@ -2855,7 +2855,7 @@ 2004-01-15 Lars Knoll <knoll@kde.org> * rendering/render_table.cpp: set overflowWidth to width - when tqlayouting (#72420) + when layouting (#72420) * xml/dom2_eventsimpl.cpp rendering/render_block.cpp nodeAtPoint() should always use contents coordinates. @@ -2870,8 +2870,8 @@ 2004-01-13 Germain Garand <germain@ebooksfrance.org> - * rendering/render_canvas.cpp (tqlayout): - force scrollbar visibility status while tqlayouting + * rendering/render_canvas.cpp (layout): + force scrollbar visibility status while layouting to avoid endless cycles (#69613) 2004-01-13 Dirk Mueller <mueller@kde.org> @@ -2931,7 +2931,7 @@ down the machine with large images (try http://www.parisc-linux.org/~willy/kde/graph.jpg) - * rendering/render_image.cpp (tqlayout): ugh, major stupidity. don't rescale large + * rendering/render_image.cpp (layout): ugh, major stupidity. don't rescale large images if nobody explicitely asked for it. makes loading of very large images quite a bit faster. @@ -2943,7 +2943,7 @@ 2004-01-09 Dirk Mueller <mueller@kde.org> - * rendering/render_tqreplaced.cpp (eventFilter): readd the wheel event handling + * rendering/render_replaced.cpp (eventFilter): readd the wheel event handling which allows scrolling of the page again. Thanks a lot for just removing it. (#45180) @@ -2979,7 +2979,7 @@ 2003-12-10 Germain Garand <germain@ebooksfrance.org> - * rendering/render_tqreplaced.cpp (updateFromElement): don't use setEraseColor for __khtml + * rendering/render_replaced.cpp (updateFromElement): don't use setEraseColor for __khtml widgets as it changes the background mode and induces flicker (#69130) (copyWidget): retrieve background color from the widget's palette. @@ -3005,7 +3005,7 @@ that dispatchKeyEvent returns defaultHandled || defaultPrevented. * dom/dom_node.cpp (dispatchEvent): Return !defaultPrevented as mandated by the DOM, now that NodeImpl doesn't do it anymore. - * rendering/render_tqreplaced.cpp (eventFilter): Adapted to new logic + * rendering/render_replaced.cpp (eventFilter): Adapted to new logic * khtmlview.cpp (dispatchKeyEventHelper): Adapted to new logic 2003-12-05 Stephan Kulow <coolo@kde.org> @@ -3014,7 +3014,7 @@ 2003-12-05 Lubos Lunak <l.lunak@kde.org> - * khtmlview.cpp, xml/dom2_eventsimpl.*, xml/dom_nodeimpl.*, rendering/render_tqreplaced.cpp : + * khtmlview.cpp, xml/dom2_eventsimpl.*, xml/dom_nodeimpl.*, rendering/render_replaced.cpp : fix mapping between Qt and DOM key events 2003-12-05 Germain Garand <germain@ebooksfrance.org> @@ -3032,7 +3032,7 @@ 2003-12-03 Stephan Kulow <coolo@kde.org> - * css/html4.css: define default text-tqalignments for input fields to avoid + * css/html4.css: define default text-alignments for input fields to avoid problems with inherited attributes 2003-12-02 Stephan Kulow <coolo@kde.org> @@ -3055,7 +3055,7 @@ (#65610) * html/html_formimpl.cpp (HTMLInputElementImpl): don't make input elements - floating, but only care for the text tqalignment + floating, but only care for the text alignment 2003-11-28 Harri Porten <porten@kde.org> @@ -3127,7 +3127,7 @@ * html/htmlparser.cpp (popInlineBlocks): Fixed infinite loop due to popOneBlock returning immediately if blockStack==0. #68034. - * rendering/bidi.cpp: Fixed infinite loop with <nobr> due to tqfindNextLineBreak + * rendering/bidi.cpp: Fixed infinite loop with <nobr> due to findNextLineBreak going back (wrong variable used). #66867, #68598, #59230 and their duplicates. 2003-11-24 Stephan Kulow <coolo@kde.org> @@ -3210,7 +3210,7 @@ * rendering/render_*.cpp: changing the output of dump to get a more comprehensive renderer tree output - as inspired by Safari's kwqDebugTree. This allows for a change in - test_regression to check tqlayouts + test_regression to check layouts 2003-11-15 Zack Rusin <zack@kde.org> @@ -3220,13 +3220,13 @@ 2003-11-14 Germain Garand <germain@ebooksfrance.org> - fix "overflow: scroll" tqlayout/painting issues + fix "overflow: scroll" layout/painting issues * rendering/render_box.cpp (getOverflowClipRect): substract scrollbars width/height if any. Merged from WebCore. * rendering/render_layer.cpp (horizontalScrollbarHeight, - verticalScrollbarWidth): use tqpixelMetric instead of width()/height(). + verticalScrollbarWidth): use pixelMetric instead of width()/height(). 2003-11-13 Zack Rusin <zack@kde.org> @@ -3339,11 +3339,11 @@ * rendering/render_object.cpp (nodeAtPoint): merge from Safari. Still does not work, but at least its the same now. - (lineHeight): handle tqreplaced elements here. They don't necessarily + (lineHeight): handle replaced elements here. They don't necessarily inherit RenderReplaced anymore. - (baselinePosition): handle tqreplaced elements. + (baselinePosition): handle replaced elements. - * rendering/render_tqreplaced.cpp: remove baselinePosition/lineHeight. its in + * rendering/render_replaced.cpp: remove baselinePosition/lineHeight. its in RenderObject now. * rendering/render_block.cpp (isSelfCollapsingBlock): collapse away trailing whitespace @@ -3354,7 +3354,7 @@ 2003-11-02 Stephan Kulow <coolo@kde.org> - * rendering/render_form.cpp (updateFromElement): tqinvalidate the size hint + * rendering/render_form.cpp (updateFromElement): invalidate the size hint of comboboxes as they are cached in QComboBox (#64229) 2003-11-01 Dirk Mueller <mueller@kde.org> @@ -3410,7 +3410,7 @@ 2003-10-28 Leo Savernik <l.savernik@aon.at> - * rendering/render_tqreplaced.cpp (checkSelectionPoint): + * rendering/render_replaced.cpp (checkSelectionPoint): Readded RenderReplaced::checkSelectionPoint to fix disrupted selection of sole inline images within block elements (<p><img ...></p>). Also fixes caret placement issues. @@ -3591,7 +3591,7 @@ either modality or QScrollView (but doesn't work in 3.1.x neither). 2003-10-24 Lars Knoll <knoll@kde.org> - * Hopefully fixed most tqrepainting problems. + * Hopefully fixed most repainting problems. 2003-10-24 Lars Knoll <knoll@kde.org> * Fix most of the form related regressions introduced by my @@ -3638,18 +3638,18 @@ * rendering/render_list.cpp (calcListValue): handle <ul><p><li> again. - * rendering/render_box.cpp (tqrepaint): revert commit which introduced another + * rendering/render_box.cpp (repaint): revert commit which introduced another 4 bytes overhead. No need to waste memory here. - * rendering/render_object.cpp (setStyle): schedule tqrepaint on old object + * rendering/render_object.cpp (setStyle): schedule repaint on old object when the new outline is going to be thinner. * rendering/render_form.cpp (RenderCustomButton): Remove. - * rendering/render_tqreplaced.cpp (RenderReplaced::checkSelectionPoint): Remove. + * rendering/render_replaced.cpp (RenderReplaced::checkSelectionPoint): Remove. RenderObject/RenderBox'es implementation *must* work. No need to add useless code. - * rendering/render_tqreplaced.cpp (RenderReplacedBlock): Remove. + * rendering/render_replaced.cpp (RenderReplacedBlock): Remove. * html/html_formimpl.cpp (HTMLButtonElement::attach): Remove. @@ -3671,15 +3671,15 @@ * css/makeprop: don't export getPropertyName. declare it. - * xml/dom_nodeimpl.cpp (tqreplaceChild/appendChild/removeChild): - Reverting patch which tqinvalidated tqlayout on child when it was attached. + * xml/dom_nodeimpl.cpp (replaceChild/appendChild/removeChild): + Reverting patch which invalidated layout on child when it was attached. 2003-10-20 Lars Knoll <knoll@kde.org> * fix most issues with the layering code by merging and adapting safaris implementation * fix a bug in RenderBox::calcAbsoluteVertical(), that probably - has destroyed a lot of tqlayouts. + has destroyed a lot of layouts. * don't add the scroll offset in RenderBox::paintBoxDecorations() 2003-10-20 Dirk Mueller <mueller@kde.org> @@ -3694,7 +3694,7 @@ 2003-10-20 Dirk Mueller <mueller@kde.org> - * rendering/render_form.cpp (tqlayout): set IE-CSS-extension style palette + * rendering/render_form.cpp (layout): set IE-CSS-extension style palette on <textarea> scrollbars (#56532). * rendering/render_layer.cpp (showScrollbar): set IE-CSS-extension styled @@ -3808,7 +3808,7 @@ meaningful peripheral mouse events to focused widget to restore correct mouse handling in proxied widgets. #65216 (selection part) - * rendering/render_tqreplaced.cpp (handleEvent): + * rendering/render_replaced.cpp (handleEvent): map MOUSEOUT/MOUSEOVER DOM events to Enter/Leave events. Honours stacking while mouse buttons are pressed. @@ -3817,7 +3817,7 @@ 2003-10-06 Daniel Molkentin <molkentin@kde.org> - * ecma/kjs_window.cpp: added window.open targets _self and tqreplace + * ecma/kjs_window.cpp: added window.open targets _self and replace 2003-10-06 David Faure <faure@kde.org> @@ -3835,7 +3835,7 @@ to make the one call entering a local event loop the last, so that we can cleanly exit when it the view is already deleted. - * khtml_ext.cpp (KHTMLPopupGUIClient): pass TQObject parent + * khtml_ext.cpp (KHTMLPopupGUIClient): pass QObject parent 2003-10-05 Dirk Mueller <mueller@kde.org> @@ -3847,7 +3847,7 @@ 2003-10-04 Germain Garand <germain@ebooksfrance.org> - * rendering/render_tqreplaced.cpp (baselinePosition): use setPos to adjust + * rendering/render_replaced.cpp (baselinePosition): use setPos to adjust layer position if needed. Fix relatively positioned widgets not being painted. 2003-10-04 Dirk Mueller <mueller@kde.org> diff --git a/khtml/DESIGN.html b/khtml/DESIGN.html index c14170ec4..00af13045 100644 --- a/khtml/DESIGN.html +++ b/khtml/DESIGN.html @@ -9,7 +9,7 @@ dt { font-weight: bold; } <p> This document tries to give a short overview about the internal design of the khtml -library. I've written this, because the lib has gotten quite big, and it is hard at first to tqfind your +library. I've written this, because the lib has gotten quite big, and it is hard at first to find your way in the source code. This doesn't mean that you'll understand khtml after reading this document, but it'll hopefully make it easier for you to read the source code. </p> @@ -84,7 +84,7 @@ in a tree like structure. Imagine some html like In the following I'll show how this input will be processed step by step to generate the visible output you will finally see on your screen. I'm describing the things as if they happen one after the other, to make the principle more clear. In reality, to get visible output on the screen as soon as possible, -all these things (from tokenization to the build up and tqlayouting of the rendering tree) happen +all these things (from tokenization to the build up and layouting of the rendering tree) happen more or less in parallel. <h2>Tokenizer and parser</h2> @@ -168,7 +168,7 @@ explicit sharing of the DOM specs. Another advantage is, that (as the implementation classes are not exported) it gives us a lot more freedom to make changes in the implementation without breaking binary compatibility. <p> -You will tqfind almost a one to one correspondence between the interface classes and the implementation +You will find almost a one to one correspondence between the interface classes and the implementation classes. In the implementation classes we have added a few more intermediate classes, that can not be seen from the outside for various reasons (make implementation of shared features easier or to reduce memory consumption). @@ -258,9 +258,9 @@ RenderRoot* </pre> <p> -A call to of <a href="rendering/render_root.cpp">tqlayout()</a> on the +A call to of <a href="rendering/render_root.cpp">layout()</a> on the <a href="rendering/render_root.h">RenderRoot </a> (the root of the rendering tree) -object causes the rendering tree to tqlayout itself into the available space +object causes the rendering tree to layout itself into the available space (width) given by the the KHTMLView. After that, the drawContents() method of KHTMLView can call RenderRoot->print() with appropriate parameters to actually paint the document. This is not 100% correct, when parsing incrementally, but @@ -291,10 +291,10 @@ that defines the DTD to use for HTML (used mainly in the parser). <dd>Java related stuff. <dt><a href="misc/">misc:</a> <dd>Some misc stuff needed in khtml. Contains the image loader, some misc definitions and the -decoder class that converts the incoming stream to tqunicode. +decoder class that converts the incoming stream to unicode. <dt><a href="rendering">rendering:</a> <dd>Everything thats related to bringing a DOM tree with CSS declarations to the screen. Contains -the definition of the objects used in the rendering tree, the tqlayouting code, and the RenderStyle objects. +the definition of the objects used in the rendering tree, the layouting code, and the RenderStyle objects. <dt><a href="xml/">xml:</a> <dd>The XML part of the DOM implementation, the xml tokenizer. </dl> @@ -309,7 +309,7 @@ is part of dom/* checks for this flag and throws the exception. <p> All the above is to give you a quick introduction into the way khtml brings an HTML/XML file to the screen. It is by no way complete or even 100% correct. I left out many problems, I will perhaps add either on request -or when I tqfind some time to do so. Let me name some of the missing things: +or when I find some time to do so. Let me name some of the missing things: <ul> <li>The decoder to convert the incoming stream to Unicode <li>interaction with konqueror/applications @@ -329,7 +329,7 @@ if you don't immediately understand how it works. On the other hand, it is by no get used a lot, that probably has the biggest number of remaining bugs (even though it's sometimes hard to know if some behavior is really a bug). <blockquote> -Some parts of it's code are however <b>extremely touchy</b> (especially the tqlayouting algorithms), +Some parts of it's code are however <b>extremely touchy</b> (especially the layouting algorithms), and making changes there (that might fix a bug on one web page) might introduce severe bugs. All the people developing khtml have already spend huge amounts of time searching for such bugs, that only showed up on some web pages, and thus were found only a week after the change that diff --git a/khtml/SAFARI_MERGE b/khtml/SAFARI_MERGE index 4c48e6b34..7ef67e134 100644 --- a/khtml/SAFARI_MERGE +++ b/khtml/SAFARI_MERGE @@ -82,7 +82,7 @@ Needs other stuff before it can be applied: =========================================================================== - decoder.cpp/.h: changes in APPLE_CHANGES #ifdef that make decoder - being a null wrapper just using tqunicode directly instead of working + being a null wrapper just using unicode directly instead of working on charset specific 8bit data. - htmltags.in: removal of <-konqblock>, not sure if that should ever @@ -112,7 +112,7 @@ changes that need to be merged: IMO to speed up style stuff. Should IMO be separated out into a font_mac.cpp and font_x11.cpp -- tqrepaint has gotten a bool immediate +- repaint has gotten a bool immediate - render_applet.cpp: small #ifdef APPLE changes diff --git a/khtml/configure.in.in b/khtml/configure.in.in index c58788de2..b85dd8474 100644 --- a/khtml/configure.in.in +++ b/khtml/configure.in.in @@ -41,7 +41,7 @@ if test "$ac_libthai" != "no"; then LIBTHAI="" if test "$kde_link_libthai" = "no"; then - AC_MSG_ERROR([Can't tqfind libthai.]) + AC_MSG_ERROR([Can't find libthai.]) else AC_DEFINE(HAVE_LIBTHAI, 1, [Defined if you have libthai and want to have it compiled in]) diff --git a/khtml/css/css_base.cpp b/khtml/css/css_base.cpp index 2ffbbb0a4..5af37b9b9 100644 --- a/khtml/css/css_base.cpp +++ b/khtml/css/css_base.cpp @@ -56,9 +56,9 @@ StyleSheetImpl* StyleBaseImpl::stylesheet() KURL StyleBaseImpl::baseURL() { - // try to tqfind the style sheet. If found look for its url. + // try to find the style sheet. If found look for its url. // If it has none, look for the parentsheet, or the parentNode and - // try to tqfind out about their url + // try to find out about their url StyleSheetImpl *sheet = stylesheet(); @@ -67,7 +67,7 @@ KURL StyleBaseImpl::baseURL() if(!sheet->href().isNull()) return KURL( sheet->href().string() ); - // tqfind parent + // find parent if(sheet->parent()) return sheet->parent()->baseURL(); if(!sheet->ownerNode()) return KURL(); @@ -172,7 +172,7 @@ void CSSSelector::extractPseudoType() const value = value.lower(); switch (value[0]) { case '-': - if (value == "-khtml-tqreplaced") + if (value == "-khtml-replaced") _pseudoType = PseudoReplaced; else if (value == "-khtml-marker") @@ -196,7 +196,7 @@ void CSSSelector::extractPseudoType() const case 'c': if (value == "checked") _pseudoType = PseudoChecked; - else if (value == "tqcontains(") + else if (value == "contains(") _pseudoType = PseudoContains; break; case 'd': @@ -319,7 +319,7 @@ DOMString CSSSelector::selectorText() const // the original namespace prefix used. Ugh. -dwh DOMString str; const CSSSelector* cs = this; - TQ_UINT16 tag = localNamePart(cs->tag); + Q_UINT16 tag = localNamePart(cs->tag); if (tag == anyLocalName && cs->match == CSSSelector::None) str = "*"; else if (tag != anyLocalName) diff --git a/khtml/css/css_base.h b/khtml/css/css_base.h index 75611f054..9a8774107 100644 --- a/khtml/css/css_base.h +++ b/khtml/css/css_base.h @@ -176,7 +176,7 @@ namespace DOM { mutable DOM::DOMString value; CSSSelector *tagHistory; CSSSelector* simpleSelector; // Used by :not - DOM::DOMString string_arg; // Used by :tqcontains, :lang and :nth-* + DOM::DOMString string_arg; // Used by :contains, :lang and :nth-* DOM::NodeImpl::Id attr; DOM::NodeImpl::Id tag; diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/khtml/css/css_renderstyledeclarationimpl.cpp index ef60d5262..daf607a9e 100644 --- a/khtml/css/css_renderstyledeclarationimpl.cpp +++ b/khtml/css/css_renderstyledeclarationimpl.cpp @@ -367,7 +367,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) if (!node) return 0; - // Make sure our tqlayout is up to date before we allow a query on these attributes. + // Make sure our layout is up to date before we allow a query on these attributes. DocumentImpl* docimpl = node->getDocument(); if (docimpl) { docimpl->updateLayout(); @@ -930,7 +930,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) case CSS_PROP_TOP: return getPositionOffsetValue(renderer, CSS_PROP_TOP); case CSS_PROP_UNICODE_BIDI: - switch (style->tqunicodeBidi()) { + switch (style->unicodeBidi()) { case UBNormal: return new CSSPrimitiveValueImpl(CSS_VAL_NORMAL); case Embed: diff --git a/khtml/css/css_stylesheetimpl.cpp b/khtml/css/css_stylesheetimpl.cpp index 855b1a6e8..bf85c0d59 100644 --- a/khtml/css/css_stylesheetimpl.cpp +++ b/khtml/css/css_stylesheetimpl.cpp @@ -235,7 +235,7 @@ void CSSStyleSheetImpl::addNamespace(CSSParser* p, const DOM::DOMString& prefix, } } -void CSSStyleSheetImpl::determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix) +void CSSStyleSheetImpl::determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix) { // If the stylesheet has no namespaces we can just return. There won't be any need to ever check // namespace values in selectors. @@ -253,7 +253,7 @@ void CSSStyleSheetImpl::determineNamespace(TQ_UINT32& id, const DOM::DOMString& Q_ASSERT(m_doc != 0); // Look up the id for this namespace URI. - TQ_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode); + Q_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode); id = makeId(nsid, localNamePart(id)); } } @@ -324,7 +324,7 @@ StyleSheetListImpl::~StyleSheetListImpl() void StyleSheetListImpl::add( StyleSheetImpl* s ) { - if ( !styleSheets.tqcontainsRef( s ) ) { + if ( !styleSheets.containsRef( s ) ) { s->ref(); styleSheets.append( s ); } @@ -377,10 +377,10 @@ MediaListImpl::MediaListImpl( CSSRuleImpl *parentRule, const DOMString &media ) setMediaText( media ); } -bool MediaListImpl::tqcontains( const DOMString &medium ) const +bool MediaListImpl::contains( const DOMString &medium ) const { - return m_lstMedia.empty() || m_lstMedia.tqcontains( medium ) || - m_lstMedia.tqcontains( "all" ); + return m_lstMedia.empty() || m_lstMedia.contains( medium ) || + m_lstMedia.contains( "all" ); } CSSStyleSheetImpl *MediaListImpl::parentStyleSheet() const diff --git a/khtml/css/css_stylesheetimpl.h b/khtml/css/css_stylesheetimpl.h index 80f2b4ed8..e7a551947 100644 --- a/khtml/css/css_stylesheetimpl.h +++ b/khtml/css/css_stylesheetimpl.h @@ -101,8 +101,8 @@ public: void deleteRule ( unsigned long index, int &exceptioncode ); void addNamespace(CSSParser* p, const DOM::DOMString& prefix, const DOM::DOMString& uri); - void determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix); - TQ_UINT32 defaultNamespace() { return m_defaultNamespace; }; + void determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix); + Q_UINT32 defaultNamespace() { return m_defaultNamespace; }; void setCharset(const DOMString &charset) { m_charset = charset; } const DOMString& charset() const { return m_charset; } @@ -123,7 +123,7 @@ public: protected: DocumentImpl *m_doc; bool m_implicit; - TQ_UINT32 m_defaultNamespace; + Q_UINT32 m_defaultNamespace; CSSNamespace* m_namespaces; DOMString m_charset; }; @@ -172,14 +172,14 @@ public: void setMediaText(const DOM::DOMString &value); /** - * Check if the list tqcontains either the requested medium, or the + * Check if the list contains either the requested medium, or the * catch-all "all" media type. Returns true when found, false otherwise. * Since not specifying media types should be treated as "all" according * to DOM specs, an empty list always returns true. * * _NOT_ part of the DOM! */ - bool tqcontains( const DOM::DOMString &medium ) const; + bool contains( const DOM::DOMString &medium ) const; protected: TQValueList<DOM::DOMString> m_lstMedia; diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp index c5ab10a08..52e962725 100644 --- a/khtml/css/css_valueimpl.cpp +++ b/khtml/css/css_valueimpl.cpp @@ -57,8 +57,8 @@ static DOMString quoteStringIfNeeded(const DOMString &string) { // FIXME: Also need to transform control characters into \ sequences. TQString s = string.string(); - s.tqreplace('\\', "\\\\"); - s.tqreplace('\'', "\\'"); + s.replace('\\', "\\\\"); + s.replace('\'', "\\'"); return '\'' + s + '\''; } @@ -757,14 +757,14 @@ DOM::DOMString CSSPrimitiveValueImpl::cssText() const break; } case CSSPrimitiveValue::CSS_RGBCOLOR: - if (tqAlpha(m_value.rgbcolor) != 0xFF) { + if (qAlpha(m_value.rgbcolor) != 0xFF) { if (m_value.rgbcolor == khtml::transparentColor) text = "transparent"; else - text = "rgba(" + TQString::number(tqRed (m_value.rgbcolor)) + "," - + TQString::number(tqBlue (m_value.rgbcolor)) + "," - + TQString::number(tqGreen(m_value.rgbcolor)) + "," - + TQString::number(tqAlpha(m_value.rgbcolor)/255.0) + ")"; + text = "rgba(" + TQString::number(qRed (m_value.rgbcolor)) + "," + + TQString::number(qBlue (m_value.rgbcolor)) + "," + + TQString::number(qGreen(m_value.rgbcolor)) + "," + + TQString::number(qAlpha(m_value.rgbcolor)/255.0) + ")"; } else { text = TQColor(m_value.rgbcolor).name(); } @@ -886,9 +886,9 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string) parsedFontName = string; // a language tag is often added in braces at the end. Remove it. - parsedFontName.tqreplace(parenReg, TQString::null); + parsedFontName.replace(parenReg, TQString::null); // remove [Xft] qualifiers - parsedFontName.tqreplace(braceReg, TQString::null); + parsedFontName.replace(braceReg, TQString::null); #ifndef APPLE_CHANGES const TQString &available = KHTMLSettings::availableFamilies(); @@ -896,21 +896,21 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string) parsedFontName = parsedFontName.lower(); // kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl; - int pos = available.tqfind( ',' + parsedFontName + ',', 0, false ); + int pos = available.find( ',' + parsedFontName + ',', 0, false ); if ( pos == -1 ) { // many pages add extra MSs to make sure it's windows only ;( if ( parsedFontName.startsWith( "ms " ) ) parsedFontName = parsedFontName.mid( 3 ); if ( parsedFontName.endsWith( " ms" ) ) parsedFontName.truncate( parsedFontName.length() - 3 ); - pos = available.tqfind( ",ms " + parsedFontName + ',', 0, false ); + pos = available.find( ",ms " + parsedFontName + ',', 0, false ); if ( pos == -1 ) - pos = available.tqfind( ',' + parsedFontName + " ms,", 0, false ); + pos = available.find( ',' + parsedFontName + " ms,", 0, false ); } if ( pos != -1 ) { ++pos; - int p = available.tqfind(',', pos); + int p = available.find(',', pos); assert( p != -1 ); // available is supposed to start and end with , parsedFontName = available.mid( pos, p - pos); // kdDebug(0) << "going for '" << parsedFontName << "'" << endl; diff --git a/khtml/css/csshelper.cpp b/khtml/css/csshelper.cpp index f1d681bd6..73eff588c 100644 --- a/khtml/css/csshelper.cpp +++ b/khtml/css/csshelper.cpp @@ -78,7 +78,7 @@ DOMString khtml::parseURL(const DOMString &url) int nl = 0; for(int k = o; k < o+l; k++) - if(i->s[k].tqunicode() > '\r') + if(i->s[k].unicode() > '\r') j->s[nl++] = i->s[k]; j->l = nl; diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp index 4dff70ba9..d167af025 100644 --- a/khtml/css/cssparser.cpp +++ b/khtml/css/cssparser.cpp @@ -166,7 +166,7 @@ void CSSParser::parseSheet( CSSStyleSheetImpl *sheet, const DOMString &string ) int length = string.length() + 3; data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); - memcpy( data, string.tqunicode(), string.length()*sizeof( unsigned short) ); + memcpy( data, string.unicode(), string.length()*sizeof( unsigned short) ); #ifdef CSS_DEBUG kdDebug( 6080 ) << ">>>>>>> start parsing style sheet" << endl; @@ -190,7 +190,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); for ( unsigned int i = 0; i < strlen(khtml_rule); i++ ) data[i] = khtml_rule[i]; - memcpy( data + strlen( khtml_rule ), string.tqunicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) ); // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() ); data[length-4] = '}'; @@ -218,7 +218,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id, data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); for ( unsigned int i = 0; i < strlen(khtml_value); i++ ) data[i] = khtml_value[i]; - memcpy( data + strlen( khtml_value ), string.tqunicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) ); data[length-4] = '}'; // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() ); @@ -260,7 +260,7 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); for ( unsigned int i = 0; i < strlen(khtml_decls); i++ ) data[i] = khtml_decls[i]; - memcpy( data + strlen( khtml_decls ), string.tqunicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) ); data[length-4] = '}'; nonCSSHint = _nonCSSHint; @@ -522,7 +522,7 @@ bool CSSParser::parseValue( int propId, bool important ) valid_primitive = true; break; - case CSS_PROP_CLIP: // <tqshape> | auto | inherit + case CSS_PROP_CLIP: // <shape> | auto | inherit if ( id == CSS_VAL_AUTO ) valid_primitive = true; else if ( value->unit == Value::Function ) @@ -1186,7 +1186,7 @@ bool CSSParser::parseBackgroundShorthand(bool important) } } - // if we didn't tqfind at least one match, this is an + // if we didn't find at least one match, this is an // invalid shorthand and we have to ignore it if (!found) goto fail; @@ -1243,7 +1243,7 @@ bool CSSParser::parseShortHand(int propId, const int *properties, int numPropert } } - // if we didn't tqfind at least one match, this is an + // if we didn't find at least one match, this is an // invalid shorthand and we have to ignore it if (!found) return false; @@ -2125,7 +2125,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) colorValues[0] = kMax( 0, kMin( 255, colorValues[0] ) ); colorValues[1] = kMax( 0, kMin( 255, colorValues[1] ) ); colorValues[2] = kMax( 0, kMin( 255, colorValues[2] ) ); - c = tqRgb(colorValues[0], colorValues[1], colorValues[2]); + c = qRgb(colorValues[0], colorValues[1], colorValues[2]); } else if (value->unit == Value::Function && value->function->args != 0 && value->function->args->size() == 7 /* rgba + three commas */ && @@ -2136,7 +2136,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) colorValues[0] = kMax( 0, kMin( 255, colorValues[0] ) ); colorValues[1] = kMax( 0, kMin( 255, colorValues[1] ) ); colorValues[2] = kMax( 0, kMin( 255, colorValues[2] ) ); - c = tqRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); + c = qRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); } else if (value->unit == Value::Function && value->function->args != 0 && value->function->args->size() == 5 /* hsl + two commas */ && @@ -2144,7 +2144,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) double colorValues[3]; if (!parseHSLParameters(value, colorValues, false)) return 0; - c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0); + c = khtml::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0); } else if (value->unit == Value::Function && value->function->args != 0 && value->function->args->size() == 7 /* hsla + three commas */ && @@ -2152,7 +2152,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) double colorValues[4]; if (!parseHSLParameters(value, colorValues, true)) return 0; - c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); + c = khtml::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); } else return 0; diff --git a/khtml/css/cssproperties.c b/khtml/css/cssproperties.c index f8205a5b9..c86f2d326 100644 --- a/khtml/css/cssproperties.c +++ b/khtml/css/cssproperties.c @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.2 */ -/* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -NtqfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf */ +/* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ @@ -39,7 +39,7 @@ struct props { int id; }; -static const struct props * tqfindProp (register const char *str, register unsigned int len); +static const struct props * findProp (register const char *str, register unsigned int len); /* maximum key range = 469, duplicates = 0 */ #ifdef __GNUC__ @@ -189,7 +189,7 @@ hash_prop (register const char *str, register unsigned int len) __inline #endif const struct props * -tqfindProp (register const char *str, register unsigned int len) +findProp (register const char *str, register unsigned int len) { enum { @@ -281,7 +281,7 @@ tqfindProp (register const char *str, register unsigned int len) #line 102 "cssproperties.gperf" {"text-align", CSS_PROP_TEXT_ALIGN}, #line 109 "cssproperties.gperf" - {"tqunicode-bidi", CSS_PROP_UNICODE_BIDI}, + {"unicode-bidi", CSS_PROP_UNICODE_BIDI}, #line 82 "cssproperties.gperf" {"outline-color", CSS_PROP_OUTLINE_COLOR}, #line 60 "cssproperties.gperf" @@ -417,7 +417,7 @@ tqfindProp (register const char *str, register unsigned int len) #line 129 "cssproperties.gperf" {"list-style", CSS_PROP_LIST_STYLE}, #line 101 "cssproperties.gperf" - {"table-tqlayout", CSS_PROP_TABLE_LAYOUT}, + {"table-layout", CSS_PROP_TABLE_LAYOUT}, #line 54 "cssproperties.gperf" {"font-size", CSS_PROP_FONT_SIZE}, #line 86 "cssproperties.gperf" @@ -624,7 +624,7 @@ static const char * const propertyList[] = { "quotes", "right", "size", -"table-tqlayout", +"table-layout", "text-align", "text-decoration", "text-indent", @@ -632,7 +632,7 @@ static const char * const propertyList[] = { "text-shadow", "text-transform", "top", -"tqunicode-bidi", +"unicode-bidi", "vertical-align", "visibility", "white-space", diff --git a/khtml/css/cssproperties.in b/khtml/css/cssproperties.in index 6c2a8b254..251eb5e3d 100644 --- a/khtml/css/cssproperties.in +++ b/khtml/css/cssproperties.in @@ -102,7 +102,7 @@ position quotes right size -table-tqlayout +table-layout text-align text-decoration text-indent @@ -110,7 +110,7 @@ text-overflow text-shadow text-transform top -tqunicode-bidi +unicode-bidi vertical-align visibility white-space diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index db978d5b9..15432dcd6 100644 --- a/khtml/css/cssstyleselector.cpp +++ b/khtml/css/cssstyleselector.cpp @@ -257,7 +257,7 @@ CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet, u.setQuery( TQString::null ); u.setRef( TQString::null ); encodedurl.file = u.url(); - int pos = encodedurl.file.tqfindRev('/'); + int pos = encodedurl.file.findRev('/'); encodedurl.path = encodedurl.file; if ( pos > 0 ) { encodedurl.path.truncate( pos ); @@ -327,7 +327,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do if ( readbytes >= 0 ) file[readbytes] = '\0'; - TQString style = TQString::tqfromLatin1( file.data() ); + TQString style = TQString::fromLatin1( file.data() ); if(s) style += s->settingsToCSS(); DOMString str(style); @@ -352,7 +352,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do if ( readbytes >= 0 ) file[readbytes] = '\0'; - TQString style = TQString::tqfromLatin1( file.data() ); + TQString style = TQString::fromLatin1( file.data() ); DOMString str(style); s_quirksSheet = new DOM::CSSStyleSheetImpl(doc); @@ -496,12 +496,12 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e) unsigned int numPseudoProps = 0; // try to sort out most style rules as early as possible. - TQ_UINT16 cssTagId = localNamePart(element->id()); + Q_UINT16 cssTagId = localNamePart(element->id()); int smatch = 0; int schecked = 0; for ( unsigned int i = 0; i < selectors_size; i++ ) { - TQ_UINT16 tag = localNamePart(selectors[i]->tag); + Q_UINT16 tag = localNamePart(selectors[i]->tag); if ( cssTagId == tag || tag == anyLocalName ) { ++schecked; @@ -741,8 +741,8 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e // Cull out any useless layers and also repeat patterns into additional layers. style->adjustBackgroundLayers(); - // Only use slow tqrepaints if we actually have a background image. - // FIXME: We only need to tqinvalidate the fixed regions when scrolling. It's total overkill to + // Only use slow repaints if we actually have a background image. + // FIXME: We only need to invalidate the fixed regions when scrolling. It's total overkill to // prevent the entire view from blitting on a scroll. if (style->hasFixedBackgroundImage() && view) view->useSlowRepaints(); @@ -828,12 +828,12 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e, static void cleanpath(TQString &path) { int pos; - while ( (pos = path.tqfind( "/../" )) != -1 ) { + while ( (pos = path.find( "/../" )) != -1 ) { int prev = 0; if ( pos > 0 ) - prev = path.tqfindRev( "/", pos -1 ); + prev = path.findRev( "/", pos -1 ); // don't remove the host, i.e. http://foo.org/../foo.html - if (prev < 0 || (prev > 3 && path.tqfindRev("://", prev-1) == prev-2)) + if (prev < 0 || (prev > 3 && path.findRev("://", prev-1) == prev-2)) path.remove( pos, 3); else // matching directory found ? @@ -846,9 +846,9 @@ static void cleanpath(TQString &path) // We don't want to waste a function call on the search for the anchor // in the vast majority of cases where there is no "//" in the path. int refPos = -2; - while ( (pos = path.tqfind( "//", pos )) != -1) { + while ( (pos = path.find( "//", pos )) != -1) { if (refPos == -2) - refPos = path.tqfind("#", 0); + refPos = path.find("#", 0); if (refPos > 0 && pos >= refPos) break; @@ -857,7 +857,7 @@ static void cleanpath(TQString &path) else pos += 2; } - while ( (pos = path.tqfind( "/./" )) != -1) + while ( (pos = path.find( "/./" )) != -1) path.remove( pos, 2 ); //kdDebug() << "checkPseudoState " << path << endl; } @@ -871,9 +871,9 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded if( attr.isNull() ) { return PseudoNone; } - TQConstString cu(attr.tqunicode(), attr.length()); + TQConstString cu(attr.unicode(), attr.length()); TQString u = cu.string(); - if ( !u.tqcontains("://") ) { + if ( !u.contains("://") ) { if ( u[0] == '/' ) u = encodedurl.host + u; else if ( u[0] == '#' ) @@ -883,10 +883,10 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded cleanpath( u ); } //completeURL( attr.string() ); - bool tqcontains = KHTMLFactory::vLinks()->tqcontains( u ); - if ( !tqcontains && u.tqcontains('/')==2 ) - tqcontains = KHTMLFactory::vLinks()->tqcontains( u+'/' ); - return tqcontains ? PseudoVisited : PseudoLink; + bool contains = KHTMLFactory::vLinks()->contains( u ); + if ( !contains && u.contains('/')==2 ) + contains = KHTMLFactory::vLinks()->contains( u+'/' ); + return contains ? PseudoVisited : PseudoLink; } // a helper function for parsing nth-arguments @@ -904,7 +904,7 @@ static bool matchNth(int count, const TQString& nth) b = 0; } else { - int n = nth.tqfind('n'); + int n = nth.find('n'); if (n != -1) { if (nth[0] == '-') if (n==1) @@ -917,11 +917,11 @@ static bool matchNth(int count, const TQString& nth) else a = nth.left(n).toInt(); - int p = nth.tqfind('+'); + int p = nth.find('+'); if (p != -1) b = nth.mid(p+1).toInt(); else { - p = nth.tqfind('-'); + p = nth.find('-'); b = -nth.mid(p+1).toInt(); } } @@ -1107,10 +1107,10 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm if (sel->tag != anyQName) { int eltID = e->id(); - TQ_UINT16 localName = localNamePart(eltID); - TQ_UINT16 ns = namespacePart(eltID); - TQ_UINT16 selLocalName = localNamePart(sel->tag); - TQ_UINT16 selNS = namespacePart(sel->tag); + Q_UINT16 localName = localNamePart(eltID); + Q_UINT16 ns = namespacePart(eltID); + Q_UINT16 selLocalName = localNamePart(sel->tag); + Q_UINT16 selNS = namespacePart(sel->tag); if (localName <= ID_LAST_TAG && ns == defaultNamespace) { assert(e->isHTMLElement()); @@ -1158,22 +1158,22 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm // Be smart compare on length first if (sel_len > val_len) return false; // Selector string may not contain spaces - if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.tqfind(' ') != -1) return false; + if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.find(' ') != -1) return false; if (sel_len == val_len) return (caseSensitive && !strcmp(sel->value, value)) || (!caseSensitive && !strcasecmp(sel->value, value)); // else the value is longer and can be a list if ( sel->match == CSSSelector::Class && !e->hasClassList() ) return false; - TQChar* sel_uc = sel->value.tqunicode(); - TQChar* val_uc = value->tqunicode(); + TQChar* sel_uc = sel->value.unicode(); + TQChar* val_uc = value->unicode(); TQConstString sel_str(sel_uc, sel_len); TQConstString val_str(val_uc, val_len); int pos = 0; for ( ;; ) { - pos = val_str.string().tqfind(sel_str.string(), pos, caseSensitive); + pos = val_str.string().find(sel_str.string(), pos, caseSensitive); if ( pos == -1 ) return false; if ( pos == 0 || val_uc[pos-1].isSpace() ) { int endpos = pos + sel_len; @@ -1186,35 +1186,35 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm } case CSSSelector::Contain: { - //kdDebug( 6080 ) << "checking for tqcontains match" << endl; - TQConstString val_str(value->tqunicode(), value->length()); - TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); - return val_str.string().tqcontains(sel_str.string(), caseSensitive); + //kdDebug( 6080 ) << "checking for contains match" << endl; + TQConstString val_str(value->unicode(), value->length()); + TQConstString sel_str(sel->value.unicode(), sel->value.length()); + return val_str.string().contains(sel_str.string(), caseSensitive); } case CSSSelector::Begin: { //kdDebug( 6080 ) << "checking for beginswith match" << endl; - TQConstString val_str(value->tqunicode(), value->length()); - TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); + TQConstString val_str(value->unicode(), value->length()); + TQConstString sel_str(sel->value.unicode(), sel->value.length()); return val_str.string().startsWith(sel_str.string(), caseSensitive); } case CSSSelector::End: { //kdDebug( 6080 ) << "checking for endswith match" << endl; - TQConstString val_str(value->tqunicode(), value->length()); - TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); + TQConstString val_str(value->unicode(), value->length()); + TQConstString sel_str(sel->value.unicode(), sel->value.length()); return val_str.string().endsWith(sel_str.string(), caseSensitive); } case CSSSelector::Hyphen: { //kdDebug( 6080 ) << "checking for hyphen match" << endl; - TQConstString val_str(value->tqunicode(), value->length()); - TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); + TQConstString val_str(value->unicode(), value->length()); + TQConstString sel_str(sel->value.unicode(), sel->value.length()); const TQString& str = val_str.string(); const TQString& selStr = sel_str.string(); if(str.length() < selStr.length()) return false; // Check if str begins with selStr: - if(str.tqfind(selStr, 0, caseSensitive) != 0) return false; + if(str.find(selStr, 0, caseSensitive) != 0) return false; // It does. Check for exact match or following '-': if(str.length() != selStr.length() && str[selStr.length()] != '-') return false; @@ -1557,8 +1557,8 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm elem = static_cast<HTMLElementImpl*>(e); DOMString s = elem->innerText(); TQString selStr = sel->string_arg.string(); -// kdDebug(6080) << ":tqcontains(\"" << selStr << "\")" << " on \"" << s << "\"" << endl; - return s.string().tqcontains(selStr); +// kdDebug(6080) << ":contains(\"" << selStr << "\")" << " on \"" << s << "\"" << endl; + return s.string().contains(selStr); } break; } @@ -1768,7 +1768,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet, // No media implies "all", but if a medialist exists it must // contain our current medium - if( sheet->media() && !sheet->media()->tqcontains( medium ) ) + if( sheet->media() && !sheet->media()->contains( medium ) ) return; // style sheet not applicable for this medium int len = sheet->length(); @@ -1794,7 +1794,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet, //kdDebug( 6080 ) << "@import: Media: " // << import->media()->mediaText().string() << endl; - if( !import->media() || import->media()->tqcontains( medium ) ) + if( !import->media() || import->media()->contains( medium ) ) { CSSStyleSheetImpl *importedSheet = import->styleSheet(); append( importedSheet, medium ); @@ -1809,7 +1809,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet, //kdDebug( 6080 ) << "@media: Media: " // << r->media()->mediaText().string() << endl; - if( ( !r->media() || r->media()->tqcontains( medium ) ) && rules) + if( ( !r->media() || r->media()->contains( medium ) ) && rules) { // Traverse child elements of the @import rule. Since // many elements are not allowed as child we do not use @@ -2079,13 +2079,13 @@ static TQColor colorForCSSValue( int css_value ) KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support bckgrConfig.setGroup("Desktop0"); // Desktop background. - return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background()); + return bckgrConfig.readColorEntry("Color1", &qApp->palette().disabled().background()); } return TQColor(); } #endif - const TQPalette &pal = tqApp->palette(); + const TQPalette &pal = qApp->palette(); TQColor c = pal.color( uicol->group, uicol->role ); #ifndef APPLE_CHANGES if ( uicol->configEntry ) { @@ -2597,7 +2597,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) } case CSS_PROP_UNICODE_BIDI: { - HANDLE_INHERIT_AND_INITIAL(tqunicodeBidi, UnicodeBidi) + HANDLE_INHERIT_AND_INITIAL(unicodeBidi, UnicodeBidi) if(!primitiveValue) break; switch (primitiveValue->getIdent()) { case CSS_VAL_NORMAL: @@ -2772,7 +2772,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) col = colorForCSSValue( ident ); } else if ( primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_RGBCOLOR ) { #ifndef APPLE_CHANGES - if(tqAlpha(primitiveValue->getRGBColorValue())) + if(qAlpha(primitiveValue->getRGBColorValue())) #endif col.setRgb(primitiveValue->getRGBColorValue()); } else { @@ -3241,7 +3241,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) if (size < 0) return; // we never want to get smaller than the minimum font size to keep fonts readable - // do not however maximize zero as that is commonly used for fancy tqlayouting purposes + // do not however maximize zero as that is commonly used for fancy layouting purposes if (size && size < minFontSize) size = minFontSize; //kdDebug( 6080 ) << "computed raw font size: " << size << endl; diff --git a/khtml/css/cssstyleselector.h b/khtml/css/cssstyleselector.h index 5b9946342..23d854bc0 100644 --- a/khtml/css/cssstyleselector.h +++ b/khtml/css/cssstyleselector.h @@ -76,7 +76,7 @@ namespace khtml /** * this class selects a RenderStyle for a given Element based on the - * collection of stylesheets it tqcontains. This is just a virtual base class + * collection of stylesheets it contains. This is just a virtual base class * for specific implementations of the Selector. At the moment only CSSStyleSelector * exists, but someone may wish to implement XSL... */ @@ -136,7 +136,7 @@ namespace khtml bool strictParsing; struct Encodedurl { - TQString host; //also tqcontains protocol + TQString host; //also contains protocol TQString path; TQString file; } encodedurl; @@ -290,7 +290,7 @@ public: unsigned int selector; unsigned int position; - TQ_UINT32 priority; + Q_UINT32 priority; }; /* diff --git a/khtml/css/cssvalues.c b/khtml/css/cssvalues.c index f841c05b0..7368d1869 100644 --- a/khtml/css/cssvalues.c +++ b/khtml/css/cssvalues.c @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.2 */ -/* Command-line: gperf -L ANSI-C -E -c -C -n -o -t -k '*' -NtqfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf */ +/* Command-line: gperf -L ANSI-C -E -c -C -n -o -t -k '*' -NfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ @@ -39,7 +39,7 @@ struct css_value { int id; }; -static const css_value* tqfindValue (register const char *str, register unsigned int len); +static const css_value* findValue (register const char *str, register unsigned int len); /* maximum key range = 2876, duplicates = 0 */ #ifdef __GNUC__ @@ -177,7 +177,7 @@ hash_val (register const char *str, register unsigned int len) __inline #endif const struct css_value * -tqfindValue (register const char *str, register unsigned int len) +findValue (register const char *str, register unsigned int len) { enum { diff --git a/khtml/css/cssvalues.in b/khtml/css/cssvalues.in index ac5f4f276..1ad99c38d 100644 --- a/khtml/css/cssvalues.in +++ b/khtml/css/cssvalues.in @@ -175,7 +175,7 @@ text-top text-bottom top bottom -# HTML tqalignment MIDDLE has no corresponding CSS tqalignment +# HTML alignment MIDDLE has no corresponding CSS alignment -khtml-baseline-middle # # CSS_PROP_TEXT_ALIGN: diff --git a/khtml/css/html4.css b/khtml/css/html4.css index 0829ccab4..c3fd1a347 100644 --- a/khtml/css/html4.css +++ b/khtml/css/html4.css @@ -477,7 +477,7 @@ a:visited:active { color: red; outline: 1px dotted invert; } :before,:after { white-space: pre-line } */ -/* ### use this to tqreplace renderbr +/* ### use this to replace renderbr br:before { content: "\n" } */ @@ -486,27 +486,27 @@ a:visited:active { color: red; outline: 1px dotted invert; } bdo[dir="ltr"] { direction: ltr; - tqunicode-bidi: bidi-override; + unicode-bidi: bidi-override; } bdo[dir="rtl"] { direction: rtl; - tqunicode-bidi: bidi-override; + unicode-bidi: bidi-override; } /* ### this selector seems to be still broken ... - *[dir="ltr"] { direction: ltr; tqunicode-bidi: embed } - *[dir="rtl"] { direction: rtl; tqunicode-bidi: embed } + *[dir="ltr"] { direction: ltr; unicode-bidi: embed } + *[dir="rtl"] { direction: rtl; unicode-bidi: embed } */ /* elements that are block-level in html4 */ -/* ### don't support tqunicode-bidi at the moment +/* ### don't support unicode-bidi at the moment address, blockquote, body, dd, div, dl, dt, fieldset, form, frame, frameset, h1, h2, h3, h4, h5, h6, iframe, noscript, noframes, object, ol, p, ul, applet, center, dir, hr, menu, pre, li, table, tr, thead, tbody, tfoot, col, colgroup, td, th, caption - { tqunicode-bidi: embed } + { unicode-bidi: embed } */ /* end bidi settings */ diff --git a/khtml/css/makeprop b/khtml/css/makeprop index df0f42764..a1a30ac97 100644 --- a/khtml/css/makeprop +++ b/khtml/css/makeprop @@ -23,7 +23,7 @@ # grep "^[^\#]" cssproperties.in > cssproperties.strip -echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n const char *name;\n int id;\n};\n\nstatic const struct props * tqfindProp (register const char *str, register unsigned int len);\n\n%%' > cssproperties.gperf +echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n const char *name;\n int id;\n};\n\nstatic const struct props * findProp (register const char *str, register unsigned int len);\n\n%%' > cssproperties.gperf cat cssproperties.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_PROP_" toupper($0) } while (getline) }' >> cssproperties.gperf echo '%%' >> cssproperties.gperf echo -e '/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSPROPERTIES_H\n#define CSSPROPERTIES_H\n\nDOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;\n' > cssproperties.h @@ -36,7 +36,7 @@ print ""; \ print "#define CSS_PROP_MAX CSS_PROP_Z_INDEX"; \ print "#define CSS_PROP_TOTAL " i \ }' >> cssproperties.h -gperf -a -L 'ANSI-C' -E -C -c -o -t -k '*' -NtqfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf > cssproperties.c || exit 1 +gperf -a -L 'ANSI-C' -E -C -c -o -t -k '*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf > cssproperties.c || exit 1 echo -e '#endif\n' >> cssproperties.h cat cssproperties.strip | awk '{ \ diff --git a/khtml/css/makevalues b/khtml/css/makevalues index 2feedf15c..0f81f1612 100755 --- a/khtml/css/makevalues +++ b/khtml/css/makevalues @@ -24,7 +24,7 @@ # grep "^[^\#]" cssvalues.in > cssvalues.strip -echo -e '%{\n/* This file is automatically generated from cssvalues.in by makevalues, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssvalues.h"\n%}\nstruct css_value {\n const char *name;\n int id;\n};\n\nstatic const css_value* tqfindValue (register const char *str, register unsigned int len);\n\n%%' > cssvalues.gperf +echo -e '%{\n/* This file is automatically generated from cssvalues.in by makevalues, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssvalues.h"\n%}\nstruct css_value {\n const char *name;\n int id;\n};\n\nstatic const css_value* findValue (register const char *str, register unsigned int len);\n\n%%' > cssvalues.gperf cat cssvalues.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_VAL_" toupper($0) } while (getline) }' >> cssvalues.gperf echo '%%' >> cssvalues.gperf echo -e '/* This file is automatically generated from cssvalues.in by @@ -37,7 +37,7 @@ do { gsub("-", "_"); print "#define CSS_VAL_" toupper($0) " " i; i = i + 1 } whi print ""; \ print "#define CSS_VAL_TOTAL " i \ }' >> cssvalues.h -gperf -L 'ANSI-C' -E -c -C -n -o -t -k '*' -NtqfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf > cssvalues.c || exit 1 +gperf -L 'ANSI-C' -E -c -C -n -o -t -k '*' -NfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf > cssvalues.c || exit 1 echo -e '#endif\n' >> cssvalues.h cat cssvalues.strip | awk '{ \ diff --git a/khtml/css/parser.cpp b/khtml/css/parser.cpp index 6cda882ea..c0e6f5869 100644 --- a/khtml/css/parser.cpp +++ b/khtml/css/parser.cpp @@ -210,7 +210,7 @@ using namespace DOM; // // The following file defines the function -// const struct props *tqfindProp(const char *word, int len) +// const struct props *findProp(const char *word, int len) // // with 'props->id' a CSS property in the range from CSS_PROP_MIN to // (and including) CSS_PROP_TOTAL-1 @@ -224,7 +224,7 @@ using namespace DOM; int DOM::getPropertyID(const char *tagStr, int len) { - const struct props *propsPtr = tqfindProp(tagStr, len); + const struct props *propsPtr = findProp(tagStr, len); if (!propsPtr) return 0; @@ -233,7 +233,7 @@ int DOM::getPropertyID(const char *tagStr, int len) static inline int getValueID(const char *tagStr, int len) { - const struct css_value *val = tqfindValue(tagStr, len); + const struct css_value *val = findValue(tagStr, len); if (!val) return 0; diff --git a/khtml/css/parser.y b/khtml/css/parser.y index 88df3cceb..50e558db9 100644 --- a/khtml/css/parser.y +++ b/khtml/css/parser.y @@ -45,7 +45,7 @@ using namespace DOM; // // The following file defines the function -// const struct props *tqfindProp(const char *word, int len) +// const struct props *findProp(const char *word, int len) // // with 'props->id' a CSS property in the range from CSS_PROP_MIN to // (and including) CSS_PROP_TOTAL-1 @@ -59,7 +59,7 @@ using namespace DOM; int DOM::getPropertyID(const char *tagStr, int len) { - const struct props *propsPtr = tqfindProp(tagStr, len); + const struct props *propsPtr = findProp(tagStr, len); if (!propsPtr) return 0; @@ -68,7 +68,7 @@ int DOM::getPropertyID(const char *tagStr, int len) static inline int getValueID(const char *tagStr, int len) { - const struct css_value *val = tqfindValue(tagStr, len); + const struct css_value *val = findValue(tagStr, len); if (!val) return 0; @@ -808,7 +808,7 @@ pseudo: $$->string_arg = domString($3); $$->value = domString($2); } - // used by :tqcontains + // used by :contains | ':' FUNCTION STRING ')' { $$ = new CSSSelector(); $$->match = CSSSelector::PseudoClass; diff --git a/khtml/css/tokenizer.cpp b/khtml/css/tokenizer.cpp index 34a586d49..493a98032 100644 --- a/khtml/css/tokenizer.cpp +++ b/khtml/css/tokenizer.cpp @@ -634,7 +634,7 @@ yy_match: } while ( yy_base[yy_current_state] != 1638 ); -yy_tqfind_action: +yy_find_action: yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ @@ -656,7 +656,7 @@ do_action: /* This label is used only to access EOF actions. */ *yy_cp = yy_hold_char; yy_cp = yy_last_accepting_cpos; yy_current_state = yy_last_accepting_state; - goto yy_tqfind_action; + goto yy_find_action; case 1: YY_RULE_SETUP diff --git a/khtml/css/tokenizer.flex b/khtml/css/tokenizer.flex index 074862a23..3c24d8e07 100644 --- a/khtml/css/tokenizer.flex +++ b/khtml/css/tokenizer.flex @@ -4,8 +4,8 @@ h [0-9a-fA-F] nonascii [\200-\377] -tqunicode \\{h}{1,6}[ \t\r\n\f]? -escape {tqunicode}|\\[ -~\200-\377] +unicode \\{h}{1,6}[ \t\r\n\f]? +escape {unicode}|\\[ -~\200-\377] nmstart [_a-zA-Z]|{nonascii}|{escape} nmchar [_a-zA-Z0-9-]|{nonascii}|{escape} string1 \"([\t !#$%&(-~]|\\{nl}|\'|{nonascii}|{escape})*\" diff --git a/khtml/dom/css_extensions.cpp b/khtml/dom/css_extensions.cpp index 01a47d5f1..23f7739dc 100644 --- a/khtml/dom/css_extensions.cpp +++ b/khtml/dom/css_extensions.cpp @@ -1881,15 +1881,15 @@ void CSS2Properties::setTop( const DOMString &value ) if(impl) ((ElementImpl *)impl)->setAttribute("top", value); } -DOMString CSS2Properties::tqunicodeBidi() const +DOMString CSS2Properties::unicodeBidi() const { if(!impl) return 0; - return ((ElementImpl *)impl)->getAttribute("tqunicodeBidi"); + return ((ElementImpl *)impl)->getAttribute("unicodeBidi"); } void CSS2Properties::setUnicodeBidi( const DOMString &value ) { - if(impl) ((ElementImpl *)impl)->setAttribute("tqunicodeBidi", value); + if(impl) ((ElementImpl *)impl)->setAttribute("unicodeBidi", value); } DOMString CSS2Properties::verticalAlign() const diff --git a/khtml/dom/css_extensions.h b/khtml/dom/css_extensions.h index c236c6a14..a6cdb2149 100644 --- a/khtml/dom/css_extensions.h +++ b/khtml/dom/css_extensions.h @@ -61,7 +61,7 @@ public: /** * If \c azimuthType is \c CSS_IDENT , - * \c identifier tqcontains one of left-side, far-left, + * \c identifier contains one of left-side, far-left, * left, center-left, center, center-right, right, far-right, * right-side, leftwards, rightwards. The empty string if none is * set. @@ -184,8 +184,8 @@ public: /** * If \c horizontalType is \c CSS_IDENT or - * \c CSS_INHERIT , this attribute tqcontains the string - * representation of the ident, otherwise it tqcontains an empty + * \c CSS_INHERIT , this attribute contains the string + * representation of the ident, otherwise it contains an empty * string. * */ @@ -193,8 +193,8 @@ public: /** * If \c verticalType is \c CSS_IDENT or - * \c CSS_INHERIT , this attribute tqcontains the string - * representation of the ident, otherwise it tqcontains an empty + * \c CSS_INHERIT , this attribute contains the string + * representation of the ident, otherwise it contains an empty * string. The value is \c "center" if only the * horizontalIdentifier has been set. The value is * \c "inherit" if the horizontalIdentifier is @@ -572,8 +572,8 @@ public: * A code defining the type of the property. It would one of * \c CSS_UNKNOWN or \c CSS_INHERIT . If * the type is \c CSS_UNKNOWN , then \c uris - * tqcontains a list of URIs and \c predefinedCursor - * tqcontains an ident. Setting this attribute from + * contains a list of URIs and \c predefinedCursor + * contains an ident. Setting this attribute from * \c CSS_INHERIT to \c CSS_UNKNOWN will set the * \c predefinedCursor to \c "auto" . * @@ -654,7 +654,7 @@ public: void setUri( const DOM::DOMString & ); /** - * This attribute tqcontains a list of strings for the format CSS + * This attribute contains a list of strings for the format CSS * function. * */ @@ -776,8 +776,8 @@ public: /** * If \c width is \c CSS_IDENT or - * \c CSS_INHERIT , this attribute tqcontains the string - * representation of the ident, otherwise it tqcontains an empty + * \c CSS_INHERIT , this attribute contains the string + * representation of the ident, otherwise it contains an empty * string. * */ @@ -2424,8 +2424,8 @@ public: /** * See the <a - * href="http://www.w3.org/TR/REC-CSS2/tables.html#propdef-table-tqlayout"> - * table-tqlayout property definition </a> in CSS2. + * href="http://www.w3.org/TR/REC-CSS2/tables.html#propdef-table-layout"> + * table-layout property definition </a> in CSS2. * */ DOM::DOMString tableLayout() const; @@ -2515,14 +2515,14 @@ public: /** * See the <a - * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-tqunicode-bidi"> - * tqunicode-bidi property definition </a> in CSS2. + * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-unicode-bidi"> + * unicode-bidi property definition </a> in CSS2. * */ - DOM::DOMString tqunicodeBidi() const; + DOM::DOMString unicodeBidi() const; /** - * see tqunicodeBidi + * see unicodeBidi */ void setUnicodeBidi( const DOM::DOMString & ); diff --git a/khtml/dom/css_rule.h b/khtml/dom/css_rule.h index 1a737933d..5f27e8f8a 100644 --- a/khtml/dom/css_rule.h +++ b/khtml/dom/css_rule.h @@ -111,7 +111,7 @@ public: void setCssText( const DOM::DOMString & ); /** - * The style sheet that tqcontains this rule. + * The style sheet that contains this rule. * */ CSSStyleSheet parentStyleSheet() const; @@ -299,7 +299,7 @@ public: * Used to insert a new rule into the media block. * * @param rule The parsable text representing the rule. For rule - * sets this tqcontains both the selector and the style declaration. + * sets this contains both the selector and the style declaration. * For at-rules, this specifies both the at-identifier and the * rule content. * diff --git a/khtml/dom/css_stylesheet.h b/khtml/dom/css_stylesheet.h index d18ad6ec7..33b380ef9 100644 --- a/khtml/dom/css_stylesheet.h +++ b/khtml/dom/css_stylesheet.h @@ -247,7 +247,7 @@ public: * now becomes part of the cascade. * * @param rule The parsable text representing the rule. For rule - * sets this tqcontains both the selector and the style declaration. + * sets this contains both the selector and the style declaration. * For at-rules, this specifies both the at-identifier and the * rule content. * @@ -425,7 +425,7 @@ public: * @param newMedium The new medium to add. * * @exception DOMException - * INVALID_CHARACTER_ERR: If the medium tqcontains characters that are + * INVALID_CHARACTER_ERR: If the medium contains characters that are * invalid in the underlying style language. * * NO_MODIFICATION_ALLOWED_ERR: Raised if this list is readonly. diff --git a/khtml/dom/css_value.cpp b/khtml/dom/css_value.cpp index 20faff88a..de450e861 100644 --- a/khtml/dom/css_value.cpp +++ b/khtml/dom/css_value.cpp @@ -126,7 +126,7 @@ void CSSStyleDeclaration::setProperty( const DOMString &propName, const DOMStrin if (!id) return; bool important = false; TQString str = priority.string(); - if (str.tqfind("important", 0, false) != -1) + if (str.find("important", 0, false) != -1) important = true; static_cast<CSSStyleDeclarationImpl *>(impl)->setProperty( id, value, important ); @@ -500,17 +500,17 @@ RGBColor::~RGBColor() CSSPrimitiveValue RGBColor::red() const { - return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqRed(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); + return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qRed(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); } CSSPrimitiveValue RGBColor::green() const { - return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqGreen(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); + return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qGreen(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); } CSSPrimitiveValue RGBColor::blue() const { - return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqBlue(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); + return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qBlue(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); } diff --git a/khtml/dom/css_value.h b/khtml/dom/css_value.h index d31155f95..5d4a043c7 100644 --- a/khtml/dom/css_value.h +++ b/khtml/dom/css_value.h @@ -99,7 +99,7 @@ public: unsigned long length() const; /** - * The CSS rule that tqcontains this declaration block. + * The CSS rule that contains this declaration block. * */ CSSRule parentRule() const; @@ -633,7 +633,7 @@ class RectImpl; /** * The \c Rect interface is used to represent any <a - * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-tqshape"> + * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-shape"> * rect </a> value. This interface reflects the values in the * underlying style property. Hence, modifications made through this * interface modify the style property. diff --git a/khtml/dom/dom2_events.h b/khtml/dom/dom2_events.h index 06c008818..285a0c10e 100644 --- a/khtml/dom/dom2_events.h +++ b/khtml/dom/dom2_events.h @@ -70,8 +70,8 @@ public: * This method is called whenever an event occurs of the type for which the * EventListener interface was registered. Parameters * - * @param evt The Event tqcontains contextual information about the event. It - * also tqcontains the stopPropagation and preventDefault methods which are + * @param evt The Event contains contextual information about the event. It + * also contains the stopPropagation and preventDefault methods which are * used in determining the event's flow and default action. * */ diff --git a/khtml/dom/dom2_traversal.h b/khtml/dom/dom2_traversal.h index 59cec9016..d2d3abf48 100644 --- a/khtml/dom/dom2_traversal.h +++ b/khtml/dom/dom2_traversal.h @@ -533,7 +533,7 @@ protected: // Document /** - * \c DocumentTraversal tqcontains methods that creates + * \c DocumentTraversal contains methods that creates * Iterators to traverse a node and its children in document order * (depth first, pre-order traversal, which is equivalent to the order * in which the start tags occur in the text representation of the diff --git a/khtml/dom/dom2_views.h b/khtml/dom/dom2_views.h index 3af4b0ad0..862cb9ef2 100644 --- a/khtml/dom/dom2_views.h +++ b/khtml/dom/dom2_views.h @@ -69,7 +69,7 @@ public: * @param pseudoElt The pseudo-element or null if none. * * @return The computed style. The CSSStyleDeclaration is read-only and - * tqcontains only absolute values. + * contains only absolute values. */ CSSStyleDeclaration getComputedStyle(const Element &elt, const DOMString &pseudoElt); diff --git a/khtml/dom/dom_doc.cpp b/khtml/dom/dom_doc.cpp index 088a7a94a..0ff123444 100644 --- a/khtml/dom/dom_doc.cpp +++ b/khtml/dom/dom_doc.cpp @@ -112,8 +112,8 @@ HTMLDocument DOMImplementation::createHTMLDocument( const DOMString& title ) r->open(); - r->write(TQString::tqfromLatin1("<HTML><HEAD><TITLE>") + title.string() + - TQString::tqfromLatin1("</TITLE></HEAD>")); + r->write(TQString::fromLatin1("<HTML><HEAD><TITLE>") + title.string() + + TQString::fromLatin1("</TITLE></HEAD>")); return r; } diff --git a/khtml/dom/dom_doc.h b/khtml/dom/dom_doc.h index fd64253f5..9a5331295 100644 --- a/khtml/dom/dom_doc.h +++ b/khtml/dom/dom_doc.h @@ -122,7 +122,7 @@ public: * @return A new DocumentType node with Node.ownerDocument set to null. * * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified qualified name tqcontains + * INVALID_CHARACTER_ERR: Raised if the specified qualified name contains * an illegal character. * * NAMESPACE_ERR: Raised if the qualifiedName is malformed. @@ -150,7 +150,7 @@ public: * @return A new Document object. * * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified qualified name tqcontains + * INVALID_CHARACTER_ERR: Raised if the specified qualified name contains * an illegal character. * * NAMESPACE_ERR: Raised if the qualifiedName is malformed, if the @@ -235,7 +235,7 @@ protected: * * Since elements, text nodes, comments, processing instructions, * etc. cannot exist outside the context of a \c Document - * , the \c Document interface also tqcontains the factory + * , the \c Document interface also contains the factory * methods needed to create these objects. The \c Node * objects created have a \c ownerDocument attribute which * associates them with the \c Document within whose @@ -309,7 +309,7 @@ public: * @return A new \c Element object. * * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified name tqcontains an + * INVALID_CHARACTER_ERR: Raised if the specified name contains an * invalid character. * */ @@ -326,7 +326,7 @@ public: * @return A new Element object with the following attributes: * * @exception INVALID_CHARACTER_ERR Raised if the specified qualified name - * tqcontains an illegal character. + * contains an illegal character. * * @exception NAMESPACE_ERR Raised if the qualifiedName is malformed, if * the qualifiedName has a prefix and the namespaceURI is null, or if the @@ -411,7 +411,7 @@ public: * @return A new \c Attr object. * * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified name tqcontains an + * INVALID_CHARACTER_ERR: Raised if the specified name contains an * invalid character. * */ @@ -436,7 +436,7 @@ public: * Node.nodeValue - the empty string * * @exception INVALID_CHARACTER_ERR Raised if the specified qualified name - * tqcontains an illegal character. + * contains an illegal character. * * @exception NAMESPACE_ERR Raised if the qualifiedName is malformed, if * the qualifiedName has a prefix and the namespaceURI is null, if the @@ -456,7 +456,7 @@ public: * @return The new \c EntityReference object. * * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified name tqcontains an + * INVALID_CHARACTER_ERR: Raised if the specified name contains an * invalid character. * * NOT_SUPPORTED_ERR: Raised if this document is an HTML diff --git a/khtml/dom/dom_element.h b/khtml/dom/dom_element.h index a9f2f69a8..e6cc11877 100644 --- a/khtml/dom/dom_element.h +++ b/khtml/dom/dom_element.h @@ -148,7 +148,7 @@ public: /** * On retrieval, the value of the attribute is returned as a - * string. Character and general entity references are tqreplaced + * string. Character and general entity references are replaced * with their values. * * On setting, this creates a \c Text node with the @@ -188,10 +188,10 @@ class DOMString; * </elementExample> * * When represented using DOM, the top node is an \c Element - * node for "elementExample", which tqcontains two + * node for "elementExample", which contains two * child \c Element nodes, one for "subelement1" * and one for "subelement2". "subelement1" - * tqcontains no child nodes. + * contains no child nodes. * * Elements may have attributes associated with them; since the * \c Element interface inherits from \c Node @@ -257,7 +257,7 @@ public: * recognized as an entity reference) is treated as literal text, * and needs to be appropriately escaped by the implementation * when it is written out. In order to assign an attribute value - * that tqcontains entity references, the user must create an + * that contains entity references, the user must create an * \c Attr node plus any \c Text and * \c EntityReference nodes, build the appropriate subtree, * and use \c setAttributeNode to assign it as the @@ -270,7 +270,7 @@ public: * @return * * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified name tqcontains an + * INVALID_CHARACTER_ERR: Raised if the specified name contains an * invalid character. * * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. @@ -280,7 +280,7 @@ public: /** * Removes an attribute by name. If the removed attribute has a - * default value it is immediately tqreplaced. + * default value it is immediately replaced. * * @param name The name of the attribute to remove. * @@ -306,12 +306,12 @@ public: /** * Adds a new attribute. If an attribute with that name is already - * present in the element, it is tqreplaced by the new one. + * present in the element, it is replaced by the new one. * * @param newAttr The \c Attr node to add to the * attribute list. * - * @return If the \c newAttr attribute tqreplaces an + * @return If the \c newAttr attribute replaces an * existing attribute with the same name, the previously existing * \c Attr node is returned, otherwise \c null * is returned. @@ -336,7 +336,7 @@ public: * * @param oldAttr The \c Attr node to remove from the * attribute list. If the removed \c Attr has a - * default value it is immediately tqreplaced. + * default value it is immediately replaced. * * @return The \c Attr node that was removed. * @@ -408,7 +408,7 @@ public: * as it is being set. So any markup (such as syntax to be recognized as an * entity reference) is treated as literal text, and needs to be * appropriately escaped by the implementation when it is written out. In - * order to assign an attribute value that tqcontains entity references, the + * order to assign an attribute value that contains entity references, the * user must create an Attr node plus any Text and EntityReference nodes, * build the appropriate subtree, and use setAttributeNodeNS or * setAttributeNode to assign it as the value of an attribute. @@ -424,7 +424,7 @@ public: * @param value The value to set in string form. * * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified qualified name tqcontains + * INVALID_CHARACTER_ERR: Raised if the specified qualified name contains * an illegal character. * * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. @@ -444,7 +444,7 @@ public: * Introduced in DOM Level 2 * * Removes an attribute by local name and namespace URI. If the removed - * attribute has a default value it is immediately tqreplaced. The replacing + * attribute has a default value it is immediately replaced. The replacing * attribute has the same namespace URI and local name, as well as the * original prefix. * @@ -480,15 +480,15 @@ public: * Introduced in DOM Level 2 * * Adds a new attribute. If an attribute with that local name and that - * namespace URI is already present in the element, it is tqreplaced by the + * namespace URI is already present in the element, it is replaced by the * new one. * * HTML-only DOM implementations do not need to implement this method. * * @param newAttr The Attr node to add to the attribute list. * - * @return If the newAttr attribute tqreplaces an existing attribute with the - * same local name and namespace URI, the tqreplaced Attr node is returned, + * @return If the newAttr attribute replaces an existing attribute with the + * same local name and namespace URI, the replaced Attr node is returned, * otherwise null is returned. * * @exception DOMException diff --git a/khtml/dom/dom_node.cpp b/khtml/dom/dom_node.cpp index 90e6fa032..9971bdb00 100644 --- a/khtml/dom/dom_node.cpp +++ b/khtml/dom/dom_node.cpp @@ -266,11 +266,11 @@ Node Node::insertBefore( const Node &newChild, const Node &refChild ) return r; } -Node Node::tqreplaceChild( const Node &newChild, const Node &oldChild ) +Node Node::replaceChild( const Node &newChild, const Node &oldChild ) { if (!impl) throw DOMException(DOMException::NOT_FOUND_ERR); int exceptioncode = 0; - impl->tqreplaceChild( newChild.impl, oldChild.impl, exceptioncode ); + impl->replaceChild( newChild.impl, oldChild.impl, exceptioncode ); if (exceptioncode) throw DOMException(exceptioncode); if (newChild.impl && !newChild.impl->closed()) newChild.impl->close(); diff --git a/khtml/dom/dom_node.h b/khtml/dom/dom_node.h index 4f8b23e0c..37889eec2 100644 --- a/khtml/dom/dom_node.h +++ b/khtml/dom/dom_node.h @@ -104,9 +104,9 @@ public: * @param arg A node to store in a named node map. The node will * later be accessible using the value of the \c nodeName * attribute of the node. If a node with that name is - * already present in the map, it is tqreplaced by the new one. + * already present in the map, it is replaced by the new one. * - * @return If the new \c Node tqreplaces an existing + * @return If the new \c Node replaces an existing * node with the same name the previously existing \c Node * is returned, otherwise \c null is returned. * @@ -129,7 +129,7 @@ public: /** * Removes a node specified by name. If the removed node is an * \c Attr with a default value it is immediately - * tqreplaced. + * replaced. * * @param name The name of a node to remove. * @@ -178,13 +178,13 @@ public: * * Adds a node using its namespaceURI and localName. If a node with that * namespace URI and that local name is already present in this map, it is - * tqreplaced by the new one. + * replaced by the new one. * HTML-only DOM implementations do not need to implement this method. * * @param arg A node to store in this map. The node will later be * accessible using the value of its namespaceURI and localName attributes. * - * @return If the new Node tqreplaces an existing node the tqreplaced Node is + * @return If the new Node replaces an existing node the replaced Node is * returned, otherwise null is returned. * * @exception DOMException @@ -203,7 +203,7 @@ public: * Introduced in DOM Level 2 * * Removes a node specified by local name and namespace URI. A removed - * attribute may be known to have a default value when this map tqcontains + * attribute may be known to have a default value when this map contains * the attributes attached to an element, as returned by the attributes * attribute of the Node interface. If so, an attribute immediately appears * containing the default value as well as the corresponding namespace URI, @@ -442,7 +442,7 @@ public: Node parentNode() const; /** - * A \c NodeList that tqcontains all children of this + * A \c NodeList that contains all children of this * node. If there are no children, this is a \c NodeList * containing no nodes. The content of the returned * \c NodeList is "live" in the sense that, for @@ -545,9 +545,9 @@ public: * * @param newChild The new node to put in the child list. * - * @param oldChild The node being tqreplaced in the list. + * @param oldChild The node being replaced in the list. * - * @return The node tqreplaced. + * @return The node replaced. * * @exception DOMException * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that @@ -565,7 +565,7 @@ public: * child of this node. * */ - Node tqreplaceChild ( const Node &newChild, const Node &oldChild ); + Node replaceChild ( const Node &newChild, const Node &oldChild ); /** * Removes the child node indicated by \c oldChild @@ -630,7 +630,7 @@ public: * Cloning an \c Element copies all attributes and * their values, including those generated by the XML processor to * represent defaulted attributes, but this method does not copy - * any text it tqcontains unless it is a deep clone, since the text + * any text it contains unless it is a deep clone, since the text * is contained in a child \c Text node. Cloning any * other type of node simply returns a copy of this node. * @@ -657,7 +657,7 @@ public: * [XPointer] lookups) that depend on a particular document tree structure * are to be used. * - * Note: In cases where the document tqcontains CDATASections, the normalize + * Note: In cases where the document contains CDATASections, the normalize * operation alone may not be sufficient, since XPointers do not * differentiate between Text nodes and CDATASection nodes. */ @@ -722,7 +722,7 @@ public: * see prefix * * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified prefix tqcontains an + * INVALID_CHARACTER_ERR: Raised if the specified prefix contains an * illegal character. * * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. @@ -770,7 +770,7 @@ public: * @see textContent * * On setting, any possible children this node may have are removed and, if the new - * string is not empty or null, tqreplaced by a single Text node containing the string this attribute is set to. + * string is not empty or null, replaced by a single Text node containing the string this attribute is set to. * No parsing is performed, the input string is taken as pure textual content. * * @exception DOMException @@ -801,7 +801,7 @@ public: * @param type The event type for which the user is registering * * @param listener The listener parameter takes an interface implemented by - * the user which tqcontains the methods to be called when the event occurs. + * the user which contains the methods to be called when the event occurs. * * @param useCapture If true, useCapture indicates that the user wishes to * initiate capture. After initiating capture, all events of the specified @@ -875,7 +875,7 @@ public: * not part of the DOM. * @returns the element id, in case this is an element, 0 otherwise */ - TQ_UINT32 elementId() const; + Q_UINT32 elementId() const; /** * tests if this Node is 0. Useful especially, if casting to a derived diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp index 2108d872f..14bdc2613 100644 --- a/khtml/dom/dom_string.cpp +++ b/khtml/dom/dom_string.cpp @@ -39,7 +39,7 @@ DOMString::DOMString(const TQString &str) return; } - impl = new DOMStringImpl( str.tqunicode(), str.length() ); + impl = new DOMStringImpl( str.unicode(), str.length() ); impl->ref(); } @@ -136,7 +136,7 @@ const TQChar &DOMString::operator [](unsigned int i) const return *(impl->s+i); } -int DOMString::tqfind(const TQChar c, int start) const +int DOMString::find(const TQChar c, int start) const { unsigned int l = start; if(!impl || l >= impl->l ) return -1; @@ -193,10 +193,10 @@ bool DOMString::percentage(int &_percentage) const return true; } -TQChar *DOMString::tqunicode() const +TQChar *DOMString::unicode() const { if(!impl) return 0; - return impl->tqunicode(); + return impl->unicode(); } TQString DOMString::string() const @@ -225,8 +225,8 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs ) { if ( as.length() != bs.length() ) return true; - const TQChar *a = as.tqunicode(); - const TQChar *b = bs.tqunicode(); + const TQChar *a = as.unicode(); + const TQChar *b = bs.unicode(); if ( a == b ) return false; if ( !( a && b ) ) return true; int l = as.length(); @@ -239,7 +239,7 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs ) bool DOM::strcasecmp( const DOMString &as, const char* bs ) { - const TQChar *a = as.tqunicode(); + const TQChar *a = as.unicode(); int l = as.length(); if ( !bs ) return ( l != 0 ); while ( l-- ) { @@ -265,7 +265,7 @@ bool DOM::operator==( const DOMString &a, const DOMString &b ) if( l != b.length() ) return false; - if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar))) + if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar))) return true; return false; } @@ -276,7 +276,7 @@ bool DOM::operator==( const DOMString &a, const TQString &b ) if( l != b.length() ) return false; - if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar))) + if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar))) return true; return false; } @@ -291,7 +291,7 @@ bool DOM::operator==( const DOMString &a, const char *b ) const TQChar *aptr = aimpl->s; while ( alen-- ) { unsigned char c = *b++; - if ( !c || ( *aptr++ ).tqunicode() != c ) + if ( !c || ( *aptr++ ).unicode() != c ) return false; } } diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h index 137830b1a..3fe725f68 100644 --- a/khtml/dom/dom_string.h +++ b/khtml/dom/dom_string.h @@ -78,7 +78,7 @@ public: */ const TQChar &operator [](unsigned int i) const; - int tqfind(const TQChar c, int start = 0) const; + int find(const TQChar c, int start = 0) const; uint length() const; void truncate( unsigned int len ); @@ -97,7 +97,7 @@ public: */ DOMString upper() const; - TQChar *tqunicode() const; + TQChar *unicode() const; TQString string() const; int toInt() const; diff --git a/khtml/dom/dom_text.cpp b/khtml/dom/dom_text.cpp index 146791d7f..af4584410 100644 --- a/khtml/dom/dom_text.cpp +++ b/khtml/dom/dom_text.cpp @@ -131,13 +131,13 @@ void CharacterData::deleteData( const unsigned long offset, const unsigned long throw DOMException( exceptioncode ); } -void CharacterData::tqreplaceData( const unsigned long offset, const unsigned long count, const DOMString &arg ) +void CharacterData::replaceData( const unsigned long offset, const unsigned long count, const DOMString &arg ) { if (!impl) return; // ### enable throw DOMException(DOMException::NOT_FOUND_ERR); int exceptioncode = 0; - ((CharacterDataImpl *)impl)->tqreplaceData(offset, count, arg, exceptioncode); + ((CharacterDataImpl *)impl)->replaceData(offset, count, arg, exceptioncode); if ( exceptioncode ) throw DOMException( exceptioncode ); } diff --git a/khtml/dom/dom_text.h b/khtml/dom/dom_text.h index c5db2ed4c..c6f92fb1d 100644 --- a/khtml/dom/dom_text.h +++ b/khtml/dom/dom_text.h @@ -183,15 +183,15 @@ public: * * @param offset The offset from which to start replacing. * - * @param count The number of characters to tqreplace. If the sum of + * @param count The number of characters to replace. If the sum of * \c offset and \c count exceeds * \c length , then all characters to the end of the data are - * tqreplaced (i.e., the effect is the same as a \c remove + * replaced (i.e., the effect is the same as a \c remove * method call with the same range, followed by an * \c append method invocation). * * @param arg The \c DOMString with which the range - * must be tqreplaced. + * must be replaced. * * @return * @@ -203,7 +203,7 @@ public: * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. * */ - void tqreplaceData ( const unsigned long offset, const unsigned long count, const DOMString &arg ); + void replaceData ( const unsigned long offset, const unsigned long count, const DOMString &arg ); protected: CharacterData(CharacterDataImpl *i); @@ -285,9 +285,9 @@ public: /** * Breaks this \c Text node into two Text nodes at the * specified offset, keeping both in the tree as siblings. This - * node then only tqcontains all the content up to the \c offset + * node then only contains all the content up to the \c offset * point. And a new \c Text node, which is - * inserted as the next sibling of this node, tqcontains all the + * inserted as the next sibling of this node, contains all the * content at and after the \c offset point. * * @param offset The offset at which to split, starting from 0. diff --git a/khtml/dom/dom_xml.h b/khtml/dom/dom_xml.h index 747262cb8..12e70d9e5 100644 --- a/khtml/dom/dom_xml.h +++ b/khtml/dom/dom_xml.h @@ -89,7 +89,7 @@ class DOMString; * been left for a later Level of the DOM specification. * * The \c nodeName attribute that is inherited from - * \c Node tqcontains the name of the entity. + * \c Node contains the name of the entity. * * An XML processor may choose to completely expand entities before * the structure model is passed to the DOM; in this case there will @@ -99,21 +99,21 @@ class DOMString; * process entity declarations made in the external subset or declared * in external parameter entities. This means that parsed entities * declared in the external subset need not be expanded by some - * classes of applications, and that the tqreplacement value of the - * entity may not be available. When the tqreplacement value is + * classes of applications, and that the replacement value of the + * entity may not be available. When the replacement value is * available, the corresponding \c Entity node's child - * list represents the structure of that tqreplacement text. Otherwise, + * list represents the structure of that replacement text. Otherwise, * the child list is empty. * * The resolution of the children of the \c Entity (the - * tqreplacement value) may be lazily evaluated; actions by the user + * replacement value) may be lazily evaluated; actions by the user * (such as calling the \c childNodes method on the * \c Entity Node) are assumed to trigger the evaluation. * * The DOM Level 1 does not support editing \c Entity * nodes; if a user wants to make changes to the contents of an * \c Entity , every related \c EntityReference node - * has to be tqreplaced in the structure model by a clone of the + * has to be replaced in the structure model by a clone of the * \c Entity 's contents, and then the desired changes must be * made to each of those clones instead. All the descendants of an * \c Entity node are readonly. @@ -178,7 +178,7 @@ protected: * \c EntityReference are readonly. * * The resolution of the children of the \c EntityReference - * (the tqreplacement value of the referenced \c Entity + * (the replacement value of the referenced \c Entity * ) may be lazily evaluated; actions by the user (such as * calling the \c childNodes method on the * \c EntityReference node) are assumed to trigger the diff --git a/khtml/dom/html_base.h b/khtml/dom/html_base.h index 9811b1ea4..8a1a2510c 100644 --- a/khtml/dom/html_base.h +++ b/khtml/dom/html_base.h @@ -286,7 +286,7 @@ public: /** * Introduced in DOM Level 2 * - * Returns the document this frame tqcontains, if there is any and + * Returns the document this frame contains, if there is any and * it is available, a Null document otherwise. The attribute is * read-only. * @@ -513,7 +513,7 @@ public: /** * Introduced in DOM Level 2 * - * Returns the document this iframe tqcontains, if there is any and + * Returns the document this iframe contains, if there is any and * it is available, a Null document otherwise. The attribute is * read-only. * diff --git a/khtml/dom/html_block.h b/khtml/dom/html_block.h index e57c311cd..43be3660d 100644 --- a/khtml/dom/html_block.h +++ b/khtml/dom/html_block.h @@ -105,7 +105,7 @@ public: ~HTMLDivElement(); /** - * Horizontal text tqalignment. See the <a + * Horizontal text alignment. See the <a * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -231,7 +231,7 @@ public: ~HTMLHeadingElement(); /** - * Horizontal text tqalignment. See the <a + * Horizontal text alignment. See the <a * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -272,7 +272,7 @@ public: ~HTMLParagraphElement(); /** - * Horizontal text tqalignment. See the <a + * Horizontal text alignment. See the <a * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. diff --git a/khtml/dom/html_document.h b/khtml/dom/html_document.h index 8b7211cf9..677251e78 100644 --- a/khtml/dom/html_document.h +++ b/khtml/dom/html_document.h @@ -128,7 +128,7 @@ public: DOMString URL() const; /** - * The element that tqcontains the content for the document. In + * The element that contains the content for the document. In * documents with \c BODY contents, returns the * \c BODY element, and in frameset documents, this returns * the outermost \c FRAMESET element. @@ -187,7 +187,7 @@ public: * A collection of all the anchor ( \c A ) elements in * a document with a value for the \c name attribute. * Note. For reasons of backwards compatibility, the returned set - * of anchors only tqcontains those anchors created with the + * of anchors only contains those anchors created with the * \c name attribute, not those created with the \c id * attribute. * @@ -211,7 +211,7 @@ public: /** * Note. This method and the ones following allow a user to add to - * or tqreplace the structure model of a document using strings of + * or replace the structure model of a document using strings of * unparsed HTML. At the time of writing alternate methods for * providing similar functionality for both HTML and XML documents * were being considered. The following methods may be deprecated diff --git a/khtml/dom/html_element.cpp b/khtml/dom/html_element.cpp index 0063985ea..0a2c15e53 100644 --- a/khtml/dom/html_element.cpp +++ b/khtml/dom/html_element.cpp @@ -177,7 +177,7 @@ HTMLCollection HTMLElement::all() const void HTMLElement::assignOther( const Node &other, int elementId ) { - if (other.elementId() != static_cast<TQ_UINT32>(elementId)) { + if (other.elementId() != static_cast<Q_UINT32>(elementId)) { if ( impl ) impl->deref(); impl = 0; } else { diff --git a/khtml/dom/html_form.h b/khtml/dom/html_form.h index e7ca21fdd..0623e421b 100644 --- a/khtml/dom/html_form.h +++ b/khtml/dom/html_form.h @@ -341,7 +341,7 @@ class HTMLInputElementImpl; * Form control. Note. Depending upon the environment the page is * being viewed, the value property may be read-only for the file * upload input type. For the "password" input type, the actual value - * returned may be tqmasked to prevent unauthorized use. See the <a + * returned may be masked to prevent unauthorized use. See the <a * href="http://www.w3.org/TR/REC-html40/interact/forms.html#edef-INPUT"> * INPUT element definition </a> in HTML 4.0. * @@ -798,7 +798,7 @@ public: void setAccessKey( const DOMString & ); /** - * Text tqalignment relative to \c FIELDSET . See the <a + * Text alignment relative to \c FIELDSET . See the <a * href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-align-LEGEND"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. diff --git a/khtml/dom/html_head.h b/khtml/dom/html_head.h index b1b871f0b..e8dc52d21 100644 --- a/khtml/dom/html_head.h +++ b/khtml/dom/html_head.h @@ -247,7 +247,7 @@ public: class HTMLMetaElementImpl; /** - * This tqcontains generic meta-information about the document. See the + * This contains generic meta-information about the document. See the * <a * href="http://www.w3.org/TR/REC-html40/struct/global.html#edef-META"> * META element definition </a> in HTML 4.0. diff --git a/khtml/dom/html_image.cpp b/khtml/dom/html_image.cpp index a5cdb3b71..f7c9dac26 100644 --- a/khtml/dom/html_image.cpp +++ b/khtml/dom/html_image.cpp @@ -122,7 +122,7 @@ void HTMLAreaElement::setNoHref( bool _noHref ) } } -DOMString HTMLAreaElement::tqshape() const +DOMString HTMLAreaElement::shape() const { if(!impl) return DOMString(); return ((ElementImpl *)impl)->getAttribute(ATTR_SHAPE); diff --git a/khtml/dom/html_image.h b/khtml/dom/html_image.h index bfd854b69..9f30aaa14 100644 --- a/khtml/dom/html_image.h +++ b/khtml/dom/html_image.h @@ -90,7 +90,7 @@ public: /** * Comma-separated list of lengths, defining an active region - * tqgeometry. See also \c tqshape for the tqshape of the + * geometry. See also \c shape for the shape of the * region. See the <a * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-coords"> * coords attribute definition </a> in HTML 4.0. @@ -131,16 +131,16 @@ public: void setNoHref( bool ); /** - * The tqshape of the active area. The coordinates are given by + * The shape of the active area. The coordinates are given by * \c coords . See the <a - * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape"> - * tqshape attribute definition </a> in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape"> + * shape attribute definition </a> in HTML 4.0. * */ - DOMString tqshape() const; + DOMString shape() const; /** - * see tqshape + * see shape */ void setShape( const DOMString & ); diff --git a/khtml/dom/html_inline.cpp b/khtml/dom/html_inline.cpp index 9f40da2fb..568761685 100644 --- a/khtml/dom/html_inline.cpp +++ b/khtml/dom/html_inline.cpp @@ -148,7 +148,7 @@ void HTMLAnchorElement::setRev( const DOMString &value ) if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_REV, value); } -DOMString HTMLAnchorElement::tqshape() const +DOMString HTMLAnchorElement::shape() const { if(!impl) return DOMString(); return ((ElementImpl *)impl)->getAttribute(ATTR_SHAPE); diff --git a/khtml/dom/html_inline.h b/khtml/dom/html_inline.h index 9db17efb4..6c1b2d2a2 100644 --- a/khtml/dom/html_inline.h +++ b/khtml/dom/html_inline.h @@ -89,7 +89,7 @@ public: /** * Comma-separated list of lengths, defining an active region - * tqgeometry. See also \c tqshape for the tqshape of the + * geometry. See also \c shape for the shape of the * region. See the <a * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-coords"> * coords attribute definition </a> in HTML 4.0. @@ -168,16 +168,16 @@ public: void setRev( const DOMString & ); /** - * The tqshape of the active area. The coordinates are given by + * The shape of the active area. The coordinates are given by * \c coords . See the <a - * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape"> - * tqshape attribute definition </a> in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape"> + * shape attribute definition </a> in HTML 4.0. * */ - DOMString tqshape() const; + DOMString shape() const; /** - * see tqshape + * see shape */ void setShape( const DOMString & ); diff --git a/khtml/dom/html_misc.h b/khtml/dom/html_misc.h index 0dd9a9815..bcfa09495 100644 --- a/khtml/dom/html_misc.h +++ b/khtml/dom/html_misc.h @@ -169,7 +169,7 @@ public: /** * This method retrieves a \c Node using a name. It * first searches for a \c Node with a matching - * \c id attribute. If it doesn't tqfind one, it then searches + * \c id attribute. If it doesn't find one, it then searches * for a \c Node with a matching \c name * attribute, but only on those elements that are allowed a name * attribute. diff --git a/khtml/dom/html_object.h b/khtml/dom/html_object.h index 5c9b4ad29..9195a40f7 100644 --- a/khtml/dom/html_object.h +++ b/khtml/dom/html_object.h @@ -535,7 +535,7 @@ public: /** * Introduced in DOM Level 2 * - * Returns the document this iframe tqcontains, if there is any and + * Returns the document this iframe contains, if there is any and * it is available, a Null document otherwise. The attribute is * read-only. * diff --git a/khtml/dom/html_table.h b/khtml/dom/html_table.h index 69d163723..c3a364d47 100644 --- a/khtml/dom/html_table.h +++ b/khtml/dom/html_table.h @@ -63,7 +63,7 @@ public: ~HTMLTableCaptionElement(); /** - * Caption tqalignment with respect to the table. See the <a + * Caption alignment with respect to the table. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-CAPTION"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -134,7 +134,7 @@ public: void setAbbr( const DOMString & ); /** - * Horizontal tqalignment of data in cell. See the <a + * Horizontal alignment of data in cell. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD"> * align attribute definition </a> in HTML 4.0. * @@ -187,7 +187,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the <a + * Offset of alignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -281,7 +281,7 @@ public: void setScope( const DOMString & ); /** - * Vertical tqalignment of data in cell. See the <a + * Vertical alignment of data in cell. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign"> * valign attribute definition </a> in HTML 4.0. * @@ -338,7 +338,7 @@ public: ~HTMLTableColElement(); /** - * Horizontal tqalignment of cell data in column. See the <a + * Horizontal alignment of cell data in column. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD"> * align attribute definition </a> in HTML 4.0. * @@ -364,7 +364,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the <a + * Offset of alignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -391,7 +391,7 @@ public: void setSpan( long ); /** - * Vertical tqalignment of cell data in column. See the <a + * Vertical alignment of cell data in column. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign"> * valign attribute definition </a> in HTML 4.0. * @@ -790,7 +790,7 @@ public: void setCells( const HTMLCollection & ); /** - * Horizontal tqalignment of data within cells of this row. See the + * Horizontal alignment of data within cells of this row. See the * <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD"> * align attribute definition </a> in HTML 4.0. @@ -831,7 +831,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the <a + * Offset of alignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -844,7 +844,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical tqalignment of data within cells of this row. See the <a + * Vertical alignment of data within cells of this row. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign"> * valign attribute definition </a> in HTML 4.0. * @@ -913,7 +913,7 @@ public: ~HTMLTableSectionElement(); /** - * Horizontal tqalignment of data in cells. See the \c align + * Horizontal alignment of data in cells. See the \c align * attribute for HTMLTheadElement for details. * */ @@ -938,7 +938,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the <a + * Offset of alignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -951,7 +951,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical tqalignment of data in cells. See the \c valign + * Vertical alignment of data in cells. See the \c valign * attribute for HTMLTheadElement for details. * */ diff --git a/khtml/ecma/README b/khtml/ecma/README index 1efc877d8..4c341699a 100644 --- a/khtml/ecma/README +++ b/khtml/ecma/README @@ -1,4 +1,4 @@ -This module tqcontains the ECMAScript a.k.a. JavaScript language bindings for +This module contains the ECMAScript a.k.a. JavaScript language bindings for the KHTML Part. The module is loaded into KHTML's address space on demand. diff --git a/khtml/ecma/kjs_binding.cpp b/khtml/ecma/kjs_binding.cpp index b2ad17725..f9dd291d7 100644 --- a/khtml/ecma/kjs_binding.cpp +++ b/khtml/ecma/kjs_binding.cpp @@ -190,7 +190,7 @@ ScriptInterpreter::~ScriptInterpreter() #ifdef KJS_VERBOSE kdDebug(6070) << "ScriptInterpreter::~ScriptInterpreter " << this << " for part=" << m_frame << endl; #endif - assert( interpreterList && interpreterList->tqcontains( this ) ); + assert( interpreterList && interpreterList->contains( this ) ); interpreterList->remove( this ); if ( interpreterList->isEmpty() ) { delete interpreterList; @@ -261,7 +261,7 @@ UString::UString(const TQString &d) { unsigned int len = d.length(); UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = UString::Rep::create(dat, len); } @@ -277,7 +277,7 @@ UString::UString(const DOM::DOMString &d) unsigned int len = d.length(); UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = UString::Rep::create(dat, len); } diff --git a/khtml/ecma/kjs_binding.h b/khtml/ecma/kjs_binding.h index 0672cd8eb..c55da21ce 100644 --- a/khtml/ecma/kjs_binding.h +++ b/khtml/ecma/kjs_binding.h @@ -103,7 +103,7 @@ namespace KJS { m_domObjects.insert( objectHandle, obj ); } void customizedDOMObject( DOMObject* obj ) { - m_customizedDomObjects.tqreplace( obj, this ); + m_customizedDomObjects.replace( obj, this ); } bool deleteDOMObject( void* objectHandle ) { DOMObject* obj = m_domObjects.take( objectHandle ); diff --git a/khtml/ecma/kjs_css.cpp b/khtml/ecma/kjs_css.cpp index ea651336e..b42f9dd02 100644 --- a/khtml/ecma/kjs_css.cpp +++ b/khtml/ecma/kjs_css.cpp @@ -185,7 +185,7 @@ void DOMCSSStyleDeclaration::tryPut(ExecState *exec, const Identifier &propertyN if (propvalue.isEmpty()) styleDecl.removeProperty(prop); else { - int important = propvalue.tqfind("!important", 0, false); + int important = propvalue.find("!important", 0, false); if (important == -1) styleDecl.setProperty(prop, DOM::DOMString(propvalue), ""); else diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index d7f1c66e2..eeb126ebb 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -107,7 +107,7 @@ void SourceDisplay::setSource(SourceFile *sourceFile) } TQString code = sourceFile->getCode(); - const TQChar *chars = code.tqunicode(); + const TQChar *chars = code.unicode(); uint len = code.length(); TQChar newLine('\n'); TQChar cr('\r'); @@ -861,7 +861,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch if (dontShowAgain) { KConfig *config = kapp->config(); - KConfigGroupSaver saver(config,TQString::tqfromLatin1("Java/JavaScript Settings")); + KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings")); config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0)); config->sync(); TQByteArray data; @@ -1020,7 +1020,7 @@ void KJSDebugWin::enterSession(ExecState *exec) updateContextList(); - tqApp->enter_loop(); // won't return until leaveSession() is called + qApp->enter_loop(); // won't return until leaveSession() is called } void KJSDebugWin::leaveSession() @@ -1043,7 +1043,7 @@ void KJSDebugWin::leaveSession() enableOtherWindows(); } - tqApp->exit_loop(); + qApp->exit_loop(); } void KJSDebugWin::updateContextList() @@ -1123,7 +1123,7 @@ bool KJSDebugWin::haveBreakpoint(SourceFile *sourceFile, int line0, int line1) for (int i = 0; i < m_breakpointCount; i++) { int sourceId = m_breakpoints[i].sourceId; int lineno = m_breakpoints[i].lineno; - if (m_sourceFragments.tqcontains(sourceId) && + if (m_sourceFragments.contains(sourceId) && m_sourceFragments[sourceId]->sourceFile == sourceFile) { int absLineno = m_sourceFragments[sourceId]->baseLine+lineno-1; if (absLineno >= line0 && absLineno <= line1) diff --git a/khtml/ecma/kjs_debugwin.h b/khtml/ecma/kjs_debugwin.h index e925965eb..8faf71d52 100644 --- a/khtml/ecma/kjs_debugwin.h +++ b/khtml/ecma/kjs_debugwin.h @@ -151,7 +151,7 @@ namespace KJS { /** * @internal * - * KJSDebugWin represents the debugger window that is visible to the user. It tqcontains + * KJSDebugWin represents the debugger window that is visible to the user. It contains * a stack frame list, a code viewer and a source fragment selector, plus buttons * to control execution including next, step and continue. * diff --git a/khtml/ecma/kjs_dom.cpp b/khtml/ecma/kjs_dom.cpp index b69976e0d..08afc6aab 100644 --- a/khtml/ecma/kjs_dom.cpp +++ b/khtml/ecma/kjs_dom.cpp @@ -67,7 +67,7 @@ IMPLEMENT_CONSTANT_TABLE(DOMNodeConstants,"DOMNodeConstants") /* Source for DOMNodeProtoTable. @begin DOMNodeProtoTable 13 insertBefore DOMNode::InsertBefore DontDelete|Function 2 - tqreplaceChild DOMNode::ReplaceChild DontDelete|Function 2 + replaceChild DOMNode::ReplaceChild DontDelete|Function 2 removeChild DOMNode::RemoveChild DontDelete|Function 1 appendChild DOMNode::AppendChild DontDelete|Function 1 hasAttributes DOMNode::HasAttributes DontDelete|Function 0 @@ -81,7 +81,7 @@ IMPLEMENT_CONSTANT_TABLE(DOMNodeConstants,"DOMNodeConstants") removeEventListener DOMNode::RemoveEventListener DontDelete|Function 3 dispatchEvent DOMNode::DispatchEvent DontDelete|Function 1 # IE extensions - tqcontains DOMNode::Contains DontDelete|Function 1 + contains DOMNode::Contains DontDelete|Function 1 insertAdjacentHTML DOMNode::InsertAdjacentHTML DontDelete|Function 2 # "DOM level 0" (from Gecko DOM reference; also in WinIE) item DOMNode::Item DontDelete|Function 1 @@ -216,7 +216,7 @@ static khtml::RenderObject* handleBodyRootQuirk(const DOM::Node& node, khtml::Re } if (needViewport) { - //Scan up to tqfind the new target + //Scan up to find the new target while (rend->parent()) rend = rend->parent(); } @@ -322,7 +322,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const default: // no DOM standard, found in IE only - // Make sure our tqlayout is up to date before we allow a query on these attributes. + // Make sure our layout is up to date before we allow a query on these attributes. DOM::DocumentImpl* docimpl = node.handle()->getDocument(); if (docimpl) { docimpl->updateLayout(); @@ -469,7 +469,7 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i setListener(exec,DOM::EventImpl::UNLOAD_EVENT,value); break; default: - // Make sure our tqlayout is up to date + // Make sure our layout is up to date DOM::DocumentImpl* docimpl = node.handle()->getDocument(); if (docimpl) docimpl->updateLayout(); @@ -585,7 +585,7 @@ Value DOMNodeProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &ar case DOMNode::InsertBefore: return getDOMNode(exec,node.insertBefore(toNode(args[0]), toNode(args[1]))); case DOMNode::ReplaceChild: - return getDOMNode(exec,node.tqreplaceChild(toNode(args[0]), toNode(args[1]))); + return getDOMNode(exec,node.replaceChild(toNode(args[0]), toNode(args[1]))); case DOMNode::Contains: { DOM::Node other = toNode(args[0]); @@ -1738,7 +1738,7 @@ const ClassInfo DOMCharacterData::info = { "CharacterImp", appendData DOMCharacterData::AppendData DontDelete|Function 1 insertData DOMCharacterData::InsertData DontDelete|Function 2 deleteData DOMCharacterData::DeleteData DontDelete|Function 2 - tqreplaceData DOMCharacterData::ReplaceData DontDelete|Function 2 + replaceData DOMCharacterData::ReplaceData DontDelete|Function 2 @end */ KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(DOMCharacterDataProto, DOMNodeProto) @@ -1801,7 +1801,7 @@ Value DOMCharacterDataProtoFunc::tryCall(ExecState *exec, Object &thisObj, const return Undefined(); break; case DOMCharacterData::ReplaceData: - data.tqreplaceData(args[0].toInteger(exec),args[1].toInteger(exec),args[2].toString(exec).string()); + data.replaceData(args[0].toInteger(exec),args[1].toInteger(exec),args[2].toString(exec).string()); return Undefined(); default: break; diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp index 321746f20..57762ffd3 100644 --- a/khtml/ecma/kjs_html.cpp +++ b/khtml/ecma/kjs_html.cpp @@ -205,12 +205,12 @@ bool KJS::HTMLDocument::hasProperty(ExecState *exec, const Identifier &p) const return false; - if ( docImpl->underDocNamedCache().tqcontains( p.qstring() ) ) + if ( docImpl->underDocNamedCache().contains( p.qstring() ) ) return true; if ( view && view->part() ) { - KHTMLPart *kp = view->part()->tqfindFrame( p.qstring() ); + KHTMLPart *kp = view->part()->findFrame( p.qstring() ); if (kp) return true; } @@ -260,8 +260,8 @@ Value KJS::HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName) if ( view && view->part() ) { // ###### TODO return a collection in case several frames have the same name - // (IE does that). Hard to do with tqfindFrame :} - KHTMLPart *kp = view->part()->tqfindFrame( propertyName.qstring() ); + // (IE does that). Hard to do with findFrame :} + KHTMLPart *kp = view->part()->findFrame( propertyName.qstring() ); if (kp) return Window::retrieve(kp); } @@ -896,7 +896,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const rel KJS::HTMLElement::AnchorRel DontDelete rev KJS::HTMLElement::AnchorRev DontDelete search KJS::HTMLElement::AnchorSearch DontDelete - tqshape KJS::HTMLElement::AnchorShape DontDelete + shape KJS::HTMLElement::AnchorShape DontDelete tabIndex KJS::HTMLElement::AnchorTabIndex DontDelete target KJS::HTMLElement::AnchorTarget DontDelete text KJS::HTMLElement::AnchorText DontDelete|ReadOnly @@ -981,7 +981,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const protocol KJS::HTMLElement::AreaProtocol DontDelete|ReadOnly search KJS::HTMLElement::AreaSearch DontDelete|ReadOnly noHref KJS::HTMLElement::AreaNoHref DontDelete - tqshape KJS::HTMLElement::AreaShape DontDelete + shape KJS::HTMLElement::AreaShape DontDelete tabIndex KJS::HTMLElement::AreaTabIndex DontDelete target KJS::HTMLElement::AreaTarget DontDelete @end @@ -1599,7 +1599,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const case AnchorName: return String(anchor.name()); case AnchorRel: return String(anchor.rel()); case AnchorRev: return String(anchor.rev()); - case AnchorShape: return String(anchor.tqshape()); + case AnchorShape: return String(anchor.shape()); case AnchorTabIndex: return Number(anchor.tabIndex()); case AnchorTarget: return String(anchor.target()); // Not specified in http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/a.asp @@ -1735,7 +1735,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const } } case AreaNoHref: return Boolean(area.noHref()); - case AreaShape: return String(area.tqshape()); + case AreaShape: return String(area.shape()); case AreaTabIndex: return Number(area.tabIndex()); case AreaTarget: return String(area.target()); } @@ -3773,7 +3773,7 @@ void KJS::HTMLSelectCollection::tryPut(ExecState *exec, const Identifier &proper while (diff--) { element.add(element.ownerDocument().createElement("OPTION"), before); } - // tqreplace an existing entry ? + // replace an existing entry ? } else if (diff < 0) { before = element.options().item(u+1); element.remove(u); diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp index 4c51561e4..a5c793357 100644 --- a/khtml/ecma/kjs_navigator.cpp +++ b/khtml/ecma/kjs_navigator.cpp @@ -187,15 +187,15 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const case AppCodeName: return String("Mozilla"); case AppName: - // If we tqfind "Mozilla" but not "(compatible, ...)" we are a real Netscape - if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && - userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1) + // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape + if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && + userAgent.find(TQString::fromLatin1("compatible")) == -1) { //kdDebug() << "appName -> Mozilla" << endl; return String("Netscape"); } - if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || - userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) + if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || + userAgent.find(TQString::fromLatin1("MSIE")) >= 0) { //kdDebug() << "appName -> IE" << endl; return String("Microsoft Internet Explorer"); @@ -204,17 +204,17 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String("Konqueror"); case AppVersion: // We assume the string is something like Mozilla/version (properties) - return String(userAgent.mid(userAgent.tqfind('/') + 1)); + return String(userAgent.mid(userAgent.find('/') + 1)); case Product: // We are pretending to be Mozilla or Safari - if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && - userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1) + if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && + userAgent.find(TQString::fromLatin1("compatible")) == -1) { return String("Gecko"); } // When spoofing as IE, we use Undefined(). - if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || - userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) + if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || + userAgent.find(TQString::fromLatin1("MSIE")) >= 0) { return Undefined(); } @@ -222,9 +222,9 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String("Konqueror/khtml"); case ProductSub: { - int ix = userAgent.tqfind("Gecko"); - if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.tqunicode()[ix+5] == TQChar('/') && - userAgent.tqfind(TQRegExp("\\d{8}"), ix+6) == ix+6) + int ix = userAgent.find("Gecko"); + if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.unicode()[ix+5] == TQChar('/') && + userAgent.find(TQRegExp("\\d{8}"), ix+6) == ix+6) { // We have Gecko/<productSub> in the UA string return String(userAgent.mid(ix+6, 8)); @@ -245,19 +245,19 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String(userAgent); case Platform: // yet another evil hack, but necessary to spoof some sites... - if ( (userAgent.tqfind(TQString::tqfromLatin1("Win"),0,false)>=0) ) - return String(TQString::tqfromLatin1("Win32")); - else if ( (userAgent.tqfind(TQString::tqfromLatin1("Macintosh"),0,false)>=0) || - (userAgent.tqfind(TQString::tqfromLatin1("Mac_PowerPC"),0,false)>=0) ) - return String(TQString::tqfromLatin1("MacPPC")); + if ( (userAgent.find(TQString::fromLatin1("Win"),0,false)>=0) ) + return String(TQString::fromLatin1("Win32")); + else if ( (userAgent.find(TQString::fromLatin1("Macintosh"),0,false)>=0) || + (userAgent.find(TQString::fromLatin1("Mac_PowerPC"),0,false)>=0) ) + return String(TQString::fromLatin1("MacPPC")); else { struct utsname name; int ret = uname(&name); if ( ret >= 0 ) - return String(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)); + return String(TQString::fromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)); else // can't happen - return String(TQString::tqfromLatin1("Unix X11")); + return String(TQString::fromLatin1("Unix X11")); } case CpuClass: { diff --git a/khtml/ecma/kjs_proxy.cpp b/khtml/ecma/kjs_proxy.cpp index 0301ef141..ca26c5a0b 100644 --- a/khtml/ecma/kjs_proxy.cpp +++ b/khtml/ecma/kjs_proxy.cpp @@ -343,8 +343,8 @@ void KJSProxyImpl::applyUserAgent() assert( m_script ); TQString host = m_frame->m_part->url().isLocalFile() ? "localhost" : m_frame->m_part->url().host(); TQString userAgent = KProtocolManager::userAgentForHost(host); - if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || - userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) + if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || + userAgent.find(TQString::fromLatin1("MSIE")) >= 0) { m_script->setCompatMode(Interpreter::IECompat); #ifdef KJS_VERBOSE @@ -352,10 +352,10 @@ void KJSProxyImpl::applyUserAgent() #endif } else - // If we tqfind "Mozilla" but not "(compatible, ...)" we are a real Netscape - if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && - userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1 && - userAgent.tqfind(TQString::tqfromLatin1("KHTML")) == -1) + // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape + if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && + userAgent.find(TQString::fromLatin1("compatible")) == -1 && + userAgent.find(TQString::fromLatin1("KHTML")) == -1) { m_script->setCompatMode(Interpreter::NetscapeCompat); #ifdef KJS_VERBOSE diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp index 827756ac4..90123aec6 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -225,9 +225,9 @@ const ClassInfo Window::info = { "Window", &DOMAbstractView::info, &WindowTable, btoa Window::BToA DontDelete|Function 1 closed Window::Closed DontDelete|ReadOnly crypto Window::Crypto DontDelete|ReadOnly - defaulttqStatus Window::DefaulttqStatus DontDelete - defaultstatus Window::DefaulttqStatus DontDelete - status Window::tqStatus DontDelete + defaultStatus Window::DefaultStatus DontDelete + defaultstatus Window::DefaultStatus DontDelete + status Window::Status DontDelete document Window::Document DontDelete|ReadOnly frameElement Window::FrameElement DontDelete|ReadOnly frames Window::Frames DontDelete|ReadOnly @@ -521,7 +521,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const return false; TQString q = p.qstring(); - if (part->tqfindFramePart(p.qstring())) + if (part->findFramePart(p.qstring())) return true; // allow window[1] or parent[1] etc. (#56983) bool ok; @@ -655,9 +655,9 @@ Value Window::get(ExecState *exec, const Identifier &p) const switch( entry->value ) { case Crypto: return Undefined(); // ### - case DefaulttqStatus: + case DefaultStatus: return String(UString(part->jsDefaultStatusBarText())); - case tqStatus: + case Status: return String(UString(part->jsStatusBarText())); case Document: if (part->document().isNull()) { @@ -864,9 +864,9 @@ Value Window::get(ExecState *exec, const Identifier &p) const #if defined Q_WS_X11 && ! defined K_WS_QTONLY if (!part->widget()) return Number(0); - KWin::WindowInfo inf = KWin::windowInfo(part->widget()->tqtopLevelWidget()->winId()); + KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId()); return Number(entry->value == OuterHeight ? - inf.tqgeometry().height() : inf.tqgeometry().width()); + inf.geometry().height() : inf.geometry().width()); #else return Number(entry->value == OuterHeight ? part->view()->height() : part->view()->width()); @@ -1002,7 +1002,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const return isSafeScript(exec) ? val2 : Undefined(); } - KParts::ReadOnlyPart *rop = part->tqfindFramePart( p.qstring() ); + KParts::ReadOnlyPart *rop = part->findFramePart( p.qstring() ); if (rop) return retrieve(rop); @@ -1088,17 +1088,17 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); if (part) { switch( entry->value ) { - case tqStatus: { - if (isSafeScript(exec) && part->settings()->windowtqStatusPolicy(part->url().host()) - == KHTMLSettings::KJSWindowtqStatusAllow) { + case Status: { + if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host()) + == KHTMLSettings::KJSWindowStatusAllow) { String s = value.toString(exec); part->setJSStatusBarText(s.value().qstring()); } return; } - case DefaulttqStatus: { - if (isSafeScript(exec) && part->settings()->windowtqStatusPolicy(part->url().host()) - == KHTMLSettings::KJSWindowtqStatusAllow) { + case DefaultStatus: { + if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host()) + == KHTMLSettings::KJSWindowStatusAllow) { String s = value.toString(exec); part->setJSDefaultStatusBarText(s.value().qstring()); } @@ -1245,7 +1245,7 @@ void Window::closeNow() kdDebug(6070) << "closeNow on non KHTML part" << endl; } else { //kdDebug(6070) << k_funcinfo << " -> closing window" << endl; - // We want to make sure that window.open won't tqfind this part by name. + // We want to make sure that window.open won't find this part by name. part->setName( 0 ); part->deleteLater(); part = 0; @@ -1446,7 +1446,7 @@ void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory) // check if we're allowed to inject javascript // SYNC check with khtml_part.cpp::slotRedirect! if ( isSafeScript(exec) || - dstUrl.tqfind(TQString::tqfromLatin1("javascript:"), 0, false) != 0 ) + dstUrl.find(TQString::fromLatin1("javascript:"), 0, false) != 0 ) part->scheduleRedirection(-1, dstUrl, lockHistory); @@ -1618,11 +1618,11 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString while (it != flist.end()) { TQString s = *it++; TQString key, val; - int pos = s.tqfind('='); + int pos = s.find('='); if (pos >= 0) { key = s.left(pos).stripWhiteSpace().lower(); val = s.mid(pos + 1).stripWhiteSpace().lower(); - TQRect screen = KGlobalSettings::desktopGeometry(widget->tqtopLevelWidget()); + TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget()); if (key == "left" || key == "screenx") { winargs.x = (int)val.toFloat() + screen.x(); @@ -1633,13 +1633,13 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString if (winargs.y < screen.y() || winargs.y > screen.bottom()) winargs.y = screen.y(); // only safe choice until size is determined } else if (key == "height") { - winargs.height = (int)val.toFloat() + 2*tqApp->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; + winargs.height = (int)val.toFloat() + 2*qApp->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; if (winargs.height > screen.height()) // should actually check workspace winargs.height = screen.height(); if (winargs.height < 100) winargs.height = 100; } else if (key == "width") { - winargs.width = (int)val.toFloat() + 2*tqApp->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; + winargs.width = (int)val.toFloat() + 2*qApp->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; if (winargs.width > screen.width()) // should actually check workspace winargs.width = screen.width(); if (winargs.width < 100) @@ -1693,7 +1693,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString Window::retrieveWindow(p)->goURL(exec, url.url(), false /*don't lock history*/); return Window::retrieve(p); } - if ( uargs.frameName.lower() == "tqreplace" ) + if ( uargs.frameName.lower() == "replace" ) { Window::retrieveWindow(p)->goURL(exec, url.url(), true /*lock history*/); return Window::retrieve(p); @@ -1897,8 +1897,8 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) KHTMLSettings::KJSWindowFocusPolicy policy = part->settings()->windowFocusPolicy(part->url().host()); if(policy == KHTMLSettings::KJSWindowFocusAllow && widget) { - widget->tqtopLevelWidget()->raise(); - KWin::deIconifyWindow( widget->tqtopLevelWidget()->winId() ); + widget->topLevelWidget()->raise(); + KWin::deIconifyWindow( widget->topLevelWidget()->winId() ); widget->setActiveWindow(); emit part->browserExtension()->requestFocus(part); } @@ -1950,7 +1950,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) { KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { - TQWidget * tl = widget->tqtopLevelWidget(); + TQWidget * tl = widget->topLevelWidget(); TQRect sg = KGlobalSettings::desktopGeometry(tl); TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) ); @@ -1970,7 +1970,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) { KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { - TQWidget * tl = widget->tqtopLevelWidget(); + TQWidget * tl = widget->topLevelWidget(); TQRect sg = KGlobalSettings::desktopGeometry(tl); TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() ); @@ -1989,7 +1989,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) if(policy == KHTMLSettings::KJSWindowResizeAllow && args.size() == 2 && widget) { - TQWidget * tl = widget->tqtopLevelWidget(); + TQWidget * tl = widget->topLevelWidget(); TQRect geom = tl->frameGeometry(); window->resizeTo( tl, geom.width() + args[0].toInt32(exec), @@ -2003,7 +2003,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) if(policy == KHTMLSettings::KJSWindowResizeAllow && args.size() == 2 && widget) { - TQWidget * tl = widget->tqtopLevelWidget(); + TQWidget * tl = widget->topLevelWidget(); window->resizeTo( tl, args[0].toInt32(exec), args[1].toInt32(exec) ); } return Undefined(); @@ -2271,7 +2271,7 @@ void WindowQObject::timerEvent(TQTimerEvent *) it = TQPtrListIterator<ScheduledAction>(toExecute); for (; it.current(); ++it) { ScheduledAction *action = it.current(); - if (!scheduledActions.tqcontainsRef(action)) // removed by clearTimeout() + if (!scheduledActions.containsRef(action)) // removed by clearTimeout() continue; action->executing = true; // prevent deletion in clearTimeout() @@ -2288,7 +2288,7 @@ void WindowQObject::timerEvent(TQTimerEvent *) action->executing = false; - if (!scheduledActions.tqcontainsRef(action)) + if (!scheduledActions.containsRef(action)) delete action; else action->nextTime = action->nextTime.addMSecs(action->interval); @@ -2353,10 +2353,10 @@ DateTimeMS DateTimeMS::now() { DateTimeMS t; TQTime before = TQTime::currentTime(); - t.mDate = TQDate::tqcurrentDate(); + t.mDate = TQDate::currentDate(); t.mTime = TQTime::currentTime(); if (t.mTime < before) - t.mDate = TQDate::tqcurrentDate(); // prevent race condition in hacky way :) + t.mDate = TQDate::currentDate(); // prevent race condition in hacky way :) return t; } @@ -2407,7 +2407,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const } // check for the name or number - KParts::ReadOnlyPart *frame = part->tqfindFramePart(p.qstring()); + KParts::ReadOnlyPart *frame = part->findFramePart(p.qstring()); if (!frame) { bool ok; unsigned int i = p.toArrayIndex(&ok); @@ -2423,7 +2423,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const } // Fun IE quirk: name lookup in there is actually done by document.all - // hence, it can tqfind non-frame things (and even let them hide frame ones!) + // hence, it can find non-frame things (and even let them hide frame ones!) // We don't quite do that, but do this as a fallback. DOM::DocumentImpl* doc = static_cast<DOM::DocumentImpl*>(part->document().handle()); if (doc) { @@ -2478,7 +2478,7 @@ const ClassInfo Location::info = { "Location", 0, &LocationTable, 0 }; [[==]] Location::EqualEqual DontDelete|ReadOnly assign Location::Assign DontDelete|Function 1 toString Location::ToString DontDelete|Function 0 - tqreplace Location::Replace DontDelete|Function 1 + replace Location::Replace DontDelete|Function 1 reload Location::Reload DontDelete|Function 0 @end */ @@ -2545,7 +2545,7 @@ Value Location::get(ExecState *exec, const Identifier &p) const return String(""); return String( url.path().isEmpty() ? TQString("/") : url.path() ); case Port: - return String( url.port() ? TQString::number((int)url.port()) : TQString::tqfromLatin1("") ); + return String( url.port() ? TQString::number((int)url.port()) : TQString::fromLatin1("") ); case Protocol: return String( url.protocol()+":" ); case Search: @@ -2603,8 +2603,8 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att url.setRef(str); break; case Host: { - TQString host = str.left(str.tqfind(":")); - TQString port = str.mid(str.tqfind(":")+1); + TQString host = str.left(str.find(":")); + TQString port = str.mid(str.find(":")+1); url.setHost(host); url.setPort(port.toUInt()); break; diff --git a/khtml/ecma/kjs_window.h b/khtml/ecma/kjs_window.h index 0078615cd..2f5eb45f5 100644 --- a/khtml/ecma/kjs_window.h +++ b/khtml/ecma/kjs_window.h @@ -128,7 +128,7 @@ namespace KJS { TQPtrDict<JSEventListener> jsEventListeners; virtual const ClassInfo* classInfo() const { return &info; } static const ClassInfo info; - enum { Closed, Crypto, DefaulttqStatus, tqStatus, Document, Node, EventCtor, Range, + enum { Closed, Crypto, DefaultStatus, Status, Document, Node, EventCtor, Range, NodeFilter, DOMException, CSSRule, Frames, _History, _External, Event, InnerHeight, InnerWidth, Length, _Location, Navigate, Name, _Navigator, _Konqueror, ClientInformation, OffscreenBuffering, Opener, OuterHeight, OuterWidth, PageXOffset, PageYOffset, diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp index fe232457f..b20515de7 100644 --- a/khtml/ecma/xmlhttprequest.cpp +++ b/khtml/ecma/xmlhttprequest.cpp @@ -47,7 +47,7 @@ using KIO::NetAccess; #define BANNED_HTTP_HEADERS "authorization,proxy-authorization,"\ "content-length,host,connect,copy,move,"\ - "delete,head,trace,put,proptqfind,proppatch,"\ + "delete,head,trace,put,propfind,proppatch,"\ "mkcol,lock,unlock,options,via,"\ "accept-charset,accept-encoding,expect,date,"\ "keep-alive,te,trailer,"\ @@ -125,8 +125,8 @@ const ClassInfo XMLHttpRequest::info = { "XMLHttpRequest", 0, &XMLHttpRequestTab readyState XMLHttpRequest::ReadyState DontDelete|ReadOnly responseText XMLHttpRequest::ResponseText DontDelete|ReadOnly responseXML XMLHttpRequest::ResponseXML DontDelete|ReadOnly - status XMLHttpRequest::tqStatus DontDelete|ReadOnly - statusText XMLHttpRequest::tqStatusText DontDelete|ReadOnly + status XMLHttpRequest::Status DontDelete|ReadOnly + statusText XMLHttpRequest::StatusText DontDelete|ReadOnly onreadystatechange XMLHttpRequest::Onreadystatechange DontDelete onload XMLHttpRequest::Onload DontDelete @end @@ -182,10 +182,10 @@ Value XMLHttpRequest::getValueProperty(ExecState *exec, int token) const } return getDOMNode(exec,responseXML); - case tqStatus: - return gettqStatus(); - case tqStatusText: - return gettqStatusText(); + case Status: + return getStatus(); + case StatusText: + return getStatusText(); case Onreadystatechange: if (onReadyStateChangeListener && onReadyStateChangeListener->listenerObjImp()) { return onReadyStateChangeListener->listenerObj(); @@ -394,8 +394,8 @@ void XMLHttpRequest::send(const TQString& _body) // Set the default referrer if one is not already supplied // through setRequestHeader. NOTE: the user can still disable // this feature at the protocol level (kio_http). - // ### does tqfind() ever succeed? the headers are stored in lower case! - if (requestHeaders.tqfind("Referer") == requestHeaders.end()) { + // ### does find() ever succeed? the headers are stored in lower case! + if (requestHeaders.find("Referer") == requestHeaders.end()) { KURL documentURL(doc->URL()); documentURL.setPass(TQString::null); documentURL.setUser(TQString::null); @@ -487,9 +487,9 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val // Reject all banned headers. See BANNED_HTTP_HEADERS above. // kdDebug() << "Banned HTTP Headers: " << BANNED_HTTP_HEADERS << endl; TQStringList bannedHeaders = TQStringList::split(',', - TQString::tqfromLatin1(BANNED_HTTP_HEADERS)); + TQString::fromLatin1(BANNED_HTTP_HEADERS)); - if (bannedHeaders.tqcontains(name)) + if (bannedHeaders.contains(name)) return; // Denied requestHeaders[name] = value.stripWhiteSpace(); @@ -501,7 +501,7 @@ Value XMLHttpRequest::getAllResponseHeaders() const return Undefined(); } - int endOfLine = responseHeaders.tqfind("\n"); + int endOfLine = responseHeaders.find("\n"); if (endOfLine == -1) { return Undefined(); @@ -535,27 +535,27 @@ Value XMLHttpRequest::getResponseHeader(const TQString& name) const return Undefined(); } - int endOfLine = responseHeaders.tqfind("\n", headerLinePos + matchLength); + int endOfLine = responseHeaders.find("\n", headerLinePos + matchLength); return String(responseHeaders.mid(headerLinePos + matchLength, endOfLine - (headerLinePos + matchLength)).stripWhiteSpace()); } -static Value httptqStatus(const TQString& response, bool texttqStatus = false) +static Value httpStatus(const TQString& response, bool textStatus = false) { if (response.isEmpty()) { return Undefined(); } - int endOfLine = response.tqfind("\n"); + int endOfLine = response.find("\n"); TQString firstLine = (endOfLine == -1) ? response : response.left(endOfLine); - int codeStart = firstLine.tqfind(" "); - int codeEnd = firstLine.tqfind(" ", codeStart + 1); + int codeStart = firstLine.find(" "); + int codeEnd = firstLine.find(" ", codeStart + 1); if (codeStart == -1 || codeEnd == -1) { return Undefined(); } - if (texttqStatus) { + if (textStatus) { TQString statusText = firstLine.mid(codeEnd + 1, endOfLine - (codeEnd + 1)).stripWhiteSpace(); return String(statusText); } @@ -571,14 +571,14 @@ static Value httptqStatus(const TQString& response, bool texttqStatus = false) return Number(code); } -Value XMLHttpRequest::gettqStatus() const +Value XMLHttpRequest::getStatus() const { - return httptqStatus(responseHeaders); + return httpStatus(responseHeaders); } -Value XMLHttpRequest::gettqStatusText() const +Value XMLHttpRequest::getStatusText() const { - return httptqStatus(responseHeaders, true); + return httpStatus(responseHeaders, true); } void XMLHttpRequest::processSyncLoadResults(const TQByteArray &data, const KURL &finalURL, const TQString &headers) @@ -643,11 +643,11 @@ void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data) // NOTE: Replace a 304 response with a 200! Both IE and Mozilla do this. // Problem first reported through bug# 110272. - int codeStart = responseHeaders.tqfind("304"); + int codeStart = responseHeaders.find("304"); if ( codeStart != -1) { - int codeEnd = responseHeaders.tqfind("\n", codeStart+3); + int codeEnd = responseHeaders.find("\n", codeStart+3); if (codeEnd != -1) - responseHeaders.tqreplace(codeStart, (codeEnd-codeStart), "200 OK"); + responseHeaders.replace(codeStart, (codeEnd-codeStart), "200 OK"); } changeState(Loaded); @@ -659,13 +659,13 @@ void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data) #endif if ( decoder == NULL ) { - int pos = responseHeaders.tqfind("content-type:", 0, false); + int pos = responseHeaders.find("content-type:", 0, false); if ( pos > -1 ) { pos += 13; - int index = responseHeaders.tqfind('\n', pos); + int index = responseHeaders.find('\n', pos); TQString type = responseHeaders.mid(pos, (index-pos)); - index = type.tqfind (';'); + index = type.find (';'); if (index > -1) encoding = type.mid( index+1 ).remove(TQRegExp("charset[ ]*=[ ]*", false)).stripWhiteSpace(); } diff --git a/khtml/ecma/xmlhttprequest.h b/khtml/ecma/xmlhttprequest.h index d69f976c3..2c646708e 100644 --- a/khtml/ecma/xmlhttprequest.h +++ b/khtml/ecma/xmlhttprequest.h @@ -60,7 +60,7 @@ namespace KJS { virtual bool toBoolean(ExecState *) const { return true; } virtual const ClassInfo* classInfo() const { return &info; } static const ClassInfo info; - enum { Onload, Onreadystatechange, ReadyState, ResponseText, ResponseXML, tqStatus, tqStatusText, Abort, + enum { Onload, Onreadystatechange, ReadyState, ResponseText, ResponseXML, Status, StatusText, Abort, GetAllResponseHeaders, GetResponseHeader, Open, Send, SetRequestHeader, OverrideMIMEType }; @@ -68,8 +68,8 @@ namespace KJS { friend class XMLHttpRequestProtoFunc; friend class XMLHttpRequestQObject; - Value gettqStatusText() const; - Value gettqStatus() const; + Value getStatusText() const; + Value getStatus() const; bool urlMatchesDocumentDomain(const KURL&) const; XMLHttpRequestQObject *qObject; diff --git a/khtml/html/Makefile.am b/khtml/html/Makefile.am index 343254bd5..ed7722517 100644 --- a/khtml/html/Makefile.am +++ b/khtml/html/Makefile.am @@ -47,7 +47,7 @@ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/dcop \ # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf doctypes: $(srcdir)/doctypes.gperf $(srcdir)/Makefile.am - gperf -CEot -L "ANSI-C" -k "*" -N tqfindDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards $(srcdir)/doctypes.gperf > $(srcdir)/doctypes.cpp + gperf -CEot -L "ANSI-C" -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards $(srcdir)/doctypes.gperf > $(srcdir)/doctypes.cpp #html_documentimpl.lo: doctypes.cpp .PHONY: doctypes diff --git a/khtml/html/doctypes.cpp b/khtml/html/doctypes.cpp index 68bfe4207..e79a56f34 100644 --- a/khtml/html/doctypes.cpp +++ b/khtml/html/doctypes.cpp @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.1 */ -/* Command-line: gperf -CEot -L ANSI-C -k '*' -N tqfindDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/kdelibs/khtml/html/doctypes.gperf */ +/* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/kdelibs/khtml/html/doctypes.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ @@ -334,7 +334,7 @@ hash (register const char *str, register unsigned int len) __inline #endif const struct PubIDInfo * -tqfindDoctypeEntry (register const char *str, register unsigned int len) +findDoctypeEntry (register const char *str, register unsigned int len) { enum { diff --git a/khtml/html/dtd.cpp b/khtml/html/dtd.cpp index 02cf81482..accc8b855 100644 --- a/khtml/html/dtd.cpp +++ b/khtml/html/dtd.cpp @@ -152,7 +152,7 @@ const unsigned short KDE_NO_EXPORT DOM::tagPriority[] = { 0, // ID_TEXT }; -const tagtqStatus DOM::endTag[] = { +const tagStatus DOM::endTag[] = { REQUIRED, // 0 REQUIRED, // ID_A == 1 REQUIRED, // ID_ABBR diff --git a/khtml/html/dtd.dtd b/khtml/html/dtd.dtd index f451f3c0f..d6a5ac8f0 100644 --- a/khtml/html/dtd.dtd +++ b/khtml/html/dtd.dtd @@ -310,7 +310,7 @@ <!ELEMENT DIV - - (%flow;)* -- generic language/style container --> <!ATTLIST DIV %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %reserved; -- reserved for possible future use -- > @@ -336,7 +336,7 @@ rel %LinkTypes; #IMPLIED -- forward link types -- rev %LinkTypes; #IMPLIED -- reverse link types -- accesskey %Character; #IMPLIED -- accessibility key character -- - tqshape %Shape; rect -- for use with client-side image maps -- + shape %Shape; rect -- for use with client-side image maps -- coords %Coords; #IMPLIED -- for use with client-side image maps -- tabindex NUMBER #IMPLIED -- position in tabbing order -- onfocus %Script; #IMPLIED -- the element got the focus -- @@ -357,7 +357,7 @@ <!ELEMENT AREA - O EMPTY -- client-side image map area --> <!ATTLIST AREA %attrs; -- %coreattrs, %i18n, %events -- - tqshape %Shape; rect -- controls interpretation of coords -- + shape %Shape; rect -- controls interpretation of coords -- coords %Coords; #IMPLIED -- comma separated list of lengths -- href %URI; #IMPLIED -- URI for linked resource -- target %FrameTarget; #IMPLIED -- render in this frame -- @@ -425,7 +425,7 @@ width %Length; #IMPLIED -- override width -- usemap %URI; #IMPLIED -- use client-side image map -- ismap (ismap) #IMPLIED -- use server-side image map -- - align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- + align %IAlign; #IMPLIED -- vertical or horizontal alignment -- border %Length; #IMPLIED -- link border width -- hspace %Pixels; #IMPLIED -- horizontal gutter -- vspace %Pixels; #IMPLIED -- vertical gutter -- @@ -458,7 +458,7 @@ usemap %URI; #IMPLIED -- use client-side image map -- name CDATA #IMPLIED -- submit as part of form -- tabindex NUMBER #IMPLIED -- position in tabbing order -- - align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- + align %IAlign; #IMPLIED -- vertical or horizontal alignment -- border %Length; #IMPLIED -- link border width -- hspace %Pixels; #IMPLIED -- horizontal gutter -- vspace %Pixels; #IMPLIED -- vertical gutter -- @@ -488,10 +488,10 @@ code CDATA #IMPLIED -- applet class file -- object CDATA #IMPLIED -- serialized applet file -- alt %Text; #IMPLIED -- short description -- - name CDATA #IMPLIED -- allows applets to tqfind each other -- + name CDATA #IMPLIED -- allows applets to find each other -- width %Length; #REQUIRED -- initial width -- height %Length; #REQUIRED -- initial height -- - align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- + align %IAlign; #IMPLIED -- vertical or horizontal alignment -- hspace %Pixels; #IMPLIED -- horizontal gutter -- vspace %Pixels; #IMPLIED -- vertical gutter -- > @@ -513,7 +513,7 @@ <!ELEMENT P - O (%inline;)* -- paragraph --> <!ATTLIST P %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- > <!--=================== Headings =========================================--> @@ -526,7 +526,7 @@ <!ELEMENT (%heading;) - - (%inline;)* -- heading --> <!ATTLIST (%heading;) %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- > <!--=================== Preformatted Text ================================--> @@ -687,7 +687,7 @@ onselect %Script; #IMPLIED -- some text was selected -- onchange %Script; #IMPLIED -- the element value was changed -- accept %ContentTypes; #IMPLIED -- list of MIME types for file upload -- - align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- + align %IAlign; #IMPLIED -- vertical or horizontal alignment -- %reserved; -- reserved for possible future use -- > @@ -804,14 +804,14 @@ <!-- horizontal placement of table relative to document --> <!ENTITY % TAlign "(left|center|right)"> -<!-- horizontal tqalignment attributes for cell contents --> +<!-- horizontal alignment attributes for cell contents --> <!ENTITY % cellhalign "align (left|center|right|justify|char) #IMPLIED - char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- - charoff %Length; #IMPLIED -- offset for tqalignment char --" + char %Character; #IMPLIED -- alignment char, e.g. char=':' -- + charoff %Length; #IMPLIED -- offset for alignment char --" > -<!-- vertical tqalignment attributes for cell contents --> +<!-- vertical alignment attributes for cell contents --> <!ENTITY % cellvalign "valign (top|middle|bottom|baseline) #IMPLIED" > @@ -857,12 +857,12 @@ several semantically related columns together. %attrs; -- %coreattrs, %i18n, %events -- span NUMBER 1 -- default number of columns in group -- width %MultiLength; #IMPLIED -- default width for enclosed COLs -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- > <!-- - COL elements define the tqalignment properties for cells in + COL elements define the alignment properties for cells in one or more columns. The WIDTH attribute specifies the width of the columns, e.g. @@ -877,8 +877,8 @@ several semantically related columns together. %attrs; -- %coreattrs, %i18n, %events -- span NUMBER 1 -- COL attributes affect N columns -- width %MultiLength; #IMPLIED -- column width specification -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- > <!-- @@ -895,14 +895,14 @@ several semantically related columns together. --> <!ATTLIST (THEAD|TBODY|TFOOT) -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- > <!ATTLIST TR -- table row -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- bgcolor %Color; #IMPLIED -- background color for row -- > @@ -919,8 +919,8 @@ several semantically related columns together. scope %Scope; #IMPLIED -- scope covered by header cells -- rowspan NUMBER 1 -- number of rows spanned by cell -- colspan NUMBER 1 -- number of cols spanned by cell -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- nowrap (nowrap) #IMPLIED -- suppress word wrap -- bgcolor %Color; #IMPLIED -- cell background color -- width %Pixels; #IMPLIED -- width for cell -- @@ -973,7 +973,7 @@ several semantically related columns together. marginwidth %Pixels; #IMPLIED -- margin widths in pixels -- marginheight %Pixels; #IMPLIED -- margin height in pixels -- scrolling (yes|no|auto) auto -- scrollbar or none -- - align %IAlign; #IMPLIED -- vertical or horizontal tqalignment -- + align %IAlign; #IMPLIED -- vertical or horizontal alignment -- height %Length; #IMPLIED -- frame height -- width %Length; #IMPLIED -- frame width -- > diff --git a/khtml/html/dtd.h b/khtml/html/dtd.h index 30d97a280..4192ce51c 100644 --- a/khtml/html/dtd.h +++ b/khtml/html/dtd.h @@ -30,12 +30,12 @@ namespace DOM void addForbidden(int tagId, ushort *forbiddenTags); void removeForbidden(int tagId, ushort *forbiddenTags); -enum tagtqStatus { OPTIONAL, REQUIRED, FORBIDDEN }; +enum tagStatus { OPTIONAL, REQUIRED, FORBIDDEN }; bool checkChild(ushort tagID, ushort childID, bool strict = false); extern const unsigned short tagPriority[]; -extern const tagtqStatus endTag[]; +extern const tagStatus endTag[]; } //namespace DOM #endif diff --git a/khtml/html/html_baseimpl.cpp b/khtml/html/html_baseimpl.cpp index b73d68257..9ebe26242 100644 --- a/khtml/html/html_baseimpl.cpp +++ b/khtml/html/html_baseimpl.cpp @@ -382,7 +382,7 @@ void HTMLFrameElementImpl::setLocation( const DOMString& str ) // load the frame contents KHTMLView *w = getDocument()->view(); if (w) { - KHTMLPart *part = w->part()->tqfindFrame( name.string() ); + KHTMLPart *part = w->part()->findFrame( name.string() ); if ( part ) { part->openURL( KURL( getDocument()->completeURL( url.string() ) ) ); } else { @@ -570,7 +570,7 @@ void HTMLFrameSetElementImpl::recalcStyle( StyleChange ch ) { if (changed() && m_render) { m_render->setNeedsLayout(true); -// m_render->tqlayout(); +// m_render->layout(); setChanged(false); } HTMLElementImpl::recalcStyle( ch ); diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp index 413079483..e2ee3ba57 100644 --- a/khtml/html/html_documentimpl.cpp +++ b/khtml/html/html_documentimpl.cpp @@ -110,15 +110,15 @@ DOMString HTMLDocumentImpl::cookie() const long windowId = 0; KHTMLView *v = view (); - if ( v && v->tqtopLevelWidget() ) - windowId = v->tqtopLevelWidget()->winId(); + if ( v && v->topLevelWidget() ) + windowId = v->topLevelWidget()->winId(); TQCString replyType; TQByteArray params, reply; TQDataStream stream(params, IO_WriteOnly); stream << URL().url() << windowId; if (!kapp->dcopClient()->call("kcookiejar", "kcookiejar", - "tqfindDOMCookies(TQString,long int)", params, + "findDOMCookies(TQString,long int)", params, replyType, reply)) { kdWarning(6010) << "Can't communicate with cookiejar!" << endl; @@ -127,7 +127,7 @@ DOMString HTMLDocumentImpl::cookie() const TQDataStream stream2(reply, IO_ReadOnly); if(replyType != "TQString") { - kdError(6010) << "DCOP function tqfindDOMCookies(...) returns " + kdError(6010) << "DCOP function findDOMCookies(...) returns " << replyType << ", expected TQString" << endl; return DOMString(); } @@ -142,8 +142,8 @@ void HTMLDocumentImpl::setCookie( const DOMString & value ) long windowId = 0; KHTMLView *v = view (); - if ( v && v->tqtopLevelWidget() ) - windowId = v->tqtopLevelWidget()->winId(); + if ( v && v->topLevelWidget() ) + windowId = v->topLevelWidget()->winId(); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); @@ -192,7 +192,7 @@ void HTMLDocumentImpl::setBody(HTMLElementImpl *_body, int& exceptioncode) if ( !b ) documentElement()->appendChild( _body, exceptioncode ); else - documentElement()->tqreplaceChild( _body, b, exceptioncode ); + documentElement()->replaceChild( _body, b, exceptioncode ); } Tokenizer *HTMLDocumentImpl::createTokenizer() @@ -226,18 +226,18 @@ void HTMLDocumentImpl::slotHistoryChanged() return; recalcStyle( Force ); - m_render->tqrepaint(); + m_render->repaint(); } HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url) { TQString url = _url.string(); TQString s; - int pos = url.tqfind('#'); + int pos = url.find('#'); //kdDebug(0) << "map pos of #:" << pos << endl; - s = TQString(_url.tqunicode() + pos + 1, _url.length() - pos - 1); + s = TQString(_url.unicode() + pos + 1, _url.length() - pos - 1); - TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.tqfind(s); + TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.find(s); if (it != mapMap.end()) return *it; @@ -297,7 +297,7 @@ static int parseDocTypePart(const TQString& buffer, int index) else if (ch == '-') { int tmpIndex=index; if (buffer[index+1] == '-' && - ((tmpIndex=buffer.tqfind("--", index+2)) != -1)) + ((tmpIndex=buffer.find("--", index+2)) != -1)) index = tmpIndex+2; else return index; @@ -307,7 +307,7 @@ static int parseDocTypePart(const TQString& buffer, int index) } } -static bool tqcontainsString(const char* str, const TQString& buffer, int offset) +static bool containsString(const char* str, const TQString& buffer, int offset) { TQString startString(str); if (offset + startString.length() > buffer.length()) @@ -330,20 +330,20 @@ static bool parseDocTypeDeclaration(const TQString& buffer, // Skip through any comments and processing instructions. int index = 0; do { - index = buffer.tqfind('<', index); + index = buffer.find('<', index); if (index == -1) break; TQChar nextChar = buffer[index+1]; if (nextChar == '!') { - if (tqcontainsString("doctype", buffer, index+2)) { + if (containsString("doctype", buffer, index+2)) { haveDocType = true; index += 9; // Skip "<!DOCTYPE" break; } index = parseDocTypePart(buffer,index); - index = buffer.tqfind('>', index); + index = buffer.find('>', index); } else if (nextChar == '?') - index = buffer.tqfind('>', index); + index = buffer.find('>', index); else break; } while (index != -1); @@ -353,16 +353,16 @@ static bool parseDocTypeDeclaration(const TQString& buffer, *resultFlags |= PARSEMODE_HAVE_DOCTYPE; index = parseDocTypePart(buffer, index); - if (!tqcontainsString("html", buffer, index)) + if (!containsString("html", buffer, index)) return false; index = parseDocTypePart(buffer, index+4); - bool hasPublic = tqcontainsString("public", buffer, index); + bool hasPublic = containsString("public", buffer, index); if (hasPublic) { index = parseDocTypePart(buffer, index+6); // We've read <!DOCTYPE HTML PUBLIC (not case sensitive). - // Now we tqfind the beginning and end of the public identifers + // Now we find the beginning and end of the public identifers // and system identifiers (assuming they're even present). TQChar theChar = buffer[index]; if (theChar != '\"' && theChar != '\'') @@ -371,7 +371,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, // |start| is the first character (after the quote) and |end| // is the final quote, so there are |end|-|start| characters. int publicIDStart = index+1; - int publicIDEnd = buffer.tqfind(theChar, publicIDStart); + int publicIDEnd = buffer.find(theChar, publicIDStart); if (publicIDEnd == -1) return false; index = parseDocTypePart(buffer, publicIDEnd+1); @@ -385,7 +385,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, // We have a system identifier. *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID; int systemIDStart = index+1; - int systemIDEnd = buffer.tqfind(next, systemIDStart); + int systemIDEnd = buffer.find(next, systemIDStart); if (systemIDEnd == -1) return false; systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart); @@ -402,7 +402,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, publicID = publicID.simplifyWhiteSpace(); *resultFlags |= PARSEMODE_HAVE_PUBLIC_ID; } else { - if (tqcontainsString("system", buffer, index)) { + if (containsString("system", buffer, index)) { // Doctype has a system ID but no public ID *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID; index = parseDocTypePart(buffer, index+6); @@ -410,7 +410,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, if (next != '\"' && next != '\'') return false; int systemIDStart = index+1; - int systemIDEnd = buffer.tqfind(next, systemIDStart); + int systemIDEnd = buffer.find(next, systemIDStart); if (systemIDEnd == -1) return false; systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart); @@ -473,7 +473,7 @@ void HTMLDocumentImpl::determineParseMode( const TQString &str ) const char* pubIDStr = lowerPubID.latin1(); // Look up the entry in our gperf-generated table. - const PubIDInfo* doctypeEntry = tqfindDoctypeEntry(pubIDStr, publicID.length()); + const PubIDInfo* doctypeEntry = findDoctypeEntry(pubIDStr, publicID.length()); if (!doctypeEntry) { // The DOCTYPE is not in the list. Assume strict mode. // ### Doesn't make any sense, but it's what Mozilla does. diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp index f7a082f77..e6269d8b5 100644 --- a/khtml/html/html_elementimpl.cpp +++ b/khtml/html/html_elementimpl.cpp @@ -176,7 +176,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr) case ATTR_CLASS: if (attr->val()) { DOMString v = attr->value(); - const TQChar* s = v.tqunicode(); + const TQChar* s = v.unicode(); int l = v.length(); while( l && !s->isSpace() ) l--,s++; @@ -321,7 +321,7 @@ void HTMLElementImpl::addCSSLength(int id, const DOMString &value, bool numOnly, int v = kClamp( TQConstString(s, i).string().toInt(), -8192, 8191 ) ; const char* suffix = "px"; if (!numOnly || multiLength) { - // look if we tqfind a % or * + // look if we find a % or * while (i < l) { if (multiLength && s[i] == '*') { suffix = ""; @@ -354,11 +354,11 @@ static inline bool isHexDigit( const TQChar &c ) { static inline int toHex( const TQChar &c ) { return ( (c >= '0' && c <= '9') - ? (c.tqunicode() - '0') + ? (c.unicode() - '0') : ( ( c >= 'a' && c <= 'f' ) - ? (c.tqunicode() - 'a' + 10) + ? (c.unicode() - 'a' + 10) : ( ( c >= 'A' && c <= 'F' ) - ? (c.tqunicode() - 'A' + 10) + ? (c.unicode() - 'A' + 10) : -1 ) ) ); } @@ -457,7 +457,7 @@ DOMString HTMLElementImpl::innerHTML() const TQString result; //Use TQString to accumulate since DOMString is poor for appends for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) { DOMString kid = child->toString(); - result += TQConstString(kid.tqunicode(), kid.length()).string(); + result += TQConstString(kid.unicode(), kid.length()).string(); } return result; } @@ -469,7 +469,7 @@ DOMString HTMLElementImpl::innerText() const return text; const NodeImpl *n = this; - // tqfind the next text/image after the anchor, to get a position + // find the next text/image after the anchor, to get a position while(n) { if(n->firstChild()) n = n->firstChild(); @@ -620,32 +620,32 @@ void HTMLElementImpl::setInnerText( const DOMString &text, int& exceptioncode ) appendChild( t, exceptioncode ); } -void HTMLElementImpl::addHTMLAlignment( DOMString tqalignment ) +void HTMLElementImpl::addHTMLAlignment( DOMString alignment ) { - //qDebug("tqalignment is %s", tqalignment.string().latin1() ); - // vertical tqalignment with respect to the current baseline of the text + //qDebug("alignment is %s", alignment.string().latin1() ); + // vertical alignment with respect to the current baseline of the text // right or left means floating images int propfloat = -1; int propvalign = -1; - if ( strcasecmp( tqalignment, "absmiddle" ) == 0 ) { + if ( strcasecmp( alignment, "absmiddle" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; - } else if ( strcasecmp( tqalignment, "absbottom" ) == 0 ) { + } else if ( strcasecmp( alignment, "absbottom" ) == 0 ) { propvalign = CSS_VAL_BOTTOM; - } else if ( strcasecmp( tqalignment, "left" ) == 0 ) { + } else if ( strcasecmp( alignment, "left" ) == 0 ) { propfloat = CSS_VAL_LEFT; propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( tqalignment, "right" ) == 0 ) { + } else if ( strcasecmp( alignment, "right" ) == 0 ) { propfloat = CSS_VAL_RIGHT; propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( tqalignment, "top" ) == 0 ) { + } else if ( strcasecmp( alignment, "top" ) == 0 ) { propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( tqalignment, "middle" ) == 0 ) { + } else if ( strcasecmp( alignment, "middle" ) == 0 ) { propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE; - } else if ( strcasecmp( tqalignment, "center" ) == 0 ) { + } else if ( strcasecmp( alignment, "center" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; - } else if ( strcasecmp( tqalignment, "bottom" ) == 0 ) { + } else if ( strcasecmp( alignment, "bottom" ) == 0 ) { propvalign = CSS_VAL_BASELINE; - } else if ( strcasecmp ( tqalignment, "texttop") == 0 ) { + } else if ( strcasecmp ( alignment, "texttop") == 0 ) { propvalign = CSS_VAL_TEXT_TOP; } diff --git a/khtml/html/html_elementimpl.h b/khtml/html/html_elementimpl.h index 83836f15d..f71ae9b23 100644 --- a/khtml/html/html_elementimpl.h +++ b/khtml/html/html_elementimpl.h @@ -68,7 +68,7 @@ public: protected: // for IMG, OBJECT and APPLET - void addHTMLAlignment( DOMString tqalignment ); + void addHTMLAlignment( DOMString alignment ); }; class HTMLGenericElementImpl : public HTMLElementImpl diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index 6ace551ff..a72df3743 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -122,8 +122,8 @@ static TQCString encodeCString(const TQCString& e) // http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1 // safe characters like NS handles them for compatibility static const char *safe = "-._*"; - TQCString encoded(( e.length()+e.tqcontains( '\n' ) )*3 - +e.tqcontains('\r') * 3 + 1); + TQCString encoded(( e.length()+e.contains( '\n' ) )*3 + +e.contains('\r') * 3 + 1); int enclen = 0; bool crmissing = false; unsigned char oldc; @@ -193,7 +193,7 @@ inline static TQString escapeUnencodeable(const TQTextCodec* codec, const TQStri enc_string.append(c); else { TQString ampersandEscape; - ampersandEscape.sprintf("&#%u;", c.tqunicode()); + ampersandEscape.sprintf("&#%u;", c.unicode()); enc_string.append(ampersandEscape); } } @@ -216,7 +216,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) TQByteArray form_data(0); TQCString enc_string = ""; // used for non-multipart data - // tqfind out the QTextcodec to use + // find out the QTextcodec to use const TQString str = m_acceptcharset.string(); const TQChar space(' '); const unsigned int strLength = str.length(); @@ -231,7 +231,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) for ( ; it != itEnd; ++it ) { TQString enc = (*it); - if(enc.tqcontains("UNKNOWN")) + if(enc.contains("UNKNOWN")) { // use standard document encoding enc = "ISO 8859-1"; @@ -391,12 +391,12 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) void HTMLFormElementImpl::setEnctype( const DOMString& type ) { - if(type.string().tqfind("multipart", 0, false) != -1 || type.string().tqfind("form-data", 0, false) != -1) + if(type.string().find("multipart", 0, false) != -1 || type.string().find("form-data", 0, false) != -1) { m_enctype = "multipart/form-data"; m_multipart = true; m_post = true; - } else if (type.string().tqfind("text", 0, false) != -1 || type.string().tqfind("plain", 0, false) != -1) + } else if (type.string().find("text", 0, false) != -1 || type.string().find("plain", 0, false) != -1) { m_enctype = "text/plain"; m_multipart = false; @@ -457,7 +457,7 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) { if ((current->inputType() == HTMLInputElementImpl::PASSWORD || current->inputType() == HTMLInputElementImpl::TEXT) && !current->readOnly() && - map.tqcontains(current->name().string())) { + map.contains(current->name().string())) { getDocument()->setFocusNode(current); current->setValue(map[current->name().string()]); } @@ -888,7 +888,7 @@ HTMLFormElementImpl *HTMLGenericFormElementImpl::getForm() const p = p->parentNode(); } #ifdef FORMS_DEBUG - kdDebug( 6030 ) << "couldn't tqfind form!" << endl; + kdDebug( 6030 ) << "couldn't find form!" << endl; kdDebug( 6030 ) << kdBacktrace() << endl; #endif return 0; @@ -1316,10 +1316,10 @@ TQString HTMLInputElementImpl::state( ) { switch (m_type) { case PASSWORD: - return TQString::tqfromLatin1("."); // empty string, avoid restoring + return TQString::fromLatin1("."); // empty string, avoid restoring case CHECKBOX: case RADIO: - return TQString::tqfromLatin1(checked() ? "on" : "off"); + return TQString::fromLatin1(checked() ? "on" : "off"); case TEXT: if (autoComplete() && value() != getAttribute(ATTR_VALUE) && getDocument()->view()) getDocument()->view()->addFormCompletionItem(name().string(), value().string()); @@ -1334,7 +1334,7 @@ void HTMLInputElementImpl::restoreState(const TQString &state) switch (m_type) { case CHECKBOX: case RADIO: - setChecked((state == TQString::tqfromLatin1("on"))); + setChecked((state == TQString::fromLatin1("on"))); break; case FILE: m_value = DOMString(state.left(state.length()-1)); @@ -1560,12 +1560,12 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis if(m_clicked) { m_clicked = false; - TQString astr(nme.isEmpty() ? TQString::tqfromLatin1("x") : nme + ".x"); + TQString astr(nme.isEmpty() ? TQString::fromLatin1("x") : nme + ".x"); encoding += fixUpfromUnicode(codec, astr); astr.setNum(KMAX( clickX(), 0 )); encoding += fixUpfromUnicode(codec, astr); - astr = nme.isEmpty() ? TQString::tqfromLatin1("y") : nme + ".y"; + astr = nme.isEmpty() ? TQString::fromLatin1("y") : nme + ".y"; encoding += fixUpfromUnicode(codec, astr); astr.setNum(KMAX( clickY(), 0 ) ); encoding += fixUpfromUnicode(codec, astr); @@ -1612,7 +1612,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis KIO::UDSEntry filestat; // can't submit file in www-url-form encoded - TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->tqtopLevelWidget(); + TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget(); if (multipart) { TQCString filearray( "" ); if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) { @@ -2162,7 +2162,7 @@ DOMString HTMLSelectElementImpl::value( ) const void HTMLSelectElementImpl::setValue(DOMStringImpl* value) { - // tqfind the option with value() matching the given parameter + // find the option with value() matching the given parameter // and make it the current selection. TQMemArray<HTMLGenericFormElementImpl*> items = listItems(); for (unsigned i = 0; i < items.size(); i++) @@ -2192,7 +2192,7 @@ void HTMLSelectElementImpl::restoreState(const TQString &_state) recalcListItems(); TQString state = _state; - if(!state.isEmpty() && !state.tqcontains('X') && !m_multiple && m_size <= 1) { + if(!state.isEmpty() && !state.contains('X') && !m_multiple && m_size <= 1) { qWarning("should not happen in restoreState!"); state[0] = 'X'; } @@ -2217,9 +2217,9 @@ NodeImpl *HTMLSelectElementImpl::insertBefore ( NodeImpl *newChild, NodeImpl *re return result; } -void HTMLSelectElementImpl::tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ) +void HTMLSelectElementImpl::replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ) { - HTMLGenericFormElementImpl::tqreplaceChild(newChild,oldChild, exceptioncode); + HTMLGenericFormElementImpl::replaceChild(newChild,oldChild, exceptioncode); if( !exceptioncode ) setRecalcListItems(); } @@ -2374,7 +2374,7 @@ void HTMLSelectElementImpl::recalcListItems() const m_length = 0; while(current) { if (current->id() == ID_OPTGROUP && current->firstChild()) { - // ### what if optgroup tqcontains just comments? don't want one of no options in it... + // ### what if optgroup contains just comments? don't want one of no options in it... m_listItems.resize(m_listItems.size()+1); m_listItems[m_listItems.size()-1] = static_cast<HTMLGenericFormElementImpl*>(current); current = current->firstChild(); @@ -2745,7 +2745,7 @@ void HTMLTextAreaElementImpl::attach() static TQString expandLF(const TQString& s) { // LF -> CRLF - unsigned crs = s.tqcontains( '\n' ); + unsigned crs = s.contains( '\n' ); if (crs == 0) return s; unsigned len = s.length(); @@ -2756,7 +2756,7 @@ static TQString expandLF(const TQString& s) for(unsigned pos = 0; pos < len; pos++) { TQChar c = s.at(pos); - switch(c.tqunicode()) + switch(c.unicode()) { case '\n': r[pos2++] = '\r'; @@ -2814,8 +2814,8 @@ DOMString HTMLTextAreaElementImpl::value() void HTMLTextAreaElementImpl::setValue(DOMString _value) { // \r\n -> \n, \r -> \n - TQString str = _value.string().tqreplace( "\r\n", "\n" ); - m_value = str.tqreplace( '\r', '\n' ); + TQString str = _value.string().replace( "\r\n", "\n" ); + m_value = str.replace( '\r', '\n' ); m_dirtyvalue = false; m_initialized = true; setChanged(true); @@ -2844,7 +2844,7 @@ DOMString HTMLTextAreaElementImpl::defaultValue() void HTMLTextAreaElementImpl::setDefaultValue(DOMString _defaultValue) { - // there may be comments - remove all the text nodes and tqreplace them with one + // there may be comments - remove all the text nodes and replace them with one TQPtrList<NodeImpl> toRemove; NodeImpl *n; for (n = firstChild(); n; n = n->nextSibling()) @@ -2953,7 +2953,7 @@ void HTMLIsIndexElementImpl::parseAttribute(AttributeImpl* attr) DOMString HTMLIsIndexElementImpl::prompt() const { // When IsIndex is parsed, <HR/>Prompt: <ISINDEX/><HR/> is created. - // So we have to look at the previous sibling to tqfind the prompt text + // So we have to look at the previous sibling to find the prompt text DOM::NodeImpl* const prev = previousSibling(); if ( prev && prev->nodeType() == DOM::Node::TEXT_NODE) return prev->nodeValue(); @@ -2963,7 +2963,7 @@ DOMString HTMLIsIndexElementImpl::prompt() const void HTMLIsIndexElementImpl::setPrompt(const DOMString& str) { // When IsIndex is parsed, <HR/>Prompt: <ISINDEX/><HR/> is created. - // So we have to look at the previous sibling to tqfind the prompt text + // So we have to look at the previous sibling to find the prompt text int exceptioncode = 0; DOM::NodeImpl* const prev = previousSibling(); if ( prev && prev->nodeType() == DOM::Node::TEXT_NODE) diff --git a/khtml/html/html_formimpl.h b/khtml/html/html_formimpl.h index e4db1a931..40fefc9ee 100644 --- a/khtml/html/html_formimpl.h +++ b/khtml/html/html_formimpl.h @@ -415,7 +415,7 @@ public: virtual void restoreState(const TQString &state); virtual NodeImpl *insertBefore ( NodeImpl *newChild, NodeImpl *refChild, int &exceptioncode ); - virtual void tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ); + virtual void replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ); virtual void removeChild ( NodeImpl *oldChild, int &exceptioncode ); virtual NodeImpl *appendChild ( NodeImpl *newChild, int &exceptioncode ); virtual NodeImpl *addChild( NodeImpl* newChild ); diff --git a/khtml/html/html_headimpl.cpp b/khtml/html/html_headimpl.cpp index 0f85206b9..d7154e936 100644 --- a/khtml/html/html_headimpl.cpp +++ b/khtml/html/html_headimpl.cpp @@ -148,7 +148,7 @@ void HTMLLinkElementImpl::parseAttribute(AttributeImpl *attr) // disabling: recheck alternate status TQString rel = getAttribute(ATTR_REL).string().lower(); TQString type = getAttribute(ATTR_TYPE).string().lower(); - m_alternate = (type.tqcontains("text/css") || rel.tqcontains("stylesheet")) && rel.tqcontains("alternate"); + m_alternate = (type.contains("text/css") || rel.contains("stylesheet")) && rel.contains("alternate"); } if (isLoading()) break; @@ -179,19 +179,19 @@ void HTMLLinkElementImpl::process() // IE extension: location of small icon for locationbar / bookmarks // Uses both "shortcut icon" and "icon" - if ( part && rel.tqcontains("icon") && !m_url.isEmpty() && !part->parentPart()) + if ( part && rel.contains("icon") && !m_url.isEmpty() && !part->parentPart()) part->browserExtension()->setIconURL( KURL(m_url.string()) ); // Stylesheet else if (!m_isDisabled && - (type.tqcontains("text/css") || rel.tqcontains("stylesheet"))) { + (type.contains("text/css") || rel.contains("stylesheet"))) { // no need to load style sheets which aren't for the screen output // ### there may be in some situations e.g. for an editor or script to manipulate - if( m_media.isNull() || m_media.tqcontains("screen") || m_media.tqcontains("all") || m_media.tqcontains("print") ) { + if( m_media.isNull() || m_media.contains("screen") || m_media.contains("all") || m_media.contains("print") ) { m_loading = true; // Add ourselves as a pending sheet, but only if we aren't an alternate // stylesheet. Alternate stylesheets don't hold up render tree construction. - m_alternate = rel.tqcontains("alternate"); + m_alternate = rel.contains("alternate"); if (!isAlternate()) getDocument()->addPendingSheet(); @@ -572,7 +572,7 @@ void HTMLStyleElementImpl::childrenChanged() m_loading = false; if ((m_type.isEmpty() || m_type == "text/css") // Type must be empty or CSS - && (m_media.isNull() || m_media.tqcontains("screen") || m_media.tqcontains("all") || m_media.tqcontains("print"))) { + && (m_media.isNull() || m_media.contains("screen") || m_media.contains("all") || m_media.contains("print"))) { getDocument()->addPendingSheet(); m_loading = true; m_sheet = new CSSStyleSheetImpl(this); diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp index 3ba2c2da0..be13e93c2 100644 --- a/khtml/html/html_imageimpl.cpp +++ b/khtml/html/html_imageimpl.cpp @@ -214,7 +214,7 @@ DOMString HTMLImageElementImpl::altText() const if ( alt.isNull() ) { TQString p = KURL( getDocument()->completeURL( getAttribute(ATTR_SRC).string() ) ).prettyURL(); int pos; - if ( ( pos = p.tqfindRev( '.' ) ) > 0 ) + if ( ( pos = p.findRev( '.' ) ) > 0 ) p.truncate( pos ); alt = DOMString( KStringHandler::csqueeze( p ) ); } @@ -286,7 +286,7 @@ long HTMLImageElementImpl::width() const if (changed()) { getDocument()->updateRendering(); if (getDocument()->view()) - getDocument()->view()->tqlayout(); + getDocument()->view()->layout(); } return m_render ? m_render->contentWidth() : @@ -309,7 +309,7 @@ long HTMLImageElementImpl::height() const if (changed()) { getDocument()->updateRendering(); if (getDocument()->view()) - getDocument()->view()->tqlayout(); + getDocument()->view()->layout(); } return m_render ? m_render->contentHeight() : @@ -418,8 +418,8 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr) case ATTR_NAME: { DOMString s = attr->value(); - if(*s.tqunicode() == '#') - name = TQString(s.tqunicode()+1, s.length()-1).lower(); + if(*s.unicode() == '#') + name = TQString(s.unicode()+1, s.length()-1).lower(); else name = s.string().lower(); // ### make this work for XML documents, e.g. in case of <html:map...> @@ -441,7 +441,7 @@ HTMLAreaElementImpl::HTMLAreaElementImpl(DocumentImpl *doc) m_coords=0; m_coordsLen = 0; nohref = false; - tqshape = Unknown; + shape = Unknown; lasth = lastw = -1; } @@ -461,13 +461,13 @@ void HTMLAreaElementImpl::parseAttribute(AttributeImpl *attr) { case ATTR_SHAPE: if ( strcasecmp( attr->value(), "default" ) == 0 ) - tqshape = Default; + shape = Default; else if ( strcasecmp( attr->value(), "circle" ) == 0 ) - tqshape = Circle; + shape = Circle; else if ( strcasecmp( attr->value(), "poly" ) == 0 || strcasecmp( attr->value(), "polygon" ) == 0 ) - tqshape = Poly; + shape = Poly; else if ( strcasecmp( attr->value(), "rect" ) == 0 ) - tqshape = Rect; + shape = Rect; break; case ATTR_COORDS: delete [] m_coords; @@ -497,7 +497,7 @@ bool HTMLAreaElementImpl::mapMouseEvent(int x_, int y_, int width_, int height_, region=getRegion(width_, height_); lastw=width_; lasth=height_; } - if (region.tqcontains(TQPoint(x_,y_))) + if (region.contains(TQPoint(x_,y_))) { inside = true; info.setInnerNode(this); @@ -530,7 +530,7 @@ TQRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const // what the HTML author tried to tell us. // a Poly needs at least 3 points (6 coords), so this is correct - if ((tqshape==Poly || tqshape==Unknown) && m_coordsLen > 5) { + if ((shape==Poly || shape==Unknown) && m_coordsLen > 5) { // make sure its even int len = m_coordsLen >> 1; TQPointArray points(len); @@ -539,19 +539,19 @@ TQRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const m_coords[(i<<1)+1].minWidth(height_)); region = TQRegion(points); } - else if (tqshape==Circle && m_coordsLen>=3 || tqshape==Unknown && m_coordsLen == 3) { + else if (shape==Circle && m_coordsLen>=3 || shape==Unknown && m_coordsLen == 3) { int r = kMin(m_coords[2].minWidth(width_), m_coords[2].minWidth(height_)); region = TQRegion(m_coords[0].minWidth(width_)-r, m_coords[1].minWidth(height_)-r, 2*r, 2*r,TQRegion::Ellipse); } - else if (tqshape==Rect && m_coordsLen>=4 || tqshape==Unknown && m_coordsLen == 4) { + else if (shape==Rect && m_coordsLen>=4 || shape==Unknown && m_coordsLen == 4) { int x0 = m_coords[0].minWidth(width_); int y0 = m_coords[1].minWidth(height_); int x1 = m_coords[2].minWidth(width_); int y1 = m_coords[3].minWidth(height_); region = TQRegion(x0,y0,x1-x0,y1-y0); } - else if (tqshape==Default) + else if (shape==Default) region = TQRegion(0,0,width_,height_); // else // return null region diff --git a/khtml/html/html_imageimpl.h b/khtml/html/html_imageimpl.h index 1a389e895..6f26cd2df 100644 --- a/khtml/html/html_imageimpl.h +++ b/khtml/html/html_imageimpl.h @@ -102,7 +102,7 @@ public: virtual void parseAttribute(AttributeImpl *attr); - bool isDefault() const { return tqshape==Default; } + bool isDefault() const { return shape==Default; } bool mapMouseEvent(int x_, int y_, int width_, int height_, khtml::RenderObject::NodeInfo& info); @@ -117,7 +117,7 @@ protected: khtml::Length* m_coords; int m_coordsLen; int lastw, lasth; - Shape tqshape : 3; + Shape shape : 3; bool nohref : 1; }; diff --git a/khtml/html/html_miscimpl.cpp b/khtml/html/html_miscimpl.cpp index 84460195c..58804bff5 100644 --- a/khtml/html/html_miscimpl.cpp +++ b/khtml/html/html_miscimpl.cpp @@ -225,7 +225,7 @@ NodeImpl *HTMLCollectionImpl::item ( unsigned long index ) const HTMLTableSectionElementImpl* section; NodeImpl* found = 0; - if (table->tqfindRowSection(index, section, sectionIndex)) { + if (table->findRowSection(index, section, sectionIndex)) { HTMLCollectionImpl rows(section, TSECTION_ROWS); found = rows.item(sectionIndex); } @@ -290,7 +290,7 @@ TQValueList<NodeImpl*> HTMLCollectionImpl::namedItems( const DOMString &name ) c //remember stuff about elements we were asked for. m_cache->updateNodeListInfo(m_refNode->getDocument()); CollectionCache* cache = static_cast<CollectionCache*>(m_cache); - if (TQValueList<NodeImpl*>* info = cache->nameCache.tqfind(key)) { + if (TQValueList<NodeImpl*>* info = cache->nameCache.find(key)) { return *info; } else { @@ -366,7 +366,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const { TQPtrList<HTMLGenericFormElementImpl>& l = static_cast<HTMLFormElementImpl*>( m_refNode )->formElements; - //Go through the list, trying to tqfind the appropriate named form element. + //Go through the list, trying to find the appropriate named form element. for ( ; currentNamePos < l.count(); ++currentNamePos ) { HTMLGenericFormElementImpl* el = l.at(currentNamePos); diff --git a/khtml/html/html_miscimpl.h b/khtml/html/html_miscimpl.h index f66274d4a..b28fef82a 100644 --- a/khtml/html/html_miscimpl.h +++ b/khtml/html/html_miscimpl.h @@ -106,7 +106,7 @@ protected: bool checkForNameMatch(NodeImpl *node, const DOMString &name) const; }; -// this whole class is just a big hack to tqfind form elements even in +// this whole class is just a big hack to find form elements even in // malformed HTML elements // the famous <table><tr><form><td> problem class HTMLFormCollectionImpl : public HTMLCollectionImpl diff --git a/khtml/html/html_objectimpl.cpp b/khtml/html/html_objectimpl.cpp index a4c1920ac..106a862e9 100644 --- a/khtml/html/html_objectimpl.cpp +++ b/khtml/html/html_objectimpl.cpp @@ -57,7 +57,7 @@ HTMLObjectBaseElementImpl::HTMLObjectBaseElementImpl(DocumentImpl *doc) void HTMLObjectBaseElementImpl::setServiceType(const TQString & val) { serviceType = val.lower(); - int pos = serviceType.tqfind( ";" ); + int pos = serviceType.find( ";" ); if ( pos!=-1 ) serviceType.truncate( pos ); } @@ -160,9 +160,9 @@ void HTMLObjectBaseElementImpl::attach() { if (serviceType.isEmpty() && url.startsWith("data:")) { // Extract the MIME type from the data URL. - int index = url.tqfind(';'); + int index = url.find(';'); if (index == -1) - index = url.tqfind(','); + index = url.find(','); if (index != -1) { int len = index - 5; if (len > 0) diff --git a/khtml/html/html_tableimpl.cpp b/khtml/html/html_tableimpl.cpp index 1c982a624..2c2e6567d 100644 --- a/khtml/html/html_tableimpl.cpp +++ b/khtml/html/html_tableimpl.cpp @@ -81,7 +81,7 @@ NodeImpl* HTMLTableElementImpl::setCaption( HTMLTableCaptionElementImpl *c ) int exceptioncode = 0; NodeImpl* r; if(ElementImpl* cap = caption()) { - tqreplaceChild ( c, cap, exceptioncode ); + replaceChild ( c, cap, exceptioncode ); r = c; } else @@ -95,7 +95,7 @@ NodeImpl* HTMLTableElementImpl::setTHead( HTMLTableSectionElementImpl *s ) int exceptioncode = 0; NodeImpl* r; if( ElementImpl* head = tHead() ) { - tqreplaceChild( s, head, exceptioncode ); + replaceChild( s, head, exceptioncode ); r = s; } else if(ElementImpl* foot = tFoot()) @@ -114,7 +114,7 @@ NodeImpl* HTMLTableElementImpl::setTFoot( HTMLTableSectionElementImpl *s ) int exceptioncode = 0; NodeImpl* r; if(ElementImpl* foot = tFoot()) { - tqreplaceChild ( s, foot, exceptioncode ); + replaceChild ( s, foot, exceptioncode ); r = s; } else if(ElementImpl* firstBody = tFirstBody()) r = insertBefore( s, firstBody, exceptioncode ); @@ -130,7 +130,7 @@ NodeImpl* HTMLTableElementImpl::setTBody( HTMLTableSectionElementImpl *s ) NodeImpl* r; if(ElementImpl* firstBody = tFirstBody()) { - tqreplaceChild ( s, firstBody, exceptioncode ); + replaceChild ( s, firstBody, exceptioncode ); r = s; } else r = appendChild( s, exceptioncode ); @@ -205,7 +205,7 @@ void HTMLTableElementImpl::deleteCaption( ) } /** - Helper. This checks whether the section tqcontains the desired index, and if so, + Helper. This checks whether the section contains the desired index, and if so, returns the section. Otherwise, it adjust the index, and returns 0. indeces < 0 are considered to be infinite. @@ -227,7 +227,7 @@ static inline HTMLTableSectionElementImpl* processSection(HTMLTableSectionElemen } -bool HTMLTableElementImpl::tqfindRowSection(long index, +bool HTMLTableElementImpl::findRowSection(long index, HTMLTableSectionElementImpl*& outSection, long& outIndex) const { @@ -280,7 +280,7 @@ HTMLElementImpl *HTMLTableElementImpl::insertRow( long index, int &exceptioncode long sectionIndex; HTMLTableSectionElementImpl* section; - if ( tqfindRowSection( index, section, sectionIndex ) ) + if ( findRowSection( index, section, sectionIndex ) ) return section->insertRow( sectionIndex, exceptioncode ); else if ( index == -1 || sectionIndex == 0 ) return section->insertRow( section->numRows(), exceptioncode ); @@ -294,7 +294,7 @@ void HTMLTableElementImpl::deleteRow( long index, int &exceptioncode ) { long sectionIndex; HTMLTableSectionElementImpl* section; - if ( tqfindRowSection( index, section, sectionIndex ) ) + if ( findRowSection( index, section, sectionIndex ) ) section->deleteRow( sectionIndex, exceptioncode ); else if ( section && index == -1 ) section->deleteRow( -1, exceptioncode ); @@ -389,10 +389,10 @@ NodeImpl *HTMLTableElementImpl::insertBefore ( NodeImpl *newChild, NodeImpl *ref return retval; } -void HTMLTableElementImpl::tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ) +void HTMLTableElementImpl::replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ) { handleChildRemove( oldChild ); //Always safe. - HTMLElementImpl::tqreplaceChild( newChild, oldChild, exceptioncode ); + HTMLElementImpl::replaceChild( newChild, oldChild, exceptioncode ); if ( !exceptioncode ) handleChildAdd( newChild ); } diff --git a/khtml/html/html_tableimpl.h b/khtml/html/html_tableimpl.h index 277d76d14..76d81ce50 100644 --- a/khtml/html/html_tableimpl.h +++ b/khtml/html/html_tableimpl.h @@ -277,7 +277,7 @@ public: // overrides virtual NodeImpl *addChild(NodeImpl *child); virtual NodeImpl *insertBefore ( NodeImpl *newChild, NodeImpl *refChild, int &exceptioncode ); - virtual void tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ); + virtual void replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ); virtual void removeChild ( NodeImpl *oldChild, int &exceptioncode ); virtual NodeImpl *appendChild ( NodeImpl *newChild, int &exceptioncode ); @@ -285,7 +285,7 @@ public: virtual void attach(); virtual void close(); - /* Tries to tqfind the section containing row number outIndex. + /* Tries to find the section containing row number outIndex. Returns whether it succeeded or not. negative outIndex values are interpreted as being infinite. @@ -295,7 +295,7 @@ public: On failure, outSection points to the last section of the table, and index is the offset the row would have if there was an additional section. */ - bool tqfindRowSection(long inIndex, + bool findRowSection(long inIndex, HTMLTableSectionElementImpl*& outSection, long& outIndex) const; protected: diff --git a/khtml/html/htmlparser.cpp b/khtml/html/htmlparser.cpp index dd4c4344e..9da99f4b3 100644 --- a/khtml/html/htmlparser.cpp +++ b/khtml/html/htmlparser.cpp @@ -239,7 +239,7 @@ void KHTMLParser::parseToken(Token *t) if(inBody && !skipMode() && current->id() != ID_STYLE && current->id() != ID_TITLE && current->id() != ID_SCRIPT && - !t->text->tqcontainsOnlyWhitespace()) haveContent = true; + !t->text->containsOnlyWhitespace()) haveContent = true; #ifdef PARSER_DEBUG kdDebug(6035) << "length="<< t->text->l << " text='" << TQConstString(t->text->s, t->text->l).string() << "'" << endl; #endif @@ -509,7 +509,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat) { // Don't try to fit random white-space anywhere TextImpl *t = static_cast<TextImpl *>(n); - if (t->tqcontainsOnlyWhitespace()) + if (t->containsOnlyWhitespace()) return false; // ignore text inside the following elements. switch(current->id()) @@ -617,7 +617,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat) break; case ID_TEXT: { TextImpl *t = static_cast<TextImpl *>(n); - if (t->tqcontainsOnlyWhitespace()) + if (t->containsOnlyWhitespace()) return false; /* Fall through to default */ } @@ -1425,7 +1425,7 @@ void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem) newNode->appendChild(currNode, exceptionCode); currNode = nextNode; - // TODO - To be tqreplaced. + // TODO - To be replaced. // Re-register form elements with currently active form, step 1 will have removed them if (form && currNode && currNode->isGenericFormElement()) { diff --git a/khtml/html/htmlparser.h b/khtml/html/htmlparser.h index a8329f0fc..d0ce549ef 100644 --- a/khtml/html/htmlparser.h +++ b/khtml/html/htmlparser.h @@ -30,7 +30,7 @@ #define HTMLPARSER_H // 0 all -// 1 domtree + rendertree + styleForElement, no tqlayouting +// 1 domtree + rendertree + styleForElement, no layouting // 2 domtree only #define SPEED_DEBUG 0 diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp index ba8e99a50..5da6edd14 100644 --- a/khtml/html/htmltokenizer.cpp +++ b/khtml/html/htmltokenizer.cpp @@ -89,7 +89,7 @@ static const char titleEnd [] = "</title"; #define fixUpChar(x) #else #define fixUpChar(x) \ - switch ((x).tqunicode()) \ + switch ((x).unicode()) \ { \ case 0x80: (x) = 0x20ac; break; \ case 0x82: (x) = 0x201a; break; \ @@ -347,7 +347,7 @@ void HTMLTokenizer::parseSpecial(TokenizerString &src) // possible end of tagname, lets check. if ( !scriptCodeResync && !escaped && !src.escaped() && ( ch == '>' || ch == '/' || ch <= ' ' ) && ch && scriptCodeSize >= searchStopperLen && - !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().tqfind( searchStopper, 0, false )) { + !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().find( searchStopper, 0, false )) { scriptCodeResync = scriptCodeSize-searchStopperLen+1; tquote = NoQuote; continue; @@ -471,7 +471,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src) if (strict) { - if (src->tqunicode() == '-') { + if (src->unicode() == '-') { delimiterCount++; if (delimiterCount == 2) { delimiterCount = 0; @@ -482,7 +482,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src) delimiterCount = 0; } - if ((!strict || canClose) && src->tqunicode() == '>') + if ((!strict || canClose) && src->unicode() == '>') { bool handleBrokenComments = brokenComments && !( script || style ); bool scriptEnd=false; @@ -521,7 +521,7 @@ void HTMLTokenizer::parseServer(TokenizerString &src) checkScriptBuffer(src.length()); while ( !src.isEmpty() ) { scriptCode[ scriptCodeSize++ ] = *src; - if (src->tqunicode() == '>' && + if (src->unicode() == '>' && scriptCodeSize > 1 && scriptCode[scriptCodeSize-2] == '%') { ++src; server = false; @@ -607,7 +607,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) while( !src.isEmpty() ) { - ushort cc = src->tqunicode(); + ushort cc = src->unicode(); switch(Entity) { case NoEntity: return; @@ -639,7 +639,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) case Hexadecimal: { - int uc = EntityChar.tqunicode(); + int uc = EntityChar.unicode(); int ll = kMin<uint>(src.length(), 8); while(ll--) { TQChar csrc(src->lower()); @@ -658,7 +658,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) } case Decimal: { - int uc = EntityChar.tqunicode(); + int uc = EntityChar.unicode(); int ll = kMin(src.length(), 9-cBufferPos); while(ll--) { cc = src->cell(); @@ -695,7 +695,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) // be IE compatible and interpret even unterminated entities // outside tags. like "foo  stuff bla". if ( tag == NoTag ) { - const entity* e = kde_tqfindEntity(cBuffer, cBufferPos); + const entity* e = kde_findEntity(cBuffer, cBufferPos); if ( e && e->code < 256 ) { EntityChar = e->code; entityLen = cBufferPos; @@ -705,7 +705,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) if(cBufferPos == 9) Entity = SearchSemicolon; if(Entity == SearchSemicolon) { if(cBufferPos > 1) { - const entity *e = kde_tqfindEntity(cBuffer, cBufferPos); + const entity *e = kde_findEntity(cBuffer, cBufferPos); // IE only accepts unterminated entities < 256, // Gecko accepts them all, but only outside tags if(e && ( tag == NoTag || e->code < 256 || *src == ';' )) { @@ -718,7 +718,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) } case SearchSemicolon: #ifdef TOKEN_DEBUG - kdDebug( 6036 ) << "ENTITY " << EntityChar.tqunicode() << endl; + kdDebug( 6036 ) << "ENTITY " << EntityChar.unicode() << endl; #endif fixUpChar(EntityChar); @@ -813,7 +813,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) break; } // this is a nasty performance trick. will work for the A-Z - // characters, but not for others. if it tqcontains one, + // characters, but not for others. if it contains one, // we fail anyway char cc = curchar; cBuffer[cBufferPos++] = cc | 0x20; @@ -919,7 +919,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) a = khtml::getAttrID(cBuffer, cBufferPos-1); } if (!a) - attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data()); + attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data()); } dest = buffer; @@ -941,7 +941,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) } if ( cBufferPos == CBUFLEN ) { cBuffer[cBufferPos] = '\0'; - attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data()); + attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data()); dest = buffer; *dest++ = 0; tag = SearchEqual; @@ -956,7 +956,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) ushort curchar; bool atespace = false; while(!src.isEmpty()) { - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar > ' ') { if(curchar == '=') { #ifdef TOKEN_DEBUG @@ -988,7 +988,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) { ushort curchar; while(!src.isEmpty()) { - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar > ' ') { if(( curchar == '\'' || curchar == '\"' )) { tquote = curchar == '\"' ? DoubleQuote : SingleQuote; @@ -1012,7 +1012,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) while(!src.isEmpty()) { checkBuffer(); - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar <= '\'' && !src.escaped()) { // ### attributes like '&{blaa....};' are supposed to be treated as jscript. if ( curchar == '&' ) @@ -1050,7 +1050,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) ushort curchar; while(!src.isEmpty()) { checkBuffer(); - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar <= '>' && !src.escaped()) { // parse Entities if ( curchar == '&' ) @@ -1351,7 +1351,7 @@ void HTMLTokenizer::write( const TokenizerString &str, bool appendData ) // do we need to enlarge the buffer? checkBuffer(); - ushort cc = src->tqunicode(); + ushort cc = src->unicode(); if (skipLF && (cc != '\n')) skipLF = false; @@ -1595,7 +1595,7 @@ void HTMLTokenizer::finish() killTimer( m_autoCloseTimer ); m_autoCloseTimer = 0; } - // do this as long as we don't tqfind matching comment ends + // do this as long as we don't find matching comment ends while((title || script || comment || server) && scriptCode && scriptCodeSize) { // we've found an unmatched comment start @@ -1618,7 +1618,7 @@ void HTMLTokenizer::finish() food += TQString(scriptCode, scriptCodeSize); } else { - pos = TQConstString(scriptCode, scriptCodeSize).string().tqfind('>'); + pos = TQConstString(scriptCode, scriptCodeSize).string().find('>'); food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy } KHTML_DELETE_QCHAR_VEC(scriptCode); diff --git a/khtml/html/htmltokenizer.h b/khtml/html/htmltokenizer.h index 2f257b106..8e36353b0 100644 --- a/khtml/html/htmltokenizer.h +++ b/khtml/html/htmltokenizer.h @@ -56,7 +56,7 @@ namespace khtml { * @internal * represents one HTML tag. Consists of a numerical id, and the list * of attributes. Can also represent text. In this case the id = 0 and - * text tqcontains the text. + * text contains the text. */ class Token { @@ -76,8 +76,8 @@ namespace khtml { { DOMStringImpl *value = 0; NodeImpl::Id tid = 0; - if(buffer->tqunicode()) { - tid = buffer->tqunicode(); + if(buffer->unicode()) { + tid = buffer->unicode(); value = v.implementation(); } else if ( !attrName.isEmpty() && attrName != "/" ) { diff --git a/khtml/htmlpageinfo.ui b/khtml/htmlpageinfo.ui index f7a299eb4..37adef500 100644 --- a/khtml/htmlpageinfo.ui +++ b/khtml/htmlpageinfo.ui @@ -6,7 +6,7 @@ <property name="name"> <cstring>HTMLPageInfo</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -42,7 +42,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -263,7 +263,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -292,8 +292,8 @@ <include location="global" impldecl="in declaration">qlistview.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/khtml/java/KJAS_GRAMMAR.txt b/khtml/java/KJAS_GRAMMAR.txt index bd2359f8b..5632f8de8 100644 --- a/khtml/java/KJAS_GRAMMAR.txt +++ b/khtml/java/KJAS_GRAMMAR.txt @@ -15,7 +15,7 @@ KJAS Grammar <initApplet> | <showURLInFrame> | <showDocument> | - <showtqStatus> | + <showStatus> | <resizeApplet> | <getURLData> | <URLData> | @@ -43,7 +43,7 @@ KJAS Grammar <SEP><URL><END> <showURLInFrame> -> <1 byte equal to 9 when cast as int><SEP><ContextID> <SEP><URL><SEP><targetFrame><END> -<showtqStatus> -> <1 byte equal to 10 when cast as int><SEP><ContextID> +<showStatus> -> <1 byte equal to 10 when cast as int><SEP><ContextID> <SEP><string><END> <resizeApplet> -> <1 byte equal to 11 when cast as int><SEP><ContextID> <SEP><AppletID><SEP><Width><SEP><Height><END> diff --git a/khtml/java/README b/khtml/java/README index 69538ed8b..5d64e742f 100644 --- a/khtml/java/README +++ b/khtml/java/README @@ -14,7 +14,7 @@ kjava-classes.zip An *uncompressed* ZIP file containing the .class files support some crappy JVMs. org/kde/kjas/server Java sources for KJAS server process -You can tqfind more information at http://developer.kde.org/language-bindings/java/ +You can find more information at http://developer.kde.org/language-bindings/java/ Richard Moore. rich@kde.org diff --git a/khtml/java/kjava.jar b/khtml/java/kjava.jar Binary files differindex f2a92ac85..afab6884b 100644 --- a/khtml/java/kjava.jar +++ b/khtml/java/kjava.jar diff --git a/khtml/java/kjavaapplet.cpp b/khtml/java/kjavaapplet.cpp index fad22f9eb..879c8624e 100644 --- a/khtml/java/kjavaapplet.cpp +++ b/khtml/java/kjavaapplet.cpp @@ -222,27 +222,27 @@ void KJavaApplet::stateChange( const int newStateInt ) { break; case INSTANCIATED: if (ok) { - showtqStatus(i18n("Initializing Applet \"%1\"...").arg(appletName())); + showStatus(i18n("Initializing Applet \"%1\"...").arg(appletName())); } ok = (d->state == CLASS_LOADED); break; case INITIALIZED: ok = (d->state == INSTANCIATED); if (ok) { - showtqStatus(i18n("Starting Applet \"%1\"...").arg(appletName())); + showStatus(i18n("Starting Applet \"%1\"...").arg(appletName())); start(); } break; case STARTED: ok = (d->state == INITIALIZED || d->state == STOPPED); if (ok) { - showtqStatus(i18n("Applet \"%1\" started").arg(appletName())); + showStatus(i18n("Applet \"%1\" started").arg(appletName())); } break; case STOPPED: ok = (d->state == INITIALIZED || d->state == STARTED); if (ok) { - showtqStatus(i18n("Applet \"%1\" stopped").arg(appletName())); + showStatus(i18n("Applet \"%1\" stopped").arg(appletName())); } break; case DESTROYED: @@ -259,7 +259,7 @@ void KJavaApplet::stateChange( const int newStateInt ) { } } -void KJavaApplet::showtqStatus(const TQString &msg) { +void KJavaApplet::showStatus(const TQString &msg) { TQStringList args; args << msg; context->processCmd("showstatus", args); diff --git a/khtml/java/kjavaapplet.h b/khtml/java/kjavaapplet.h index 15d89d4cd..6fe0f7709 100644 --- a/khtml/java/kjavaapplet.h +++ b/khtml/java/kjavaapplet.h @@ -47,7 +47,7 @@ class KJavaAppletContext; class KJavaAppletPrivate; -class KJavaApplet : public TQObject +class KJavaApplet : public QObject { Q_OBJECT @@ -238,7 +238,7 @@ public: signals: void jsEvent (const TQStringList & args); private: - void showtqStatus( const TQString &msg); + void showStatus( const TQString &msg); KJavaAppletPrivate* d; TQMap<TQString, TQString> params; KJavaAppletContext* context; diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp index 6875ddfe5..76914a5dc 100644 --- a/khtml/java/kjavaappletcontext.cpp +++ b/khtml/java/kjavaappletcontext.cpp @@ -138,27 +138,27 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg kdDebug(6100) << "KJavaAppletContext::received, cmd = >>" << cmd << "<<" << endl; kdDebug(6100) << "arg count = " << arg.count() << endl; - if ( cmd == TQString::tqfromLatin1("showstatus") + if ( cmd == TQString::fromLatin1("showstatus") && !arg.empty() ) { TQString tmp = arg.first(); - tmp.tqreplace(TQRegExp("[\n\r]"), ""); + tmp.replace(TQRegExp("[\n\r]"), ""); kdDebug(6100) << "status message = " << tmp << endl; - emit showtqStatus( tmp ); + emit showStatus( tmp ); } - else if ( cmd == TQString::tqfromLatin1( "showurlinframe" ) + else if ( cmd == TQString::fromLatin1( "showurlinframe" ) && arg.count() > 1 ) { kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl; emit showDocument( arg[0], arg[1] ); } - else if ( cmd == TQString::tqfromLatin1( "showdocument" ) + else if ( cmd == TQString::fromLatin1( "showdocument" ) && !arg.empty() ) { kdDebug(6100) << "url = " << arg.first() << endl; emit showDocument( arg.first(), "_top" ); } - else if ( cmd == TQString::tqfromLatin1( "resizeapplet" ) + else if ( cmd == TQString::fromLatin1( "resizeapplet" ) && arg.count() > 2 ) { //arg[1] should be appletID @@ -180,10 +180,10 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg tmp->resizeAppletWidget( width, height ); } } - else if (cmd.startsWith(TQString::tqfromLatin1("audioclip_"))) { + else if (cmd.startsWith(TQString::fromLatin1("audioclip_"))) { kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd << " " << arg[0] << endl; } - else if ( cmd == TQString::tqfromLatin1( "JS_Event" ) + else if ( cmd == TQString::fromLatin1( "JS_Event" ) && arg.count() > 2 ) { bool ok; @@ -198,7 +198,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg else kdError(DEBUGAREA) << "parse JS event " << arg[0] << " " << arg[1] << endl; } - else if ( cmd == TQString::tqfromLatin1( "AppletStateNotification" ) ) + else if ( cmd == TQString::fromLatin1( "AppletStateNotification" ) ) { bool ok; const int appletID = arg.first().toInt(&ok); @@ -222,7 +222,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg } else kdError(DEBUGAREA) << "AppletStateNotification: Applet ID is not numerical" << endl; } - else if ( cmd == TQString::tqfromLatin1( "AppletFailed" ) ) { + else if ( cmd == TQString::fromLatin1( "AppletFailed" ) ) { bool ok; const int appletID = arg.first().toInt(&ok); if (ok) @@ -230,7 +230,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg KJavaApplet* const applet = d->applets[appletID]; /* TQString errorDetail(arg[1]); - errorDetail.tqreplace(TQRegExp(":\\s*"), ":\n"); + errorDetail.replace(TQRegExp(":\\s*"), ":\n"); KMessageBox::detailedError(0L, i18n("Java error while loading applet."), errorDetail); */ if (applet) diff --git a/khtml/java/kjavaappletcontext.h b/khtml/java/kjavaappletcontext.h index d5d5faa22..ca851a42e 100644 --- a/khtml/java/kjavaappletcontext.h +++ b/khtml/java/kjavaappletcontext.h @@ -42,7 +42,7 @@ class KJavaAppletServer; class KJavaApplet; class KJavaAppletContextPrivate; -class KJavaAppletContext : public TQObject +class KJavaAppletContext : public QObject { Q_OBJECT @@ -109,7 +109,7 @@ signals: /** * Signals the KHMTL Part to show this as the status message. */ - void showtqStatus ( const TQString& txt ); + void showStatus ( const TQString& txt ); /** * Signals the KHTML Part to show a url in a given target diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp index 64e2ea2ab..59d0517a2 100644 --- a/khtml/java/kjavaappletserver.cpp +++ b/khtml/java/kjavaappletserver.cpp @@ -448,7 +448,7 @@ void KJavaAppletServer::sendURLData( int loaderID, int code, const TQByteArray& void KJavaAppletServer::removeDataJob( int loaderID ) { - const KIOJobMap::iterator it = d->kiojobs.tqfind( loaderID ); + const KIOJobMap::iterator it = d->kiojobs.find( loaderID ); if (it != d->kiojobs.end()) { it.data()->deleteLater(); d->kiojobs.erase( it ); @@ -502,7 +502,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) if (cmd_code == KJAS_PUT_DATA) { // rest of the data is for kio put if (ok) { - KIOJobMap::iterator it = d->kiojobs.tqfind( ID_num ); + KIOJobMap::iterator it = d->kiojobs.find( ID_num ); if (ok && it != d->kiojobs.end()) { TQByteArray qba; qba.setRawData(qb.data() + index, qb.size() - index - 1); @@ -517,7 +517,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) //now parse out the arguments while( index < qb_size ) { - int sep_pos = qb.tqfind( 0, index ); + int sep_pos = qb.find( 0, index ); if (sep_pos < 0) { kdError(6100) << "Missing separation byte" << endl; sep_pos = qb_size; @@ -526,24 +526,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) args.append( TQString::fromLocal8Bit( qb.data() + index, sep_pos - index ) ); index = sep_pos + 1; //skip the sep } - //here I should tqfind the context and call the method directly + //here I should find the context and call the method directly //instead of emitting signals switch( cmd_code ) { case KJAS_SHOW_DOCUMENT: - cmd = TQString::tqfromLatin1( "showdocument" ); + cmd = TQString::fromLatin1( "showdocument" ); break; case KJAS_SHOW_URLINFRAME: - cmd = TQString::tqfromLatin1( "showurlinframe" ); + cmd = TQString::fromLatin1( "showurlinframe" ); break; case KJAS_SHOW_STATUS: - cmd = TQString::tqfromLatin1( "showstatus" ); + cmd = TQString::fromLatin1( "showstatus" ); break; case KJAS_RESIZE_APPLET: - cmd = TQString::tqfromLatin1( "resizeapplet" ); + cmd = TQString::fromLatin1( "resizeapplet" ); break; case KJAS_GET_URLDATA: @@ -565,7 +565,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) case KJAS_DATA_COMMAND: if (ok && !args.empty()) { const int cmd = args.first().toInt( &ok ); - KIOJobMap::iterator it = d->kiojobs.tqfind( ID_num ); + KIOJobMap::iterator it = d->kiojobs.find( ID_num ); if (ok && it != d->kiojobs.end()) it.data()->jobCommand( cmd ); kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl; @@ -573,7 +573,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) kdError(6100) << "KIO Data command error " << ok << " args:" << args.size() << endl; return; case KJAS_JAVASCRIPT_EVENT: - cmd = TQString::tqfromLatin1( "JS_Event" ); + cmd = TQString::fromLatin1( "JS_Event" ); kdDebug(6100) << "Javascript request: "<< contextID << " code: " << args[0] << endl; break; @@ -581,7 +581,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) case KJAS_PUT_MEMBER: case KJAS_CALL_MEMBER: { const int ticket = args[0].toInt(); - JSStack::iterator it = d->jsstack.tqfind(ticket); + JSStack::iterator it = d->jsstack.find(ticket); if (it != d->jsstack.end()) { kdDebug(6100) << "slotJavaRequest: " << ticket << endl; args.pop_front(); @@ -593,24 +593,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) return; } case KJAS_AUDIOCLIP_PLAY: - cmd = TQString::tqfromLatin1( "audioclip_play" ); + cmd = TQString::fromLatin1( "audioclip_play" ); kdDebug(6100) << "Audio Play: url=" << args[0] << endl; break; case KJAS_AUDIOCLIP_LOOP: - cmd = TQString::tqfromLatin1( "audioclip_loop" ); + cmd = TQString::fromLatin1( "audioclip_loop" ); kdDebug(6100) << "Audio Loop: url=" << args[0] << endl; break; case KJAS_AUDIOCLIP_STOP: - cmd = TQString::tqfromLatin1( "audioclip_stop" ); + cmd = TQString::fromLatin1( "audioclip_stop" ); kdDebug(6100) << "Audio Stop: url=" << args[0] << endl; break; case KJAS_APPLET_STATE: kdDebug(6100) << "Applet State Notification for Applet " << args[0] << ". New state=" << args[1] << endl; - cmd = TQString::tqfromLatin1( "AppletStateNotification" ); + cmd = TQString::fromLatin1( "AppletStateNotification" ); break; case KJAS_APPLET_FAILED: kdDebug(6100) << "Applet " << args[0] << " Failed: " << args[1] << endl; - cmd = TQString::tqfromLatin1( "AppletFailed" ); + cmd = TQString::fromLatin1( "AppletFailed" ); break; case KJAS_SECURITY_CONFIRM: { if (KSSL::doesSSLWork() && !d->kssl) @@ -670,8 +670,8 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) TQString subject = cert->getSubject() + TQChar('\n'); TQRegExp reg(TQString("/[A-Z]+=")); int pos = 0; - while ((pos = subject.tqfind(reg, pos)) > -1) - subject.tqreplace(pos, 1, TQString("\n ")); + while ((pos = subject.find(reg, pos)) > -1) + subject.replace(pos, 1, TQString("\n ")); text += subject.mid(1); } } @@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) KSSLCertChain chain; chain.setChain( certs ); if ( chain.isValid() ) - answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] ); + answer = PermissionDialog( qApp->activeWindow() ).exec( text, args[0] ); } } sl.push_front( TQString(answer) ); @@ -779,7 +779,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent ) TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) { TQGuardedPtr<TQDialog> dialog = new TQDialog( static_cast<TQWidget*>(parent()), "PermissionDialog"); - dialog->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) ); + dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) ); dialog->setModal( true ); dialog->setCaption( i18n("Security Alert") ); @@ -807,7 +807,7 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) TQPushButton* const grant = new TQPushButton( i18n("&Grant All"), dialog, "grant" ); buttonLayout->addWidget( grant ); dialogLayout->addLayout( buttonLayout ); - dialog->resize( dialog->tqminimumSizeHint() ); + dialog->resize( dialog->minimumSizeHint() ); //clearWState( WState_Polished ); connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); @@ -827,7 +827,7 @@ PermissionDialog::~PermissionDialog() void PermissionDialog::clicked() { m_button = sender()->name(); - static_cast<const TQWidget*>(sender())->tqparentWidget()->close(); + static_cast<const TQWidget*>(sender())->parentWidget()->close(); } #include "kjavaappletserver.moc" diff --git a/khtml/java/kjavaappletserver.h b/khtml/java/kjavaappletserver.h index 63463b040..08d0f2983 100644 --- a/khtml/java/kjavaappletserver.h +++ b/khtml/java/kjavaappletserver.h @@ -39,7 +39,7 @@ class KJavaAppletContext; class KJavaAppletServerPrivate; class JSStackFrame; -class KJavaAppletServer : public TQObject +class KJavaAppletServer : public QObject { Q_OBJECT @@ -161,7 +161,7 @@ private: }; -class PermissionDialog : public TQObject +class PermissionDialog : public QObject { Q_OBJECT public: diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index 2000dd6fa..d4c8e266f 100644 --- a/khtml/java/kjavaappletviewer.cpp +++ b/khtml/java/kjavaappletviewer.cpp @@ -90,7 +90,7 @@ KJavaServerMaintainer::~KJavaServerMaintainer () { KJavaAppletContext * KJavaServerMaintainer::getContext (TQObject * w, const TQString & doc) { ContextMap::key_type key = qMakePair (w, doc); - ContextMap::iterator it = m_contextmap.tqfind (key); + ContextMap::iterator it = m_contextmap.find (key); if (it != m_contextmap.end ()) { ++((*it).second); return (*it).first; @@ -101,7 +101,7 @@ KJavaAppletContext * KJavaServerMaintainer::getContext (TQObject * w, const TQSt } void KJavaServerMaintainer::releaseContext (TQObject * w, const TQString & doc) { - ContextMap::iterator it = m_contextmap.tqfind (qMakePair (w, doc)); + ContextMap::iterator it = m_contextmap.find (qMakePair (w, doc)); if (it != m_contextmap.end () && --(*it).second <= 0) { kdDebug(6100) << "KJavaServerMaintainer::releaseContext" << endl; (*it).first->deleteLater (); @@ -230,7 +230,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, TQStringList::const_iterator it = args.begin(); const TQStringList::const_iterator itEnd = args.end(); for ( ; it != itEnd; ++it) { - const int equalPos = (*it).tqfind("="); + const int equalPos = (*it).find("="); if (equalPos > 0) { const TQString name = (*it).left (equalPos).upper (); TQString value = (*it).right ((*it).length () - equalPos - 1); @@ -245,27 +245,27 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, baseurl = KURL (KURL (value), TQString (".")).url (); } else if (name == "__KHTML__CODEBASE") khtml_codebase = value; - else if (name_lower == TQString::tqfromLatin1("codebase") || - name_lower == TQString::tqfromLatin1("java_codebase")) { + else if (name_lower == TQString::fromLatin1("codebase") || + name_lower == TQString::fromLatin1("java_codebase")) { if (!value.isEmpty ()) codebase = value; } else if (name == "__KHTML__CLASSID") - //else if (name.lower()==TQString::tqfromLatin1("classid")) + //else if (name.lower()==TQString::fromLatin1("classid")) classid = value; - else if (name_lower == TQString::tqfromLatin1("code") || - name_lower == TQString::tqfromLatin1("java_code")) + else if (name_lower == TQString::fromLatin1("code") || + name_lower == TQString::fromLatin1("java_code")) classname = value; - else if (name_lower == TQString::tqfromLatin1("src")) + else if (name_lower == TQString::fromLatin1("src")) src_param = value; - else if (name_lower == TQString::tqfromLatin1("archive") || - name_lower == TQString::tqfromLatin1("java_archive") || + else if (name_lower == TQString::fromLatin1("archive") || + name_lower == TQString::fromLatin1("java_archive") || name_lower.startsWith ("cache_archive")) applet->setArchives (value); - else if (name_lower == TQString::tqfromLatin1("name")) + else if (name_lower == TQString::fromLatin1("name")) applet->setAppletName (value); - else if (name_lower == TQString::tqfromLatin1("width")) + else if (name_lower == TQString::fromLatin1("width")) width = value.toInt(); - else if (name_lower == TQString::tqfromLatin1("height")) + else if (name_lower == TQString::fromLatin1("height")) height = value.toInt(); if (!name.startsWith ("__KHTML__")) { applet->setParameter (name, value); @@ -277,7 +277,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, applet->setParameter ("CLSID", classid); kdDebug(6100) << "classid=" << classid << classid.startsWith("clsid:")<< endl; if (classid.startsWith ("clsid:")) - // codeBase tqcontains the URL to the plugin page + // codeBase contains the URL to the plugin page khtml_codebase = baseurl; else if (classname.isEmpty () && classid.startsWith ("java:")) classname = classid.mid(5); @@ -327,7 +327,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, info.verifyPath = true; TQDataStream stream(params, IO_WriteOnly); - stream << info << m_view->tqtopLevelWidget()->winId(); + stream << info << m_view->topLevelWidget()->winId(); if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) { kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl; @@ -342,14 +342,14 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, /* install event filter for close events */ if (wparent) - wparent->tqtopLevelWidget ()->installEventFilter (this); + wparent->topLevelWidget ()->installEventFilter (this); setInstance (KJavaAppletViewerFactory::instance ()); KParts::Part::setWidget (m_view); connect (applet->getContext(), TQT_SIGNAL(appletLoaded()), this, TQT_SLOT(appletLoaded())); connect (applet->getContext(), TQT_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQT_SLOT(showDocument(const TQString&, const TQString&))); - connect (applet->getContext(), TQT_SIGNAL(showtqStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &))); + connect (applet->getContext(), TQT_SIGNAL(showStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &))); connect (applet, TQT_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQT_SLOT(jsEvent (const TQStringList &))); } @@ -391,7 +391,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) { } else applet->setAppletClass (url.url ()); AppletParameterDialog (w).exec (); - applet->setSize (w->tqsizeHint()); + applet->setSize (w->sizeHint()); } if (!m_statusbar_icon) { KStatusBar *sb = m_statusbar->statusBar(); @@ -500,7 +500,7 @@ void KJavaAppletViewerBrowserExtension::restoreState (TQDataStream & stream) { applet->setParameter (key, val); kdDebug(6100) << "restoreState key:" << key << " val:" << val << endl; } - applet->setSize (w->tqsizeHint ()); + applet->setSize (w->sizeHint ()); if (w->isVisible()) w->showApplet (); } diff --git a/khtml/java/kjavaappletwidget.cpp b/khtml/java/kjavaappletwidget.cpp index 2e9597b2d..1299ce7e8 100644 --- a/khtml/java/kjavaappletwidget.cpp +++ b/khtml/java/kjavaappletwidget.cpp @@ -50,7 +50,7 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name ) d->tmplabel = new TQLabel( this ); d->tmplabel->setText( KJavaAppletServer::getAppletLabel() ); - d->tmplabel->tqsetAlignment( Qt::AlignCenter | Qt::WordBreak ); + d->tmplabel->setAlignment( Qt::AlignCenter | Qt::WordBreak ); d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); d->tmplabel->show(); @@ -98,10 +98,10 @@ void KJavaAppletWidget::setWindow( WId w ) } } -TQSize KJavaAppletWidget::tqsizeHint() const +TQSize KJavaAppletWidget::sizeHint() const { - kdDebug(6100) << "KJavaAppletWidget::tqsizeHint()" << endl; - TQSize rval = QXEmbed::tqsizeHint(); + kdDebug(6100) << "KJavaAppletWidget::sizeHint()" << endl; + TQSize rval = QXEmbed::sizeHint(); if( rval.width() == 0 || rval.height() == 0 ) { @@ -132,7 +132,7 @@ void KJavaAppletWidget::showEvent (TQShowEvent * e) { if (!applet()->isCreated() && !applet()->appletClass().isEmpty()) { // delayed showApplet if (applet()->size().width() <= 0) - applet()->setSize (tqsizeHint()); + applet()->setSize (sizeHint()); showApplet(); } } diff --git a/khtml/java/kjavaappletwidget.h b/khtml/java/kjavaappletwidget.h index f69ee59aa..18f5be341 100644 --- a/khtml/java/kjavaappletwidget.h +++ b/khtml/java/kjavaappletwidget.h @@ -96,7 +96,7 @@ public: */ void showApplet(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void resize( int, int ); protected slots: diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h index f9514304c..d3cf0de41 100644 --- a/khtml/java/kjavadownloader.h +++ b/khtml/java/kjavadownloader.h @@ -40,7 +40,7 @@ namespace KIO { class KJavaDownloaderPrivate; class KJavaUploaderPrivate; -class KJavaKIOJob : public TQObject +class KJavaKIOJob : public QObject { Q_OBJECT public: diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp index 1a04daa71..1c9f1b346 100644 --- a/khtml/java/kjavaprocess.cpp +++ b/khtml/java/kjavaprocess.cpp @@ -282,7 +282,7 @@ bool KJavaProcess::invokeJVM() //load the extra user-defined arguments if( !d->extraArgs.isEmpty() ) { - // BUG HERE: if an argument tqcontains space (-Dname="My name") + // BUG HERE: if an argument contains space (-Dname="My name") // this parsing will fail. Need more sophisticated parsing -- use KShell? const TQStringList args = TQStringList::split( " ", d->extraArgs ); TQStringList::ConstIterator it = args.begin(); @@ -300,7 +300,7 @@ bool KJavaProcess::invokeJVM() TQString argStr; TQTextOStream stream( &argStr ); const TQValueList<TQCString> args = javaProcess->args(); - tqCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) ); + qCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) ); kdDebug(6100) << argStr << endl; KProcess::Communication flags = (KProcess::Communication) diff --git a/khtml/java/kjavaprocess.h b/khtml/java/kjavaprocess.h index 9d2f93424..3e877685a 100644 --- a/khtml/java/kjavaprocess.h +++ b/khtml/java/kjavaprocess.h @@ -39,7 +39,7 @@ */ class KJavaProcessPrivate; -class KJavaProcess : public KProcess //TQObject +class KJavaProcess : public KProcess //QObject { Q_OBJECT @@ -125,7 +125,7 @@ public: protected slots: /** * This slot is called whenever something is written to stdin of the process. - * It's called again to make sure we keep emptying out the buffer that tqcontains + * It's called again to make sure we keep emptying out the buffer that contains * the messages we need send. */ void slotWroteData(); diff --git a/khtml/java/kxeventutil.cpp b/khtml/java/kxeventutil.cpp index 01c65e2c5..9afa5a5ac 100644 --- a/khtml/java/kxeventutil.cpp +++ b/khtml/java/kxeventutil.cpp @@ -248,7 +248,7 @@ TQString KXEventUtil::getXConfigureEventInfo(XEvent *xevent) { TQString KXEventUtil::getXConfigureRequestEventInfo(XEvent *xevent) { XConfigureRequestEvent *e = &xevent->xconfigurerequest; - unsigned vm = e->value_tqmask; + unsigned vm = e->value_mask; TQStringList vml; if (vm & CWX) vml.append("CWX"); if (vm & CWY) vml.append("CWY"); @@ -258,7 +258,7 @@ TQString KXEventUtil::getXConfigureRequestEventInfo(XEvent *xevent) { if (vm & CWSibling) vml.append("CWSibling"); if (vm & CWStackMode) vml.append("CWStackMode"); TQString vms = vml.join("|"); - TQString s("window=%1 x=%2 y=%2 width=%3 height=%4 border_width=%5 above=%6 detail=%7 value_tqmask=0x%8=%9"); + TQString s("window=%1 x=%2 y=%2 width=%3 height=%4 border_width=%5 above=%6 detail=%7 value_mask=0x%8=%9"); return s.arg(e->window) .arg(e->x).arg(e->y) @@ -266,7 +266,7 @@ TQString KXEventUtil::getXConfigureRequestEventInfo(XEvent *xevent) { .arg(e->border_width) .arg(e->above) .arg(e->detail) - .arg(e->value_tqmask, 0, 16) + .arg(e->value_mask, 0, 16) .arg(vms); } TQString KXEventUtil::getX11EventInfo( XEvent* e ) diff --git a/khtml/java/make-jar b/khtml/java/make-jar index 2bfe62cbe..a817ec1f3 100755 --- a/khtml/java/make-jar +++ b/khtml/java/make-jar @@ -7,6 +7,6 @@ rm -rf java-build-dir/* mkdir -p java-build-dir/images cp images/*.gif images/*.png java-build-dir/images/ pwd=`pwd`; -javac -d java-build-dir -deprecation -target 1.2 `tqfind org/kde netscape -name '*.java'` \ - && cd java-build-dir && jar c0vf $pwd/kjava.jar images `tqfind org/kde netscape -name *.class` +javac -d java-build-dir -deprecation -target 1.2 `find org/kde netscape -name '*.java'` \ + && cd java-build-dir && jar c0vf $pwd/kjava.jar images `find org/kde netscape -name *.class` diff --git a/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java b/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java index 1c7beb833..c6defa848 100644 --- a/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java +++ b/khtml/java/org/kde/kjas/server/KJASAppletClassLoader.java @@ -109,7 +109,7 @@ public final class KJASAppletClassLoader if (security != null) { security.checkCreateClassLoader(); } - if( loaders.tqcontainsKey( key ) ) + if( loaders.containsKey( key ) ) return (KJASAppletClassLoader) loaders.get( key ); return null; @@ -149,17 +149,17 @@ public final class KJASAppletClassLoader super.addURL(url); } - public void addtqStatusListener(tqStatusListener lsnr) { + public void addStatusListener(StatusListener lsnr) { statusListeners.add(lsnr); } - public void removetqStatusListener(tqStatusListener lsnr) { + public void removeStatusListener(StatusListener lsnr) { statusListeners.remove(lsnr); } - public void showtqStatus(String msg) { + public void showStatus(String msg) { Enumeration en = statusListeners.elements(); while (en.hasMoreElements()) { - tqStatusListener lsnr = (tqStatusListener)en.nextElement(); - lsnr.showtqStatus(msg); + StatusListener lsnr = (StatusListener)en.nextElement(); + lsnr.showStatus(msg); } } @@ -202,7 +202,7 @@ public final class KJASAppletClassLoader void addArchiveName( String jarname ) { - if( !archives.tqcontains( jarname ) ) + if( !archives.contains( jarname ) ) { archives.add( jarname ); } @@ -225,19 +225,19 @@ public final class KJASAppletClassLoader /*************************************************************************** **** Class Loading Methods **************************************************************************/ - public synchronized Class tqfindClass( String name ) throws ClassNotFoundException + public synchronized Class findClass( String name ) throws ClassNotFoundException { Class rval = null; //check the loaded classes - rval = tqfindLoadedClass( name ); + rval = findLoadedClass( name ); if( rval == null ) { try { - rval = super.tqfindClass(name); + rval = super.findClass(name); } catch (ClassFormatError cfe) { Main.debug(name + ": Catched " + cfe + ". Trying to repair..."); rval = loadFixedClass( name ); } catch (Exception ex) { - Main.debug("tqfindClass " + name + " " + ex.getMessage()); + Main.debug("findClass " + name + " " + ex.getMessage()); } } if (rval == null) { @@ -256,7 +256,7 @@ public final class KJASAppletClassLoader private Hashtable loadedClasses = new Hashtable(); private synchronized final Class loadFixedClass(String name) throws ClassNotFoundException { - final String fileName = name.tqreplace('.', '/') + ".class"; + final String fileName = name.replace('.', '/') + ".class"; try { // try to get the class as resource final URL u = getResource(fileName); @@ -316,7 +316,7 @@ public final class KJASAppletClassLoader } } catch (Throwable e) { } - showtqStatus("Loading: " + displayName); + showStatus("Loading: " + displayName); URL url = super.findResource( name ); Main.debug("findResource for " + name + " returns " + url); return url; diff --git a/khtml/java/org/kde/kjas/server/KJASAppletContext.java b/khtml/java/org/kde/kjas/server/KJASAppletContext.java index bb8b0f156..f868b7b64 100644 --- a/khtml/java/org/kde/kjas/server/KJASAppletContext.java +++ b/khtml/java/org/kde/kjas/server/KJASAppletContext.java @@ -104,7 +104,7 @@ public class KJASAppletContext implements AppletContext //do kludges to support mess with parameter table and //the applet variables String key = new String( "ARCHIVE" ); - if (params.tqcontainsKey(key)) { + if (params.containsKey(key)) { String param_archive = (String)params.get(key); if (archives == null) { // There is no 'archive' attribute @@ -128,7 +128,7 @@ public class KJASAppletContext implements AppletContext if( codeBase == null ) { key = new String( "CODEBASE" ); - if( params.tqcontainsKey( key ) ) + if( params.containsKey( key ) ) codeBase = (String) params.get( key ); } @@ -325,26 +325,26 @@ public class KJASAppletContext implements AppletContext //check with the Web Server String str_url = url.toString(); Main.debug( "getImage, url = " + str_url ); - if (Main.cacheImages && images.tqcontainsKey(str_url)) { + if (Main.cacheImages && images.containsKey(str_url)) { Main.debug("Cached: url=" + str_url); } else { if (Main.cacheImages) { - if (!pendingImages.tqcontains(str_url)) { + if (!pendingImages.contains(str_url)) { Main.protocol.sendGetURLDataCmd( myID, str_url ); pendingImages.add(str_url); } } else { Main.protocol.sendGetURLDataCmd( myID, str_url ); } - while( !images.tqcontainsKey( str_url ) && active ) + while( !images.containsKey( str_url ) && active ) { try { Thread.sleep( 200 ); } catch( InterruptedException e ){} } } - if( images.tqcontainsKey( str_url ) ) + if( images.containsKey( str_url ) ) { byte[] data = (byte[]) images.get( str_url ); if( data.length > 0 ) @@ -378,11 +378,11 @@ public class KJASAppletContext implements AppletContext } } - public void showtqStatus( String message ) + public void showStatus( String message ) { if( active && (message != null) ) { - Main.protocol.sendShowtqStatusCmd( myID, message ); + Main.protocol.sendShowStatusCmd( myID, message ); } } public boolean evaluateJavaScript(String script, String appletID, JSObject jso) { diff --git a/khtml/java/org/kde/kjas/server/KJASAppletPanel.java b/khtml/java/org/kde/kjas/server/KJASAppletPanel.java index ba779d107..d7acbdaf9 100644 --- a/khtml/java/org/kde/kjas/server/KJASAppletPanel.java +++ b/khtml/java/org/kde/kjas/server/KJASAppletPanel.java @@ -17,7 +17,7 @@ import java.net.URL; * A panel which embeds the applet and shows some * information during class loading. */ -public class KJASAppletPanel extends javax.swing.JPanel implements tqStatusListener { +public class KJASAppletPanel extends javax.swing.JPanel implements StatusListener { private final static int LOADING = 1; private final static int RUNNING = 2; private final static int FAILED = 3; @@ -45,10 +45,10 @@ public class KJASAppletPanel extends javax.swing.JPanel implements tqStatusListe validate(); } - public void showtqStatus(String msg) { + public void showStatus(String msg) { this.msg = msg; if (status != RUNNING) - tqrepaint(); + repaint(); } public void paint(Graphics g) { @@ -88,12 +88,12 @@ public class KJASAppletPanel extends javax.swing.JPanel implements tqStatusListe fail_img = getToolkit().createImage(url); status = FAILED; msg = "Applet Failed."; - tqrepaint(); + repaint(); } void showFailed(String message) { showFailed(); - showtqStatus(message); + showStatus(message); } public void stopAnimation() { diff --git a/khtml/java/org/kde/kjas/server/KJASAppletStub.java b/khtml/java/org/kde/kjas/server/KJASAppletStub.java index c84013e7c..e090183d7 100644 --- a/khtml/java/org/kde/kjas/server/KJASAppletStub.java +++ b/khtml/java/org/kde/kjas/server/KJASAppletStub.java @@ -194,7 +194,7 @@ public final class KJASAppletStub else app.setBounds( 0, 0, panel.getSize().width, panel.getSize().height ); app.init(); - loader.removetqStatusListener(panel); + loader.removeStatusListener(panel); // stop the loading... animation panel.stopAnimation(); app.setVisible(true); @@ -203,7 +203,7 @@ public final class KJASAppletStub active = true; app.start(); frame.validate(); - app.tqrepaint(); + app.repaint(); break; case STOPPED: active = false; @@ -290,7 +290,7 @@ public final class KJASAppletStub docBase = _docBase; active = false; appletName = _appletName; - className = _className.tqreplace( '/', '.' ); + className = _className.replace( '/', '.' ); appletSize = _appletSize; params = _params; windowName = _windowName; @@ -305,7 +305,7 @@ public final class KJASAppletStub { fixedClassName = _className.substring(0, _className.length()-5); } - className = fixedClassName.tqreplace('/', '.'); + className = fixedClassName.replace('/', '.'); appletClass = null; me = this; @@ -321,7 +321,7 @@ public final class KJASAppletStub } private void setFailed(String why) { - loader.removetqStatusListener(panel); + loader.removeStatusListener(panel); panel.stopAnimation(); panel.showFailed(); Main.protocol.sendAppletFailed(context.getID(), appletID, why); @@ -358,7 +358,7 @@ public final class KJASAppletStub else frame.setBounds( 0, 0, 50, 50 ); frame.setVisible(true); - loader.addtqStatusListener(panel); + loader.addStatusListener(panel); runThread = new RunThread(); runThread.start(); } @@ -520,7 +520,7 @@ public final class KJASAppletStub } return ret; } - private Method tqfindMethod(Class c, String name, Class [] argcls) { + private Method findMethod(Class c, String name, Class [] argcls) { try { Method[] methods = c.getMethods(); for (int i = 0; i < methods.length; i++) { @@ -719,8 +719,8 @@ public final class KJASAppletStub String type; Class [] argcls = new Class[args.size()]; for (int i = 0; i < args.size(); i++) - argcls[i] = name.getClass(); // String for now, will be updated by tqfindMethod - Method m = tqfindMethod(c, (String) name, argcls); + argcls[i] = name.getClass(); // String for now, will be updated by findMethod + Method m = findMethod(c, (String) name, argcls); Main.debug("Found Method: " + m); if (m != null) { Object [] argobj = new Object[args.size()]; diff --git a/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java b/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java index ac79770a0..f8b50a91d 100644 --- a/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java +++ b/khtml/java/org/kde/kjas/server/KJASProtocolHandler.java @@ -22,7 +22,7 @@ public class KJASProtocolHandler private static final int InitAppletCode = 7; private static final int ShowDocumentCode = 8; private static final int ShowURLInFrameCode = 9; - private static final int ShowtqStatusCode = 10; + private static final int ShowStatusCode = 10; private static final int ResizeAppletCode = 11; private static final int GetURLDataCode = 12; private static final int URLDataCode = 13; @@ -586,9 +586,9 @@ public class KJASProtocolHandler signals.write( bytes, 0, bytes.length ); } - public void sendShowtqStatusCmd( String contextID, String msg ) + public void sendShowStatusCmd( String contextID, String msg ) { - Main.debug( "sendShowtqStatusCmd, contextID = " + contextID + " msg = " + msg ); + Main.debug( "sendShowStatusCmd, contextID = " + contextID + " msg = " + msg ); byte [] msg_bytes = msg.getBytes(); int length = contextID.length() + msg_bytes.length + 4; @@ -598,7 +598,7 @@ public class KJASProtocolHandler byte [] tmp_bytes = getPaddedLengthBytes( length ); System.arraycopy( tmp_bytes, 0, bytes, index, tmp_bytes.length ); index += tmp_bytes.length; - bytes[index++] = (byte) ShowtqStatusCode; + bytes[index++] = (byte) ShowStatusCode; bytes[index++] = sep; tmp_bytes = contextID.getBytes(); diff --git a/khtml/java/org/kde/kjas/server/KJASSecurityManager.java b/khtml/java/org/kde/kjas/server/KJASSecurityManager.java index ec5d69710..0525bba0c 100644 --- a/khtml/java/org/kde/kjas/server/KJASSecurityManager.java +++ b/khtml/java/org/kde/kjas/server/KJASSecurityManager.java @@ -82,9 +82,9 @@ public class KJASSecurityManager extends SecurityManager Main.debug("Certificates " + signers.size() + " for " + perm); // Check granted/denied permission - if ( grantAllPermissions.tqcontains(signers) ) + if ( grantAllPermissions.contains(signers) ) return; - if ( rejectAllPermissions.tqcontains(signers) ) + if ( rejectAllPermissions.contains(signers) ) throw se; Permissions permissions = (Permissions) grantedPermissions.get(signers); if (permissions != null && permissions.implies(perm)) @@ -168,7 +168,7 @@ public class KJASSecurityManager extends SecurityManager // try to cast ... KJASAppletClassLoader loader = (KJASAppletClassLoader)contextClassLoader; // ok. cast succeeded. Now get the codebase of the loader - // because it tqcontains the host name + // because it contains the host name URL codebase = loader.getCodeBase(); URL docbase = loader.getDocBase(); Main.debug("* Class Loader docbase=" + docbase + " codebase=" + codebase); diff --git a/khtml/java/org/kde/kjas/server/StatusListener.java b/khtml/java/org/kde/kjas/server/StatusListener.java index a4f133ab1..be17c2b29 100644 --- a/khtml/java/org/kde/kjas/server/StatusListener.java +++ b/khtml/java/org/kde/kjas/server/StatusListener.java @@ -1,5 +1,5 @@ package org.kde.kjas.server; -public interface tqStatusListener { - public void showtqStatus(String message); +public interface StatusListener { + public void showStatus(String message); }
\ No newline at end of file diff --git a/khtml/java/tests/badapplets/BadApplet.java b/khtml/java/tests/badapplets/BadApplet.java index 7d3275325..c8217d256 100644 --- a/khtml/java/tests/badapplets/BadApplet.java +++ b/khtml/java/tests/badapplets/BadApplet.java @@ -67,7 +67,7 @@ public class BadApplet extends JApplet { } }); - //do tqlayout *********************************************************** + //do layout *********************************************************** getContentPane().setLayout( new BorderLayout() ); FileSystemTests.setLayout( new FlowLayout( FlowLayout.LEFT ) ); diff --git a/khtml/khtml.rc b/khtml/khtml.rc index 49e687e25..cea311444 100644 --- a/khtml/khtml.rc +++ b/khtml/khtml.rc @@ -4,11 +4,11 @@ <Menu name="edit"><text>&Edit</text> <Action name="selectAll" /> <Separator /> - <Action name="tqfind" /> - <Action name="tqfindNext" /> - <Action name="tqfindPrevious" /> - <Action name="tqfindAheadText" /> - <Action name="tqfindAheadLink" /> + <Action name="find" /> + <Action name="findNext" /> + <Action name="findPrevious" /> + <Action name="findAheadText" /> + <Action name="findAheadLink" /> </Menu> </MenuBar> <ActionProperties> diff --git a/khtml/khtml_browser.rc b/khtml/khtml_browser.rc index e351f664b..a1da305e7 100644 --- a/khtml/khtml_browser.rc +++ b/khtml/khtml_browser.rc @@ -11,11 +11,11 @@ <Menu name="edit"><text>&Edit</text> <Action name="selectAll" /> <Separator /> - <Action name="tqfind" /> - <Action name="tqfindNext" /> - <Action name="tqfindPrevious" /> - <Action name="tqfindAheadText" /> - <Action name="tqfindAheadLink" /> + <Action name="find" /> + <Action name="findNext" /> + <Action name="findPrevious" /> + <Action name="findAheadText" /> + <Action name="findAheadLink" /> </Menu> <Menu name="view"><text>&View</text> <Action name="incFontSizes" /> @@ -35,7 +35,7 @@ </Menu> </MenuBar> <ToolBar name="mainToolBar"><text>Main Toolbar</text> - <Action name="tqfind" /> + <Action name="find" /> <Separator /> <Action name="incFontSizes" /> <Action name="decFontSizes" /> diff --git a/khtml/khtml_caret.cpp b/khtml/khtml_caret.cpp index 1b83ca89b..9b819ee6c 100644 --- a/khtml/khtml_caret.cpp +++ b/khtml/khtml_caret.cpp @@ -150,7 +150,7 @@ static inline bool isIndicatedInlineBox(InlineBox *box) || s->borderTopWidth() || s->borderBottomWidth() || s->paddingLeft().value() || s->paddingRight().value() || s->paddingTop().value() || s->paddingBottom().value() - // ### Can inline elements have top/bottom margins? Couldn't tqfind + // ### Can inline elements have top/bottom margins? Couldn't find // it in the CSS 2 spec, but Mozilla ignores them, so we do, too. || s->marginLeft().value() || s->marginRight().value(); } @@ -581,7 +581,7 @@ static inline void mapTraversalStateToRenderPos(ObjectTraversalState trav, * @param outsideEnd returns whether the end of the outside position is meant * @return renderer or 0 if no following node has a renderer. */ -static RenderObject* tqfindRenderer(NodeImpl *&node, long offset, +static RenderObject* findRenderer(NodeImpl *&node, long offset, RenderObject *base, long &r_ofs, bool &outside, bool &outsideEnd) { @@ -589,7 +589,7 @@ static RenderObject* tqfindRenderer(NodeImpl *&node, long offset, RenderObject *r; mapDOMPosToRenderPos(node, offset, r, r_ofs, outside, outsideEnd); #if DEBUG_CARETMODE > 2 - kdDebug(6200) << "tqfindRenderer: node " << node << " " << (node ? node->nodeName().string() : TQString::null) << " offset " << offset << " r " << r << "[" << (r ? r->renderName() : TQString::null) << "] r_ofs " << r_ofs << " outside " << outside << " outsideEnd " << outsideEnd << endl; + kdDebug(6200) << "findRenderer: node " << node << " " << (node ? node->nodeName().string() : TQString::null) << " offset " << offset << " r " << r << "[" << (r ? r->renderName() : TQString::null) << "] r_ofs " << r_ofs << " outside " << outside << " outsideEnd " << outsideEnd << endl; #endif if (r) return r; NodeImpl *baseElem = base ? base->element() : 0; @@ -730,7 +730,7 @@ kdDebug(6200) << "== recursive invocation end" << endl; } else if (box->isInlineTextBox()) { #if DEBUG_ACIB -kdDebug(6200) << "isinlinetextbox " << box << (box->object() ? TQString(" tqcontains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), kMin(box->maxOffset() - box->minOffset(), 15L)).string()) : TQString::null) << endl; +kdDebug(6200) << "isinlinetextbox " << box << (box->object() ? TQString(" contains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), kMin(box->maxOffset() - box->minOffset(), 15L)).string()) : TQString::null) << endl; #endif caret_boxes.append(new CaretBox(box, false, false)); sbp.check(preEnd()); @@ -739,7 +739,7 @@ kdDebug(6200) << "isinlinetextbox " << box << (box->object() ? TQString(" tqcont } else { #if DEBUG_ACIB -kdDebug(6200) << "some tqreplaced or what " << box << endl; +kdDebug(6200) << "some replaced or what " << box << endl; #endif // must be an inline-block, inline-table, or any RenderReplaced bool rtl = ps->direction() == RTL; @@ -775,7 +775,7 @@ void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontM caret_boxes.append(caretBox); // afaik an inner flow box can only have the width 0, therefore we don't - // have to care for rtl or tqalignment + // have to care for rtl or alignment // ### can empty inline elements have a width? css 2 spec isn't verbose about it caretBox->_y += flowBox->baseline() - fm.ascent(); @@ -818,10 +818,10 @@ CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter, // - outside begin of an inline flow box (except for the basic inline flow box) // - outside end of an inline flow box (except for the basic inline flow box) // - inside of an empty inline flow box - // - outside begin of an inline box resembling a tqreplaced element - // - outside end of an inline box resembling a tqreplaced element + // - outside begin of an inline box resembling a replaced element + // - outside end of an inline box resembling a replaced element // - inline text box - // - inline tqreplaced box + // - inline replaced box CaretBoxLine *result = new CaretBoxLine(basicFlowBox); deleter->append(result); @@ -885,7 +885,7 @@ CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter, 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: @@ -938,14 +938,14 @@ inline InlineFlowBox *seekBaseFlowBox(InlineBox *b, RenderObject *base = 0) return static_cast<InlineFlowBox *>(b); } -/** determines whether the given element is a block level tqreplaced element. +/** determines whether the given element is a block level replaced element. */ inline bool isBlockRenderReplaced(RenderObject *r) { return r->isRenderReplaced() && r->style()->display() == BLOCK; } -/** determines the caret line box that tqcontains the given position. +/** determines the caret line box that contains the given position. * * If the node does not map to a render object, the function will snap to * the next suitable render object following it. @@ -955,38 +955,38 @@ inline bool isBlockRenderReplaced(RenderObject *r) * @param cblDeleter deleter for caret box lines * @param base base render object which the caret must not be placed beyond. * @param r_ofs adjusted offset within render object - * @param caretBoxIt returns an iterator to the caret box that tqcontains the + * @param caretBoxIt returns an iterator to the caret box that contains the * given position. * @return the determined caret box lineor 0 if either the node is 0 or * there is no inline flow box containing this node. The containing block * will still be set. If it is 0 too, @p node was invalid. */ -static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset, +static CaretBoxLine* findCaretBoxLine(DOM::NodeImpl *node, long offset, CaretBoxLineDeleter *cblDeleter, RenderObject *base, long &r_ofs, CaretBoxIterator &caretBoxIt) { bool outside, outsideEnd; - RenderObject *r = tqfindRenderer(node, offset, base, r_ofs, outside, outsideEnd); + RenderObject *r = findRenderer(node, offset, base, r_ofs, outside, outsideEnd); if (!r) { return 0; } #if DEBUG_CARETMODE > 0 - kdDebug(6200) << "=================== tqfindCaretBoxLine" << endl; + kdDebug(6200) << "=================== findCaretBoxLine" << endl; kdDebug(6200) << "node " << node << " offset: " << offset << " r " << r->renderName() << "[" << r << "].node " << r->element()->nodeName().string() << "[" << r->element() << "]" << " r_ofs " << r_ofs << " outside " << outside << " outsideEnd " << outsideEnd << endl; #endif - // There are two strategies to tqfind the correct line box. (The third is failsafe) + // There are two strategies to find the correct line box. (The third is failsafe) // (A) First, if node's renderer is a RenderText, we only traverse its text // runs and return the root line box (saves much time for long blocks). // This should be the case 99% of the time. // (B) Second, we derive the inline flow box directly when the renderer is // a RenderBlock, RenderInline, or blocked RenderReplaced. - // (C) Otherwise, we iterate linearly through all line boxes in order to tqfind + // (C) Otherwise, we iterate linearly through all line boxes in order to find // the renderer. // (A) if (r->isText()) do { RenderText *t = static_cast<RenderText *>(r); int dummy; - InlineBox *b = t->tqfindInlineTextBox(offset, dummy, true); + InlineBox *b = t->findInlineTextBox(offset, dummy, true); // Actually b should never be 0, but some render texts don't have text // boxes, so we insert the last run as an error correction. // If there is no last run, we resort to (B) @@ -1000,13 +1000,13 @@ static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset, outside = false; // text boxes cannot have outside positions InlineFlowBox *baseFlowBox = seekBaseFlowBox(b, base); #if DEBUG_CARETMODE > 2 - kdDebug(6200) << "text-box b: " << b << " baseFlowBox: " << baseFlowBox << (b && b->object() ? TQString(" tqcontains \"%1\"").arg(TQConstString(static_cast<RenderText *>(b->object())->str->s+b->minOffset(), kMin(b->maxOffset() - b->minOffset(), 15L)).string()) : TQString::null) << endl; + kdDebug(6200) << "text-box b: " << b << " baseFlowBox: " << baseFlowBox << (b && b->object() ? TQString(" contains \"%1\"").arg(TQConstString(static_cast<RenderText *>(b->object())->str->s+b->minOffset(), kMin(b->maxOffset() - b->minOffset(), 15L)).string()) : TQString::null) << endl; #endif #if 0 if (t->containingBlock()->isListItem()) dumpLineBoxes(static_cast<RenderFlow *>(t->containingBlock())); #endif #if DEBUG_CARETMODE > 0 - kdDebug(6200) << "=================== end tqfindCaretBoxLine (renderText)" << endl; + kdDebug(6200) << "=================== end findCaretBoxLine (renderText)" << endl; #endif return CaretBoxLine::constructCaretBoxLine(cblDeleter, baseFlowBox, b, outside, outsideEnd, caretBoxIt); @@ -1024,7 +1024,7 @@ static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset, if (isrepl || r->isRenderBlock() && (outside || !firstLineBox) || r->isRenderInline() && !firstLineBox) { #if DEBUG_CARETMODE > 0 - kdDebug(6200) << "=================== end tqfindCaretBoxLine (box " << (outside ? (outsideEnd ? "outside end" : "outside begin") : "inside") << ")" << endl; + kdDebug(6200) << "=================== end findCaretBoxLine (box " << (outside ? (outsideEnd ? "outside end" : "outside begin") : "inside") << ")" << endl; #endif Q_ASSERT(r->isBox()); return CaretBoxLine::constructCaretBoxLine(cblDeleter, @@ -1049,23 +1049,23 @@ static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset, InlineFlowBox *flowBox = cb->firstLineBox(); // (C) - // This case strikes when the element is tqreplaced, but neither a + // This case strikes when the element is replaced, but neither a // RenderBlock nor a RenderInline if (!flowBox) { // ### utter emergency (why is this possible at all?) // flowBox = generateDummyFlowBox(arena, cb, r); // if (ibox) *ibox = flowBox->firstChild(); // outside = outside_end = true; -// kdWarning() << "containing block tqcontains no inline flow boxes!!! crash imminent" << endl; +// kdWarning() << "containing block contains no inline flow boxes!!! crash imminent" << endl; #if DEBUG_CARETMODE > 0 - kdDebug(6200) << "=================== end tqfindCaretBoxLine (2)" << endl; + kdDebug(6200) << "=================== end findCaretBoxLine (2)" << endl; #endif return CaretBoxLine::constructCaretBoxLine(cblDeleter, cb, outside, outsideEnd, caretBoxIt); }/*end if*/ // We iterate the inline flow boxes of the containing block until - // we tqfind the given node. This has one major flaw: it is linear, and therefore + // we find the given node. This has one major flaw: it is linear, and therefore // painfully slow for really large blocks. for (; flowBox; flowBox = static_cast<InlineFlowBox *>(flowBox->nextLineBox())) { #if DEBUG_CARETMODE > 0 @@ -1081,7 +1081,7 @@ static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset, #endif if (caretBoxIt != cbl->end()) { #if DEBUG_CARETMODE > 0 - kdDebug(6200) << "=================== end tqfindCaretBoxLine (3)" << endl; + kdDebug(6200) << "=================== end findCaretBoxLine (3)" << endl; #endif return cbl; } @@ -1091,20 +1091,20 @@ static CaretBoxLine* tqfindCaretBoxLine(DOM::NodeImpl *node, long offset, // Danger: this is O(n^2). It's only called to recover from // errors, that means, theoretically, never. (Practically, far too often :-( ) Q_ASSERT(!flowBox); - CaretBoxLine *cbl = tqfindCaretBoxLine(nextLeafNode(node, base ? base->element() : 0), 0, cblDeleter, base, r_ofs, caretBoxIt); + CaretBoxLine *cbl = findCaretBoxLine(nextLeafNode(node, base ? base->element() : 0), 0, cblDeleter, base, r_ofs, caretBoxIt); #if DEBUG_CARETMODE > 0 - kdDebug(6200) << "=================== end tqfindCaretBoxLine" << endl; + kdDebug(6200) << "=================== end findCaretBoxLine" << endl; #endif return cbl; } -/** tqfinds the innermost table object @p r is contained within, but no +/** finds the innermost table object @p r is contained within, but no * farther than @p cb. * @param r leaf element to begin with * @param cb bottom element where to stop search at least. * @return the table object or 0 if none found. */ -static inline RenderTable *tqfindTableUpTo(RenderObject *r, RenderFlow *cb) +static inline RenderTable *findTableUpTo(RenderObject *r, RenderFlow *cb) { while (r && r != cb && !r->isTable()) r = r->parent(); return r && r->isTable() ? static_cast<RenderTable *>(r) : 0; @@ -1118,7 +1118,7 @@ static inline bool isDescendant(RenderObject *r, RenderObject *cb) return r; } -/** checks whether the given block tqcontains at least one editable element. +/** checks whether the given block contains at least one editable element. * * Warning: This function has linear complexity, and therefore is expensive. * Use it sparingly, and cache the result. @@ -1128,7 +1128,7 @@ static inline bool isDescendant(RenderObject *r, RenderObject *cb) * or at the end. * @param fromEnd begin search from end (default: begin from beginning) */ -static bool tqcontainsEditableElement(KHTMLPart *part, RenderBlock *cb, +static bool containsEditableElement(KHTMLPart *part, RenderBlock *cb, RenderTable *&table, bool fromEnd = false) { RenderObject *r = cb; @@ -1150,7 +1150,7 @@ static bool tqcontainsEditableElement(KHTMLPart *part, RenderBlock *cb, modWithinCb = true; r = cb; } else - tempTable = tqfindTableUpTo(r, cb); + tempTable = findTableUpTo(r, cb); #if DEBUG_CARETMODE > 1 kdDebug(6201) << "cee: r " << (r ? r->renderName() : TQString::null) << "@" << r << " cb " << cb << " withinCb " << withinCb << " modWithinCb " << modWithinCb << " tempTable " << tempTable << endl; @@ -1173,7 +1173,7 @@ static bool tqcontainsEditableElement(KHTMLPart *part, RenderBlock *cb, return false; } -/** checks whether the given block tqcontains at least one editable child +/** checks whether the given block contains at least one editable child * element, beginning with but excluding @p start. * * Warning: This function has linear complexity, and therefore is expensive. @@ -1185,7 +1185,7 @@ static bool tqcontainsEditableElement(KHTMLPart *part, RenderBlock *cb, * @param fromEnd begin search from end (default: begin from beginning) * @param start object after which to begin search. */ -static bool tqcontainsEditableChildElement(KHTMLPart *part, RenderBlock *cb, +static bool containsEditableChildElement(KHTMLPart *part, RenderBlock *cb, RenderTable *&table, bool fromEnd, RenderObject *start) { int state = 0; @@ -1220,7 +1220,7 @@ static bool tqcontainsEditableChildElement(KHTMLPart *part, RenderBlock *cb, modWithinCb = true; r = cb; } else - tempTable = tqfindTableUpTo(r, cb); + tempTable = findTableUpTo(r, cb); #if DEBUG_CARETMODE > 1 kdDebug(6201) << "cece: r " << (r ? r->renderName() : TQString::null) << "@" << r << " cb " << cb << " withinCb " << withinCb << " modWithinCb " << modWithinCb << " tempTable " << tempTable << endl; @@ -1322,7 +1322,7 @@ LineIterator::LineIterator(LinearDocument *l, DOM::NodeImpl *node, long offset) { // kdDebug(6200) << "LineIterator: node " << node << " offset " << offset << endl; if (!node) { cbl = 0; return; } - cbl = tqfindCaretBoxLine(node, offset, &lines->cblDeleter, + cbl = findCaretBoxLine(node, offset, &lines->cblDeleter, l->baseObject(), currentOffset, currentBox); // can happen on partially loaded documents #if DEBUG_CARETMODE > 0 @@ -1337,7 +1337,7 @@ LineIterator::LineIterator(LinearDocument *l, DOM::NodeImpl *node, long offset) #endif if (currentBox == cbl->end()) { #if DEBUG_CARETMODE > 0 - kdDebug(6200) << "LineIterator: tqfindCaretBoxLine failed" << endl; + kdDebug(6200) << "LineIterator: findCaretBoxLine failed" << endl; #endif cbl = 0; }/*end if*/ @@ -1357,7 +1357,7 @@ void LineIterator::nextBlock() int state; // not used mapRenderPosToTraversalState(cb_outside, cb_outside_end, false, trav); #if DEBUG_CARETMODE > 1 - kdDebug(6200) << "nextBlock: before adv r" << r << " " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " tqcontains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << " trav " << trav << " cb_outside " << cb_outside << " cb_outside_end " << cb_outside_end << endl; + kdDebug(6200) << "nextBlock: before adv r" << r << " " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " contains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << " trav " << trav << " cb_outside " << cb_outside << " cb_outside_end " << cb_outside_end << endl; #endif r = advanceSuitableObject(r, trav, false, base, state); if (!r) { @@ -1375,7 +1375,7 @@ void LineIterator::nextBlock() RenderBlock *cb; - // If we hit a block or tqreplaced object, use this as its enclosing object + // If we hit a block or replaced object, use this as its enclosing object bool isrepl = isBlockRenderReplaced(r); if (r->isRenderBlock() || isrepl) { RenderBox *cb = static_cast<RenderBox *>(r); @@ -1426,7 +1426,7 @@ void LineIterator::prevBlock() int state; // not used mapRenderPosToTraversalState(cb_outside, cb_outside_end, true, trav); #if DEBUG_CARETMODE > 1 - kdDebug(6200) << "prevBlock: before adv r" << r << " " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " tqcontains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << " trav " << trav << " cb_outside " << cb_outside << " cb_outside_end " << cb_outside_end << endl; + kdDebug(6200) << "prevBlock: before adv r" << r << " " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " contains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << " trav " << trav << " cb_outside " << cb_outside << " cb_outside_end " << cb_outside_end << endl; #endif r = advanceSuitableObject(r, trav, true, base, state); if (!r) { @@ -1602,7 +1602,7 @@ if (box->isInline()) { << " padr " << s->paddingRight().value() << " padt " << s->paddingTop().value() << " padb " << s->paddingBottom().value() - // ### Can inline elements have top/bottom margins? Couldn't tqfind + // ### Can inline elements have top/bottom margins? Couldn't find // it in the CSS 2 spec, but Mozilla ignores them, so we do, too. << " marl " << s->marginLeft().value() << " marr " << s->marginRight().value() @@ -1647,7 +1647,7 @@ bool EditableCaretBoxIterator::isEditable(const CaretBoxIterator &boxit, bool fr RenderObject *r = b->object(); #if DEBUG_CARETMODE > 0 // if (b->isInlineFlowBox()) kdDebug(6200) << "b is inline flow box" << (outside ? " (outside)" : "") << endl; - kdDebug(6200) << "isEditable r" << r << ": " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " tqcontains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << endl; + kdDebug(6200) << "isEditable r" << r << ": " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " contains \"" + TQString(((RenderText *)r)->str->s, QMIN(((RenderText *)r)->str->l,15)) + "\"" : TQString::null) << endl; #endif // Must check caret mode or design mode *after* r->element(), otherwise // lines without a backing DOM node get regarded, leading to a crash. @@ -1659,7 +1659,7 @@ bool EditableCaretBoxIterator::isEditable(const CaretBoxIterator &boxit, bool fr return false; } - // generally exclude tqreplaced elements with no children from navigation + // generally exclude replaced elements with no children from navigation if (!b->isOutside() && r->isRenderReplaced() && !r->firstChild()) return false; @@ -1749,7 +1749,7 @@ void EditableCharacterIterator::initFirstChar() if (_offset == box->maxOffset()) peekNext(); else if (b && !box->isOutside() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode(); + _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode(); else _char = -1; } @@ -1849,7 +1849,7 @@ kdDebug(6200) << "_offset " << _offset << endl; readchar: // get character if (b && !box->isOutside() && b->isInlineTextBox() && _offset < b->maxOffset()) - _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode(); + _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode(); else _char = -1; }/*end if*/ @@ -1861,7 +1861,7 @@ kdDebug(6200) << "_offset: " << _offset /*<< " _peekNext: " << _peekNext*/ << " if (!_end && ebit != (*_it)->end()) { CaretBox *box = *ebit; RenderObject *_r = box->object(); - kdDebug(6200) << "echit++(1): box " << box << (box && box->isInlineTextBox() ? TQString(" tqcontains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << " _r " << (_r ? _r->element()->nodeName().string() : TQString("<nil>")) << endl; + kdDebug(6200) << "echit++(1): box " << box << (box && box->isInlineTextBox() ? TQString(" contains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << " _r " << (_r ? _r->element()->nodeName().string() : TQString("<nil>")) << endl; } #endif return *this; @@ -1887,7 +1887,7 @@ kdDebug(6200) << "_offset == minofs: " << _offset << " == " << minofs << endl; // _peekNext = b; // get character if (b && !box->isOutside() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode(); + _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode(); else _char = -1; @@ -1934,7 +1934,7 @@ kdDebug(6200) << "box " << box << " b " << box->inlineBox() << " isText " << box // if (!_it.outside) _offset = r->isBR() ? (*ebit)->minOffset() : (*ebit)->maxOffset(); _char = -1; #if DEBUG_CARETMODE > 0 - kdDebug(6200) << "echit--(2): box " << box << " b " << box->inlineBox() << (box->isInlineTextBox() ? TQString(" tqcontains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << endl; + kdDebug(6200) << "echit--(2): box " << box << " b " << box->inlineBox() << (box->isInlineTextBox() ? TQString(" contains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << endl; #endif } else _end = true; @@ -1990,9 +1990,9 @@ kdDebug(6200) << "_offset: " << _offset << " _peekNext: " << _peekNext << endl; #endif // get character if (_peekNext && _offset >= box->maxOffset() && _peekNext->isInlineTextBox()) - _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].tqunicode(); + _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].unicode(); else if (b && _offset < b->maxOffset() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode(); + _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode(); else _char = -1; }/*end if*/ @@ -2000,7 +2000,7 @@ kdDebug(6200) << "_offset: " << _offset << " _peekNext: " << _peekNext << endl; #if DEBUG_CARETMODE > 0 if (!_end && ebit != (*_it)->preBegin()) { CaretBox *box = *ebit; - kdDebug(6200) << "echit--(1): box " << box << " b " << box->inlineBox() << (box->isInlineTextBox() ? TQString(" tqcontains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << endl; + kdDebug(6200) << "echit--(1): box " << box << " b " << box->inlineBox() << (box->isInlineTextBox() ? TQString(" contains \"%1\"").arg(TQConstString(static_cast<RenderText *>(box->object())->str->s+box->minOffset(), box->maxOffset() - box->minOffset()).string()) : TQString::null) << endl; } #endif return *this; @@ -2052,10 +2052,10 @@ TableRowIterator &TableRowIterator::operator --() // == class ErgonomicEditableLineIterator implementation // some decls -static RenderTableCell *tqfindNearestTableCellInRow(KHTMLPart *part, int x, +static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x, RenderTableSection::RowStruct *row, bool fromEnd); -/** tqfinds the cell corresponding to absolute x-coordinate @p x in the given +/** finds the cell corresponding to absolute x-coordinate @p x in the given * table. * * If there is no direct cell, or the cell is not accessible, the function @@ -2068,13 +2068,13 @@ static RenderTableCell *tqfindNearestTableCellInRow(KHTMLPart *part, int x, * beginning * @return the cell, or 0 if no editable cell was found. */ -static inline RenderTableCell *tqfindNearestTableCell(KHTMLPart *part, int x, +static inline RenderTableCell *findNearestTableCell(KHTMLPart *part, int x, TableRowIterator &it, bool fromEnd) { RenderTableCell *result = 0; while (*it) { - result = tqfindNearestTableCellInRow(part, x, *it, fromEnd); + result = findNearestTableCellInRow(part, x, *it, fromEnd); if (result) break; if (fromEnd) --it; else ++it; @@ -2083,7 +2083,7 @@ static inline RenderTableCell *tqfindNearestTableCell(KHTMLPart *part, int x, return result; } -/** tqfinds the nearest editable cell around the given absolute x-coordinate +/** finds the nearest editable cell around the given absolute x-coordinate * * It will dive into nested tables as necessary to provide seamless navigation. * @@ -2096,7 +2096,7 @@ static inline RenderTableCell *tqfindNearestTableCell(KHTMLPart *part, int x, * @param fromEnd @p true, begin from end (applies only to nested tables) * @return the found cell or 0 if no editable cell was found */ -static RenderTableCell *tqfindNearestTableCellInRow(KHTMLPart *part, int x, +static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x, RenderTableSection::RowStruct *row, bool fromEnd) { // First pass. Find spatially nearest cell. @@ -2134,13 +2134,13 @@ static RenderTableCell *tqfindNearestTableCellInRow(KHTMLPart *part, int x, kdDebug(6201) << "index " << index << " cell " << cell << endl; #endif RenderTable *nestedTable; - if (tqcontainsEditableElement(part, cell, nestedTable, fromEnd)) { + if (containsEditableElement(part, cell, nestedTable, fromEnd)) { if (nestedTable) { TableRowIterator it(nestedTable, fromEnd); while (*it) { // kdDebug(6201) << "=== recursive invocation" << endl; - cell = tqfindNearestTableCell(part, x, it, fromEnd); + cell = findNearestTableCell(part, x, it, fromEnd); if (cell) break; if (fromEnd) --it; else ++it; }/*wend*/ @@ -2164,7 +2164,7 @@ static RenderObject *commonAncestorTableSectionOrCell(RenderObject *r1, if (!r1 || !r2) return 0; RenderTableSection *sec = 0; int start_depth=0, end_depth=0; - // First we tqfind the depths of the two objects in the tree (start_depth, end_depth) + // First we find the depths of the two objects in the tree (start_depth, end_depth) RenderObject *n = r1; while (n->parent()) { n = n->parent(); @@ -2200,14 +2200,14 @@ static RenderObject *commonAncestorTableSectionOrCell(RenderObject *r1, return r1 && r1->isTable() ? sec : r1; } -/** Finds the row that tqcontains the given cell, directly, or indirectly +/** Finds the row that contains the given cell, directly, or indirectly * @param section section to be searched * @param cell table cell * @param row returns the row - * @param directCell returns the direct cell that tqcontains @p cell + * @param directCell returns the direct cell that contains @p cell * @return the index of the row. */ -static int tqfindRowInSection(RenderTableSection *section, RenderTableCell *cell, +static int findRowInSection(RenderTableSection *section, RenderTableCell *cell, RenderTableSection::RowStruct *&row, RenderTableCell *&directCell) { // Seek direct cell @@ -2236,12 +2236,12 @@ static int tqfindRowInSection(RenderTableSection *section, RenderTableCell *cell return -1; } -/** tqfinds the table that is the first direct or indirect descendant of @p block. +/** finds the table that is the first direct or indirect descendant of @p block. * @param leaf object to begin search from. * @param block object to search to, or 0 to search up to top. * @return the table or 0 if there were none. */ -static inline RenderTable *tqfindFirstDescendantTable(RenderObject *leaf, RenderBlock *block) +static inline RenderTable *findFirstDescendantTable(RenderObject *leaf, RenderBlock *block) { RenderTable *result = 0; while (leaf && leaf != block) { @@ -2299,7 +2299,7 @@ void ErgonomicEditableLineIterator::determineTopologicalElement( if (!commonAncestor || commonAncestor->isTableCell()) { // (1) RenderTableCell *cell = static_cast<RenderTableCell *>(commonAncestor); - RenderTable *table = tqfindFirstDescendantTable(newObject, cell); + RenderTable *table = findFirstDescendantTable(newObject, cell); #if DEBUG_CARETMODE > 0 kdDebug(6201) << "table cell: " << cell << endl; @@ -2315,7 +2315,7 @@ void ErgonomicEditableLineIterator::determineTopologicalElement( RenderTableSection *section = static_cast<RenderTableSection *>(commonAncestor); RenderTableSection::RowStruct *row; - int idx = tqfindRowInSection(section, oldCell, row, oldCell); + int idx = findRowInSection(section, oldCell, row, oldCell); #if DEBUG_CARETMODE > 1 kdDebug(6201) << "table section: row idx " << idx << endl; #endif @@ -2333,9 +2333,9 @@ void ErgonomicEditableLineIterator::determineTopologicalElement( // will crash on uninitialized table row iterator }/*end if*/ - RenderTableCell *cell = tqfindNearestTableCell(lines->m_part, xCoor, it, toBegin); + RenderTableCell *cell = findNearestTableCell(lines->m_part, xCoor, it, toBegin); #if DEBUG_CARETMODE > 1 - kdDebug(6201) << "tqfindNearestTableCell result: " << cell << endl; + kdDebug(6201) << "findNearestTableCell result: " << cell << endl; #endif RenderBlock *newBlock = cell; @@ -2348,7 +2348,7 @@ void ErgonomicEditableLineIterator::determineTopologicalElement( #endif RenderTable *nestedTable; - bool editableChild = cell && tqcontainsEditableChildElement(lines->m_part, + bool editableChild = cell && containsEditableChildElement(lines->m_part, cell, nestedTable, toBegin, section->table()); if (cell && !editableChild) { @@ -2436,7 +2436,7 @@ ErgonomicEditableLineIterator &ErgonomicEditableLineIterator::operator --() // == Navigational helper functions == -/** seeks the caret box which tqcontains or is the nearest to @p x +/** seeks the caret box which contains or is the nearest to @p x * @param it line iterator pointing to line to be searched * @param cv caret view context * @param x returns the cv->origX approximation, relatively positioned to the @@ -2457,7 +2457,7 @@ static CaretBox *nearestCaretBox(LineIterator &it, CaretViewContext *cv, if (cb) cb->absolutePosition(absx, absy); else absx = absy = 0; - // Otherwise tqfind out in which inline box the caret is to be placed. + // Otherwise find out in which inline box the caret is to be placed. // this horizontal position is to be approximated x = cv->origX - absx; @@ -2478,7 +2478,7 @@ static CaretBox *nearestCaretBox(LineIterator &it, CaretViewContext *cv, #if DEBUG_CARETMODE > 0 // RenderObject *r = b->object(); // if (b->isInlineFlowBox()) kdDebug(6200) << "b is inline flow box" << endl; -// kdDebug(6200) << "approximate r" << r << ": " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " tqcontains \"" + TQString(((RenderText *)r)->str->s, ((RenderText *)r)->str->l) + "\"" : TQString::null) << endl; +// kdDebug(6200) << "approximate r" << r << ": " << (r ? r->renderName() : TQString::null) << (r && r->isText() ? " contains \"" + TQString(((RenderText *)r)->str->s, ((RenderText *)r)->str->l) + "\"" : TQString::null) << endl; #endif xPos = b->xPos(); diff --git a/khtml/khtml_caret_p.h b/khtml/khtml_caret_p.h index 479dd7d76..9524f2df7 100644 --- a/khtml/khtml_caret_p.h +++ b/khtml/khtml_caret_p.h @@ -130,7 +130,7 @@ class CaretBoxLine; * * The caret box serves as a wrapper for inline boxes of all kind. It either * wraps an InlineBox, InlineTextBox, or InlineFlowBox, or if no such boxes - * exist for a certain context, it tqcontains the relevant information directly. + * exist for a certain context, it contains the relevant information directly. * * This class will be constructed whenever a caret position has to be described. * @since 3.3 @@ -178,7 +178,7 @@ public: */ RenderBlock *containingBlock() const { return _box ? static_cast<RenderBlock *>(cb) : cb->containingBlock(); } - /** returns the tqreplaced render object if this caret box represents one, + /** returns the replaced render object if this caret box represents one, * 0 otherwise. */ @@ -388,7 +388,7 @@ public: /** constructs a new caret box line for the given render block. * @param deleter deleter which handles alloc+dealloc of the object - * @param cb render block or render tqreplaced + * @param cb render block or render replaced * @param outside true when line is to be constructed outside * @param outsideEnd true when the ending outside is meant * @param iter returns the iterator to the caret box representing the given @@ -409,7 +409,7 @@ public: #endif protected: - /** tqcontains the seek parameters */ + /** contains the seek parameters */ struct SeekBoxParams { InlineBox *box; bool outside; @@ -656,10 +656,10 @@ public: virtual ~LinearDocument(); /** - * Tells whether this list tqcontains any lines. + * Tells whether this list contains any lines. * - * @returns @p true if this document tqcontains lines, @p false otherwise. Note - * that an empty document tqcontains at least one line, so this method + * @returns @p true if this document contains lines, @p false otherwise. Note + * that an empty document contains at least one line, so this method * only returns @p false if the document could not be initialised for * some reason. */ @@ -796,7 +796,7 @@ public: void advance(bool toBegin); protected: - /** tqfinds out if the given box is editable. + /** finds out if the given box is editable. * @param boxit iterator to given caret box * @param fromEnd true when advancing towards the beginning * @return @p true if box is editable @@ -860,7 +860,7 @@ public: void advance(bool toBegin); protected: - /** tqfinds out if the current line is editable. + /** finds out if the current line is editable. * * @param it check caret box line iterator points to * @return @p true if line is editable @@ -1034,7 +1034,7 @@ public: */ int chr() const { return _char; } - /** returns the current character as a tqunicode symbol, substituting + /** returns the current character as a unicode symbol, substituting * a blank for a non-text node. */ TQChar operator *() const { return TQChar(_char >= 0 ? _char : ' '); } @@ -1089,7 +1089,7 @@ protected: CaretBox *box = *copy; InlineBox *b = box->inlineBox(); if (b && !box->isOutside() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].tqunicode(); + _char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].unicode(); else _char = -1; } diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index 064d7dc8c..7cadfb944 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -220,7 +220,7 @@ void KHTMLPartBrowserExtension::copy() { // get selected text and paste to the clipboard TQString text= m_part->selectedText(); - text.tqreplace( TQChar( 0xa0 ), ' ' ); + text.replace( TQChar( 0xa0 ), ' ' ); QClipboard *cb = TQApplication::clipboard(); @@ -240,7 +240,7 @@ void KHTMLPartBrowserExtension::copy() KMultipleDrag *drag = new KMultipleDrag( m_editableFormWidget ); drag->addDragObject( textdrag ); if(!htmltext.isEmpty()) { - htmltext.tqreplace( TQChar( 0xa0 ), ' ' ); + htmltext.replace( TQChar( 0xa0 ), ' ' ); TQTextDrag *htmltextdrag = new TQTextDrag(htmltext, 0L); htmltextdrag->setSubtype("html"); drag->addDragObject( htmltextdrag ); @@ -276,7 +276,7 @@ void KHTMLPartBrowserExtension::searchProvider() KDesktopFile file("searchproviders/google.desktop", true, "services"); TQString encodedSearchTerm = m_part->selectedText(); TQUrl::encode(encodedSearchTerm); - data.setData(file.readEntry("Query").tqreplace("\\{@}", encodedSearchTerm)); + data.setData(file.readEntry("Query").replace("\\{@}", encodedSearchTerm)); } KParts::URLArgs args; @@ -315,7 +315,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method ) if ( !m_extensionProxy ) return; - int slot = m_extensionProxy->tqmetaObject()->tqfindSlot( method ); + int slot = m_extensionProxy->metaObject()->findSlot( method ); if ( slot == -1 ) return; @@ -339,7 +339,7 @@ void KHTMLPartBrowserExtension::updateEditActions() enableAction( "paste", data->provides( "text/plain" ) ); #else TQString data=TQApplication::clipboard()->text(); - enableAction( "paste", data.tqcontains("://")); + enableAction( "paste", data.contains("://")); #endif bool hasSelection = false; @@ -444,7 +444,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc, // search text TQString selectedText = khtml->selectedText(); - selectedText.tqreplace("&", "&&"); + selectedText.replace("&", "&&"); if ( selectedText.length()>18 ) { selectedText.truncate(15); selectedText+="..."; @@ -465,7 +465,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc, { TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); if ( iconPath.isEmpty() ) - icon = SmallIcon("tqfind"); + icon = SmallIcon("find"); else icon = TQPixmap( iconPath ); name = service->name(); @@ -502,7 +502,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc, { TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); if ( iconPath.isEmpty() ) - icon = SmallIcon("tqfind"); + icon = SmallIcon("find"); else icon = TQPixmap( iconPath ); name = service->name(); @@ -514,7 +514,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc, } - if ( selectedText.tqcontains("://") && KURL(selectedText).isValid() ) + if ( selectedText.contains("://") && KURL(selectedText).isValid() ) new KAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0, d->m_khtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" ); } @@ -615,7 +615,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *khtml, const TQString &doc, } TQString name = KStringHandler::csqueeze(d->m_imageURL.fileName()+d->m_imageURL.query(), 25); - new KAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.tqreplace("&", "&&") : d->m_suggestedFilename.tqreplace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ), + new KAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ), actionCollection(), "viewimage" ); if (KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()) @@ -809,7 +809,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption, const TQString &filter, long cacheId, const TQString & suggestedFilename ) { - TQString name = TQString::tqfromLatin1( "index.html" ); + TQString name = TQString::fromLatin1( "index.html" ); if ( !suggestedFilename.isEmpty() ) name = suggestedFilename; else if ( !url.fileName().isEmpty() ) @@ -870,7 +870,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, if(!saved) { // DownloadManager <-> konqueror integration - // tqfind if the integration is enabled + // find if the integration is enabled // the empty key means no integration // only use download manager for non-local urls! bool downloadViaKIO = true; @@ -881,7 +881,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, TQString downloadManger = cfg.readPathEntry("DownloadManager"); if (!downloadManger.isEmpty()) { - // then tqfind the download manager location + // then find the download manager location kdDebug(1000) << "Using: "<<downloadManger <<" as Download Manager" <<endl; TQString cmd = KStandardDirs::findExe(downloadManger); if (cmd.isEmpty()) @@ -947,7 +947,7 @@ void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data ) if (id == VIRTUAL_FIND_FRAME_PARENT) { FindFrameParentParams *param = static_cast<FindFrameParentParams*>(data); - KHTMLPart *parentPart = m_part->tqfindFrameParent(param->callingPart, param->frame); + KHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame); if (parentPart) param->parent = parentPart->browserHostExtension(); return; diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp index 981f8e49e..7eedc6311 100644 --- a/khtml/khtml_factory.cpp +++ b/khtml/khtml_factory.cpp @@ -103,13 +103,13 @@ KHTMLFactory::~KHTMLFactory() deref(); } -KParts::Part *KHTMLFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) +KParts::Part *KHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) prof = KHTMLPart::BrowserViewGUI; - return new KHTMLPart( tqparentWidget, widgetName, parent, name, prof ); + return new KHTMLPart( parentWidget, widgetName, parent, name, prof ); } void KHTMLFactory::ref() @@ -146,7 +146,7 @@ void KHTMLFactory::registerPart( KHTMLPart *part ) if ( !s_parts ) s_parts = new TQPtrList<KHTMLPart>; - if ( !s_parts->tqcontainsRef( part ) ) + if ( !s_parts->containsRef( part ) ) { s_parts->append( part ); ref(); diff --git a/khtml/khtml_factory.h b/khtml/khtml_factory.h index e5319bf83..e9d5c62a8 100644 --- a/khtml/khtml_factory.h +++ b/khtml/khtml_factory.h @@ -45,7 +45,7 @@ public: KHTMLFactory( bool clone = false ); virtual ~KHTMLFactory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); static void registerPart( KHTMLPart *part ); static void deregisterPart( KHTMLPart *part ); diff --git a/khtml/khtml_iface.h b/khtml/khtml_iface.h index 8fd7ccc0a..8caade850 100644 --- a/khtml/khtml_iface.h +++ b/khtml/khtml_iface.h @@ -155,7 +155,7 @@ k_dcop: * default style sheet. * * This gives a wide range of possibilities to - * change the tqlayout of the page. + * change the layout of the page. */ void setUserStyleSheet(const TQString &styleSheet); diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp index 33462110a..935f31cc0 100644 --- a/khtml/khtml_pagecache.cpp +++ b/khtml/khtml_pagecache.cpp @@ -157,7 +157,7 @@ KHTMLPageCache::createCacheEntry() void KHTMLPageCache::addData(long id, const TQByteArray &data) { - KHTMLPageCacheEntry *entry = d->dict.tqfind(id); + KHTMLPageCacheEntry *entry = d->dict.find(id); if (entry) entry->addData(data); } @@ -165,7 +165,7 @@ KHTMLPageCache::addData(long id, const TQByteArray &data) void KHTMLPageCache::endData(long id) { - KHTMLPageCacheEntry *entry = d->dict.tqfind(id); + KHTMLPageCacheEntry *entry = d->dict.find(id); if (entry) entry->endData(); } @@ -184,13 +184,13 @@ KHTMLPageCache::cancelEntry(long id) bool KHTMLPageCache::isValid(long id) { - return (d->dict.tqfind(id) != 0); + return (d->dict.find(id) != 0); } bool KHTMLPageCache::isComplete(long id) { - KHTMLPageCacheEntry *entry = d->dict.tqfind(id); + KHTMLPageCacheEntry *entry = d->dict.find(id); if (entry) return entry->isComplete(); return false; @@ -199,7 +199,7 @@ KHTMLPageCache::isComplete(long id) void KHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot) { - KHTMLPageCacheEntry *entry = d->dict.tqfind(id); + KHTMLPageCacheEntry *entry = d->dict.find(id); if (!entry || !entry->isComplete()) return; // Make this entry the most recent entry. @@ -271,7 +271,7 @@ KHTMLPageCache::sendData() void KHTMLPageCache::saveData(long id, TQDataStream *str) { - KHTMLPageCacheEntry *entry = d->dict.tqfind(id); + KHTMLPageCacheEntry *entry = d->dict.find(id); assert(entry); int fd = entry->m_file->handle(); diff --git a/khtml/khtml_pagecache.h b/khtml/khtml_pagecache.h index ac9ea5b4b..9b41950a7 100644 --- a/khtml/khtml_pagecache.h +++ b/khtml/khtml_pagecache.h @@ -38,7 +38,7 @@ class KHTMLPageCachePrivate; * * It operates completely independent from the kio_http cache. */ -class KHTMLPageCache : public TQObject +class KHTMLPageCache : public QObject { Q_OBJECT public: @@ -113,7 +113,7 @@ private: KHTMLPageCachePrivate *d; }; -class KHTMLPageCacheDelivery : public TQObject +class KHTMLPageCacheDelivery : public QObject { friend class KHTMLPageCache; Q_OBJECT diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 2783e080f..338b9605d 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -170,7 +170,7 @@ void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & e script += ","; if ((*i).first == KParts::LiveConnectExtension::TypeString) { script += "\""; - script += TQString((*i).second).tqreplace('\\', "\\\\").tqreplace('"', "\\\""); + script += TQString((*i).second).replace('\\', "\\\\").replace('"', "\\\""); script += "\""; } else script += (*i).second; @@ -191,7 +191,7 @@ void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & e part->executeScript(m_frame->element(), script); } -KHTMLFrameList::Iterator KHTMLFrameList::tqfind( const TQString &name ) +KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name ) { Iterator it = begin(); const Iterator e = end(); @@ -203,7 +203,7 @@ KHTMLFrameList::Iterator KHTMLFrameList::tqfind( const TQString &name ) return it; } -KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) +KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ) { d = 0; @@ -211,7 +211,7 @@ KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() ); // TODO KDE4 - don't load plugins yet //setInstance( KHTMLFactory::instance(), false ); - init( new KHTMLView( this, tqparentWidget, widgetname ), prof ); + init( new KHTMLView( this, parentWidget, widgetname ), prof ); } KHTMLPart::KHTMLPart( KHTMLView *view, TQObject *parent, const char *name, GUIProfile prof ) @@ -371,24 +371,24 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) "Click and hold down the mouse button for a menu with all available font sizes." ) ); } - d->m_paFind = KStdAction::tqfind( this, TQT_SLOT( slotFind() ), actionCollection(), "tqfind" ); + d->m_paFind = KStdAction::find( this, TQT_SLOT( slotFind() ), actionCollection(), "find" ); d->m_paFind->setWhatsThis( i18n( "Find text<p>" - "Shows a dialog that allows you to tqfind text on the displayed page." ) ); + "Shows a dialog that allows you to find text on the displayed page." ) ); - d->m_paFindNext = KStdAction::tqfindNext( this, TQT_SLOT( slotFindNext() ), actionCollection(), "tqfindNext" ); + d->m_paFindNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection(), "findNext" ); d->m_paFindNext->setWhatsThis( i18n( "Find next<p>" "Find the next occurrence of the text that you " "have found using the <b>Find Text</b> function" ) ); - d->m_paFindPrev = KStdAction::tqfindPrev( this, TQT_SLOT( slotFindPrev() ), actionCollection(), "tqfindPrevious" ); + d->m_paFindPrev = KStdAction::findPrev( this, TQT_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" ); d->m_paFindPrev->setWhatsThis( i18n( "Find previous<p>" "Find the previous occurrence of the text that you " "have found using the <b>Find Text</b> function" ) ); d->m_paFindAheadText = new KAction( i18n("Find Text as You Type"), KShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()), - actionCollection(), "tqfindAheadText"); + actionCollection(), "findAheadText"); d->m_paFindAheadLinks = new KAction( i18n("Find Links as You Type"), KShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()), - actionCollection(), "tqfindAheadLink"); + actionCollection(), "findAheadLink"); d->m_paFindAheadText->setEnabled( false ); d->m_paFindAheadLinks->setEnabled( false ); @@ -448,7 +448,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) connect ( &d->m_progressUpdateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressUpdate() ) ); - tqfindTextBegin(); //reset tqfind variables + findTextBegin(); //reset find variables connect( &d->m_redirectionTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRedirect() ) ); @@ -482,7 +482,7 @@ KHTMLPart::~KHTMLPart() delete d->m_statusBarPopupLabel; } - d->m_tqfind = 0; // deleted by its parent, the view. + d->m_find = 0; // deleted by its parent, the view. if ( d->m_manager ) { @@ -608,7 +608,7 @@ bool KHTMLPart::openURL( const KURL &url ) if (!d->m_statusBarUALabel) { d->m_statusBarUALabel = new KURLLabel(d->m_statusBarExtension->statusBar()); d->m_statusBarUALabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - d->m_statusBarUALabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + d->m_statusBarUALabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarUALabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarUALabel, 0, false); d->m_statusBarUALabel->setPixmap(SmallIcon("agent", instance())); @@ -717,7 +717,7 @@ bool KHTMLPart::openURL( const KURL &url ) } if (widget()) - d->m_job->setWindow(widget()->tqtopLevelWidget()); + d->m_job->setWindow(widget()->topLevelWidget()); d->m_job->addMetaData(args.metaData()); connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ), @@ -959,7 +959,7 @@ bool KHTMLPart::metaRefreshEnabled() const // Define this to disable dlopening kjs_html, when directly linking to it. // You need to edit khtml/Makefile.am to add ./ecma/libkjs_html.la to LIBADD // and to edit khtml/ecma/Makefile.am to s/kjs_html/libkjs_html/, remove libkhtml from LIBADD, -// remove LDFLAGS line, and tqreplace kde_module with either lib (shared) or noinst (static) +// remove LDFLAGS line, and replace kde_module with either lib (shared) or noinst (static) // Also, change the order of "ecma" and "." in khtml's SUBDIRS line. // OK - that's the default now, use the opposite of the above instructions to go back // to "dlopening it" - but it breaks exception catching in kjs_binding.cpp @@ -1043,7 +1043,7 @@ TQVariant KHTMLPart::crossFrameExecuteScript(const TQString& target, const TQSt // we always allow these } else { - destpart = tqfindFrame(target); + destpart = findFrame(target); if (!destpart) destpart = this; } @@ -1075,10 +1075,10 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() { if (!d->m_statusBarJSErrorLabel) { d->m_statusBarJSErrorLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); d->m_statusBarJSErrorLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - d->m_statusBarJSErrorLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + d->m_statusBarJSErrorLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarJSErrorLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false); - TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page tqcontains coding errors.")); + TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page contains coding errors.")); d->m_statusBarJSErrorLabel->setPixmap(SmallIcon("bug", instance())); connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchJSErrorDialog())); connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(jsErrorDialogContextMenu())); @@ -1397,7 +1397,7 @@ void KHTMLPart::clear() } - tqfindTextBegin(); // resets d->m_tqfindNode and d->m_tqfindPos + findTextBegin(); // resets d->m_findNode and d->m_findPos d->m_mousePressNode = DOM::Node(); @@ -1525,7 +1525,7 @@ void KHTMLPart::setPageSecurity( PageSecurity sec ) if ( sec != NotCrypted && !d->m_statusBarIconLabel && !parentPart() ) { d->m_statusBarIconLabel = new KURLLabel( d->m_statusBarExtension->statusBar() ); d->m_statusBarIconLabel->setFixedHeight( instance()->iconLoader()->currentSize(KIcon::Small) ); - d->m_statusBarIconLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarIconLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false ); connect( d->m_statusBarIconLabel, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( slotSecurity() ) ); @@ -1722,14 +1722,14 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU d->m_bJScriptForce = false; d->m_bJScriptOverride = true; begin(); - TQString errText = TQString::tqfromLatin1( "<HTML dir=%1><HEAD><TITLE>" ) + TQString errText = TQString::fromLatin1( "<HTML dir=%1><HEAD><TITLE>" ) .arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); errText += i18n( "Error while loading %1" ).arg( reqUrl.htmlURL() ); - errText += TQString::tqfromLatin1( "</TITLE></HEAD><BODY><P>" ); + errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" ); errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() ); - errText += TQString::tqfromLatin1( "</P>" ); + errText += TQString::fromLatin1( "</P>" ); errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) ); - errText += TQString::tqfromLatin1( "</BODY></HTML>" ); + errText += TQString::fromLatin1( "</BODY></HTML>" ); write(errText); end(); @@ -1757,56 +1757,56 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU TQString url, protocol, datetime; url = reqUrl.prettyURL(); protocol = reqUrl.protocol(); - datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), + datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); - TQString doc = TQString::tqfromLatin1( "<html><head><title>" ); + TQString doc = TQString::fromLatin1( "<html><head><title>" ); doc += i18n( "Error: " ); doc += errorName; - doc += TQString::tqfromLatin1( " - %1</title></head><body><h1>" ).arg( url ); + doc += TQString::fromLatin1( " - %1</title></head><body><h1>" ).arg( url ); doc += i18n( "The requested operation could not be completed" ); - doc += TQString::tqfromLatin1( "</h1><h2>" ); + doc += TQString::fromLatin1( "</h1><h2>" ); doc += errorName; - doc += TQString::tqfromLatin1( "</h2>" ); + doc += TQString::fromLatin1( "</h2>" ); if ( !techName.isNull() ) { - doc += TQString::tqfromLatin1( "<h2>" ); + doc += TQString::fromLatin1( "<h2>" ); doc += i18n( "Technical Reason: " ); doc += techName; - doc += TQString::tqfromLatin1( "</h2>" ); + doc += TQString::fromLatin1( "</h2>" ); } - doc += TQString::tqfromLatin1( "<h3>" ); + doc += TQString::fromLatin1( "<h3>" ); doc += i18n( "Details of the Request:" ); - doc += TQString::tqfromLatin1( "</h3><ul><li>" ); + doc += TQString::fromLatin1( "</h3><ul><li>" ); doc += i18n( "URL: %1" ).arg( url ); - doc += TQString::tqfromLatin1( "</li><li>" ); + doc += TQString::fromLatin1( "</li><li>" ); if ( !protocol.isNull() ) { // uncomment for 3.1... i18n change // doc += i18n( "Protocol: %1" ).arg( protocol ).arg( protocol ); - doc += TQString::tqfromLatin1( "</li><li>" ); + doc += TQString::fromLatin1( "</li><li>" ); } doc += i18n( "Date and Time: %1" ).arg( datetime ); - doc += TQString::tqfromLatin1( "</li><li>" ); + doc += TQString::fromLatin1( "</li><li>" ); doc += i18n( "Additional Information: %1" ).arg( text ); - doc += TQString::tqfromLatin1( "</li></ul><h3>" ); + doc += TQString::fromLatin1( "</li></ul><h3>" ); doc += i18n( "Description:" ); - doc += TQString::tqfromLatin1( "</h3><p>" ); + doc += TQString::fromLatin1( "</h3><p>" ); doc += description; - doc += TQString::tqfromLatin1( "</p>" ); + doc += TQString::fromLatin1( "</p>" ); if ( causes.count() ) { - doc += TQString::tqfromLatin1( "<h3>" ); + doc += TQString::fromLatin1( "<h3>" ); doc += i18n( "Possible Causes:" ); - doc += TQString::tqfromLatin1( "</h3><ul><li>" ); + doc += TQString::fromLatin1( "</h3><ul><li>" ); doc += causes.join( "</li><li>" ); - doc += TQString::tqfromLatin1( "</li></ul>" ); + doc += TQString::fromLatin1( "</li></ul>" ); } if ( solutions.count() ) { - doc += TQString::tqfromLatin1( "<h3>" ); + doc += TQString::fromLatin1( "<h3>" ); doc += i18n( "Possible Solutions:" ); - doc += TQString::tqfromLatin1( "</h3><ul><li>" ); + doc += TQString::fromLatin1( "</h3><ul><li>" ); doc += solutions.join( "</li><li>" ); - doc += TQString::tqfromLatin1( "</li></ul>" ); + doc += TQString::fromLatin1( "</li></ul>" ); } - doc += TQString::tqfromLatin1( "</body></html>" ); + doc += TQString::fromLatin1( "</body></html>" ); write( doc ); end(); @@ -2286,12 +2286,12 @@ void KHTMLPart::checkCompleted() } // the view will emit completed on our behalf, - // either now or at next tqrepaint if one is pending + // either now or at next repaint if one is pending //kdDebug(6050) << this << " asks the view to emit completed. pendingAction=" << pendingAction << endl; d->m_view->complete( pendingAction ); - // tqfind the alternate stylesheets + // find the alternate stylesheets TQStringList sheets; if (d->m_doc) sheets = d->m_doc->availableStyleSheets(); @@ -2301,7 +2301,7 @@ void KHTMLPart::checkCompleted() d->m_paUseStylesheet->setEnabled( sheets.count() > 2); if (sheets.count() > 2) { - d->m_paUseStylesheet->setCurrentItem(kMax(sheets.tqfindIndex(d->m_sheetUsed), 0)); + d->m_paUseStylesheet->setCurrentItem(kMax(sheets.findIndex(d->m_sheetUsed), 0)); slotUseStylesheet(); } @@ -2402,7 +2402,7 @@ void KHTMLPart::slotRedirect() d->m_redirectURL = TQString::null; // SYNC check with ecma/kjs_window.cpp::goURL ! - if ( u.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( u.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { TQString script = KURL::decode_string( u.right( u.length() - 11 ) ); kdDebug( 6050 ) << "KHTMLPart::slotRedirect script=" << script << endl; @@ -2731,17 +2731,17 @@ void KHTMLPart::setCaretVisible(bool show) #endif // KHTML_NO_CARET } -void KHTMLPart::tqfindTextBegin() +void KHTMLPart::findTextBegin() { - d->m_tqfindPos = -1; - d->m_tqfindNode = 0; - d->m_tqfindPosEnd = -1; - d->m_tqfindNodeEnd= 0; - d->m_tqfindPosStart = -1; - d->m_tqfindNodeStart = 0; - d->m_tqfindNodePrevious = 0; - delete d->m_tqfind; - d->m_tqfind = 0L; + d->m_findPos = -1; + d->m_findNode = 0; + d->m_findPosEnd = -1; + d->m_findNodeEnd= 0; + d->m_findPosStart = -1; + d->m_findNodeStart = 0; + d->m_findNodePrevious = 0; + delete d->m_find; + d->m_find = 0L; } bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor ) @@ -2771,35 +2771,35 @@ bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor ) //kdDebug(6050) << k_funcinfo << "using selection" << endl; if ( !fromCursor ) { - d->m_tqfindNode = reverse ? d->m_selectionEnd.handle() : d->m_selectionStart.handle(); - d->m_tqfindPos = reverse ? d->m_endOffset : d->m_startOffset; + d->m_findNode = reverse ? d->m_selectionEnd.handle() : d->m_selectionStart.handle(); + d->m_findPos = reverse ? d->m_endOffset : d->m_startOffset; } - d->m_tqfindNodeEnd = reverse ? d->m_selectionStart.handle() : d->m_selectionEnd.handle(); - d->m_tqfindPosEnd = reverse ? d->m_startOffset : d->m_endOffset; - d->m_tqfindNodeStart = !reverse ? d->m_selectionStart.handle() : d->m_selectionEnd.handle(); - d->m_tqfindPosStart = !reverse ? d->m_startOffset : d->m_endOffset; - d->m_tqfindNodePrevious = d->m_tqfindNodeStart; + d->m_findNodeEnd = reverse ? d->m_selectionStart.handle() : d->m_selectionEnd.handle(); + d->m_findPosEnd = reverse ? d->m_startOffset : d->m_endOffset; + d->m_findNodeStart = !reverse ? d->m_selectionStart.handle() : d->m_selectionEnd.handle(); + d->m_findPosStart = !reverse ? d->m_startOffset : d->m_endOffset; + d->m_findNodePrevious = d->m_findNodeStart; } else // whole document { //kdDebug(6050) << k_funcinfo << "whole doc" << endl; if ( !fromCursor ) { - d->m_tqfindNode = firstNode; - d->m_tqfindPos = reverse ? -1 : 0; + d->m_findNode = firstNode; + d->m_findPos = reverse ? -1 : 0; } - d->m_tqfindNodeEnd = reverse ? firstNode : 0; - d->m_tqfindPosEnd = reverse ? 0 : -1; - d->m_tqfindNodeStart = !reverse ? firstNode : 0; - d->m_tqfindPosStart = !reverse ? 0 : -1; - d->m_tqfindNodePrevious = d->m_tqfindNodeStart; + d->m_findNodeEnd = reverse ? firstNode : 0; + d->m_findPosEnd = reverse ? 0 : -1; + d->m_findNodeStart = !reverse ? firstNode : 0; + d->m_findPosStart = !reverse ? 0 : -1; + d->m_findNodePrevious = d->m_findNodeStart; if ( reverse ) { - // Need to tqfind out the really last object, to start from it - khtml::RenderObject* obj = d->m_tqfindNode ? d->m_tqfindNode->renderer() : 0; + // Need to find out the really last object, to start from it + khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0; if ( obj ) { - // tqfind the last object in the render tree + // find the last object in the render tree while ( obj->lastChild() ) { obj = obj->lastChild(); @@ -2809,7 +2809,7 @@ bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor ) { obj = obj->objectAbove(); } - d->m_tqfindNode = obj->element(); + d->m_findNode = obj->element(); } } } @@ -2817,15 +2817,15 @@ bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor ) } // Old method (its API limits the available features - remove in KDE-4) -bool KHTMLPart::tqfindTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp ) +bool KHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp ) { - if ( !initFindNode( false, !forward, d->m_tqfindNode ) ) + if ( !initFindNode( false, !forward, d->m_findNode ) ) return false; while(1) { - if( (d->m_tqfindNode->nodeType() == Node::TEXT_NODE || d->m_tqfindNode->nodeType() == Node::CDATA_SECTION_NODE) && d->m_tqfindNode->renderer() ) + if( (d->m_findNode->nodeType() == Node::TEXT_NODE || d->m_findNode->nodeType() == Node::CDATA_SECTION_NODE) && d->m_findNode->renderer() ) { - DOMString nodeText = d->m_tqfindNode->nodeValue(); + DOMString nodeText = d->m_findNode->nodeValue(); DOMStringImpl *t = nodeText.implementation(); TQConstString s(t->s, t->l); @@ -2833,26 +2833,26 @@ bool KHTMLPart::tqfindTextNext( const TQString &str, bool forward, bool caseSens if ( isRegExp ) { TQRegExp matcher( str ); matcher.setCaseSensitive( caseSensitive ); - d->m_tqfindPos = matcher.search(s.string(), d->m_tqfindPos+1); - if ( d->m_tqfindPos != -1 ) + d->m_findPos = matcher.search(s.string(), d->m_findPos+1); + if ( d->m_findPos != -1 ) matchLen = matcher.matchedLength(); } else { - d->m_tqfindPos = s.string().tqfind(str, d->m_tqfindPos+1, caseSensitive); + d->m_findPos = s.string().find(str, d->m_findPos+1, caseSensitive); matchLen = str.length(); } - if(d->m_tqfindPos != -1) + if(d->m_findPos != -1) { int x = 0, y = 0; - if(static_cast<khtml::RenderText *>(d->m_tqfindNode->renderer()) - ->posOfChar(d->m_tqfindPos, x, y)) + if(static_cast<khtml::RenderText *>(d->m_findNode->renderer()) + ->posOfChar(d->m_findPos, x, y)) d->m_view->setContentsPos(x-50, y-50); - d->m_selectionStart = d->m_tqfindNode; - d->m_startOffset = d->m_tqfindPos; - d->m_selectionEnd = d->m_tqfindNode; - d->m_endOffset = d->m_tqfindPos + matchLen; + d->m_selectionStart = d->m_findNode; + d->m_startOffset = d->m_findPos; + d->m_selectionEnd = d->m_findNode; + d->m_endOffset = d->m_findPos + matchLen; d->m_startBeforeEnd = true; d->m_doc->setSelection( d->m_selectionStart.handle(), d->m_startOffset, @@ -2861,39 +2861,39 @@ bool KHTMLPart::tqfindTextNext( const TQString &str, bool forward, bool caseSens return true; } } - d->m_tqfindPos = -1; + d->m_findPos = -1; NodeImpl *next; if ( forward ) { - next = d->m_tqfindNode->firstChild(); + next = d->m_findNode->firstChild(); - if(!next) next = d->m_tqfindNode->nextSibling(); - while(d->m_tqfindNode && !next) { - d->m_tqfindNode = d->m_tqfindNode->parentNode(); - if( d->m_tqfindNode ) { - next = d->m_tqfindNode->nextSibling(); + if(!next) next = d->m_findNode->nextSibling(); + while(d->m_findNode && !next) { + d->m_findNode = d->m_findNode->parentNode(); + if( d->m_findNode ) { + next = d->m_findNode->nextSibling(); } } } else { - next = d->m_tqfindNode->lastChild(); + next = d->m_findNode->lastChild(); - if (!next ) next = d->m_tqfindNode->previousSibling(); - while ( d->m_tqfindNode && !next ) + if (!next ) next = d->m_findNode->previousSibling(); + while ( d->m_findNode && !next ) { - d->m_tqfindNode = d->m_tqfindNode->parentNode(); - if( d->m_tqfindNode ) + d->m_findNode = d->m_findNode->parentNode(); + if( d->m_findNode ) { - next = d->m_tqfindNode->previousSibling(); + next = d->m_findNode->previousSibling(); } } } - d->m_tqfindNode = next; - if(!d->m_tqfindNode) return false; + d->m_findNode = next; + if(!d->m_findNode) return false; } } @@ -2908,7 +2908,7 @@ void KHTMLPart::slotFind() kdError(6000) << "slotFind: part is a " << part->className() << ", can't do a search into it" << endl; return; } - static_cast<KHTMLPart *>( part )->tqfindText(); + static_cast<KHTMLPart *>( part )->findText(); } void KHTMLPart::slotFindNext() @@ -2921,7 +2921,7 @@ void KHTMLPart::slotFindNext() kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl; return; } - static_cast<KHTMLPart *>( part )->tqfindTextNext(); + static_cast<KHTMLPart *>( part )->findTextNext(); } void KHTMLPart::slotFindPrev() @@ -2934,7 +2934,7 @@ void KHTMLPart::slotFindPrev() kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl; return; } - static_cast<KHTMLPart *>( part )->tqfindTextNext( true ); // reverse + static_cast<KHTMLPart *>( part )->findTextNext( true ); // reverse } void KHTMLPart::slotFindDone() @@ -2984,22 +2984,22 @@ void KHTMLPart::enableFindAheadActions( bool enable ) void KHTMLPart::slotFindDialogDestroyed() { - d->m_lastFindState.options = d->m_tqfindDialog->options(); - d->m_lastFindState.history = d->m_tqfindDialog->tqfindHistory(); - d->m_tqfindDialog->deleteLater(); - d->m_tqfindDialog = 0L; + d->m_lastFindState.options = d->m_findDialog->options(); + d->m_lastFindState.history = d->m_findDialog->findHistory(); + d->m_findDialog->deleteLater(); + d->m_findDialog = 0L; } -void KHTMLPart::tqfindText() +void KHTMLPart::findText() { // First do some init to make sure we can search in this frame if ( !d->m_doc ) return; // Raise if already opened - if ( d->m_tqfindDialog ) + if ( d->m_findDialog ) { - KWin::activateWindow( d->m_tqfindDialog->winId() ); + KWin::activateWindow( d->m_findDialog->winId() ); return; } @@ -3009,27 +3009,27 @@ void KHTMLPart::tqfindText() #endif // Now show the dialog in which the user can choose options. - d->m_tqfindDialog = new KFindDialog( false /*non-modal*/, widget(), "khtmltqfind" ); - d->m_tqfindDialog->setHasSelection( hasSelection() ); - d->m_tqfindDialog->setHasCursor( d->m_tqfindNode != 0 ); - if ( d->m_tqfindNode ) // has a cursor -> default to 'FromCursor' + d->m_findDialog = new KFindDialog( false /*non-modal*/, widget(), "khtmlfind" ); + d->m_findDialog->setHasSelection( hasSelection() ); + d->m_findDialog->setHasCursor( d->m_findNode != 0 ); + if ( d->m_findNode ) // has a cursor -> default to 'FromCursor' d->m_lastFindState.options |= KFindDialog::FromCursor; // TODO? optionsDialog.setPattern( d->m_lastFindState.text ); - d->m_tqfindDialog->setFindHistory( d->m_lastFindState.history ); - d->m_tqfindDialog->setOptions( d->m_lastFindState.options ); + d->m_findDialog->setFindHistory( d->m_lastFindState.history ); + d->m_findDialog->setOptions( d->m_lastFindState.options ); - d->m_lastFindState.options = -1; // force update in tqfindTextNext + d->m_lastFindState.options = -1; // force update in findTextNext d->m_lastFindState.last_dir = -1; - d->m_tqfindDialog->show(); - connect( d->m_tqfindDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFindNext()) ); - connect( d->m_tqfindDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFindDialogDestroyed()) ); + d->m_findDialog->show(); + connect( d->m_findDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFindNext()) ); + connect( d->m_findDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFindDialogDestroyed()) ); - tqfindText( d->m_tqfindDialog->pattern(), 0 /*options*/, widget(), d->m_tqfindDialog ); + findText( d->m_findDialog->pattern(), 0 /*options*/, widget(), d->m_findDialog ); } -void KHTMLPart::tqfindText( const TQString &str, long options, TQWidget *parent, KFindDialog *tqfindDialog ) +void KHTMLPart::findText( const TQString &str, long options, TQWidget *parent, KFindDialog *findDialog ) { // First do some init to make sure we can search in this frame if ( !d->m_doc ) @@ -3040,15 +3040,15 @@ void KHTMLPart::tqfindText( const TQString &str, long options, TQWidget *parent, #endif // Create the KFind object - delete d->m_tqfind; - d->m_tqfind = new KFind( str, options, parent, tqfindDialog ); - d->m_tqfind->closeFindNextDialog(); // we use KFindDialog non-modal, so we don't want other dlg popping up - connect( d->m_tqfind, TQT_SIGNAL( highlight( const TQString &, int, int ) ), + delete d->m_find; + d->m_find = new KFind( str, options, parent, findDialog ); + d->m_find->closeFindNextDialog(); // we use KFindDialog non-modal, so we don't want other dlg popping up + connect( d->m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); - //connect(d->m_tqfind, TQT_SIGNAL( tqfindNext() ), + //connect(d->m_find, TQT_SIGNAL( findNext() ), // this, TQT_SLOT( slotFindNext() ) ); - if ( !tqfindDialog ) + if ( !findDialog ) { d->m_lastFindState.options = options; initFindNode( options & KFindDialog::SelectedText, @@ -3057,33 +3057,33 @@ void KHTMLPart::tqfindText( const TQString &str, long options, TQWidget *parent, } } -bool KHTMLPart::tqfindTextNext() +bool KHTMLPart::findTextNext() { - return tqfindTextNext( false ); + return findTextNext( false ); } // New method -bool KHTMLPart::tqfindTextNext( bool reverse ) +bool KHTMLPart::findTextNext( bool reverse ) { - if (!d->m_tqfind) + if (!d->m_find) { - // We didn't show the tqfind dialog yet, let's do it then (#49442) - tqfindText(); + // We didn't show the find dialog yet, let's do it then (#49442) + findText(); return false; } view()->updateFindAheadTimeout(); long options = 0; - if ( d->m_tqfindDialog ) // 0 when we close the dialog + if ( d->m_findDialog ) // 0 when we close the dialog { - if ( d->m_tqfind->pattern() != d->m_tqfindDialog->pattern() ) { - d->m_tqfind->setPattern( d->m_tqfindDialog->pattern() ); - d->m_tqfind->resetCounts(); + if ( d->m_find->pattern() != d->m_findDialog->pattern() ) { + d->m_find->setPattern( d->m_findDialog->pattern() ); + d->m_find->resetCounts(); } - options = d->m_tqfindDialog->options(); + options = d->m_findDialog->options(); if ( d->m_lastFindState.options != options ) { - d->m_tqfind->setOptions( options ); + d->m_find->setOptions( options ); if ( options & KFindDialog::SelectedText ) Q_ASSERT( hasSelection() ); @@ -3102,21 +3102,21 @@ bool KHTMLPart::tqfindTextNext( bool reverse ) options = d->m_lastFindState.options; if( reverse ) options = options ^ KFindDialog::FindBackwards; - if( d->m_tqfind->options() != options ) - d->m_tqfind->setOptions( options ); + if( d->m_find->options() != options ) + d->m_find->setOptions( options ); - // Changing tqfind direction. Start and end nodes must be switched. - // Additionally since d->m_tqfindNode points after the last node + // Changing find direction. Start and end nodes must be switched. + // Additionally since d->m_findNode points after the last node // that was searched, it needs to be "after" it in the opposite direction. if( d->m_lastFindState.last_dir != -1 && bool( d->m_lastFindState.last_dir ) != bool( options & KFindDialog::FindBackwards )) { - tqSwap( d->m_tqfindNodeEnd, d->m_tqfindNodeStart ); - tqSwap( d->m_tqfindPosEnd, d->m_tqfindPosStart ); - tqSwap( d->m_tqfindNode, d->m_tqfindNodePrevious ); - // d->m_tqfindNode now point at the end of the last searched line - advance one node - khtml::RenderObject* obj = d->m_tqfindNode ? d->m_tqfindNode->renderer() : 0; - khtml::RenderObject* end = d->m_tqfindNodeEnd ? d->m_tqfindNodeEnd->renderer() : 0; + qSwap( d->m_findNodeEnd, d->m_findNodeStart ); + qSwap( d->m_findPosEnd, d->m_findPosStart ); + qSwap( d->m_findNode, d->m_findNodePrevious ); + // d->m_findNode now point at the end of the last searched line - advance one node + khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0; + khtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0; if ( obj == end ) obj = 0L; else if ( obj ) @@ -3126,20 +3126,20 @@ bool KHTMLPart::tqfindTextNext( bool reverse ) } while ( obj && ( !obj->element() || obj->isInlineContinuation() ) ); } if ( obj ) - d->m_tqfindNode = obj->element(); + d->m_findNode = obj->element(); else - d->m_tqfindNode = 0; + d->m_findNode = 0; } d->m_lastFindState.last_dir = ( options & KFindDialog::FindBackwards ) ? 1 : 0; KFind::Result res = KFind::NoMatch; - khtml::RenderObject* obj = d->m_tqfindNode ? d->m_tqfindNode->renderer() : 0; - khtml::RenderObject* end = d->m_tqfindNodeEnd ? d->m_tqfindNodeEnd->renderer() : 0; + khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0; + khtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0; khtml::RenderTextArea *tmpTextArea=0L; //kdDebug(6050) << k_funcinfo << "obj=" << obj << " end=" << end << endl; while( res == KFind::NoMatch ) { - if ( d->m_tqfind->needData() ) + if ( d->m_find->needData() ) { if ( !obj ) { //kdDebug(6050) << k_funcinfo << "obj=0 -> done" << endl; @@ -3153,7 +3153,7 @@ bool KHTMLPart::tqfindTextNext( bool reverse ) d->m_stringPortions.clear(); bool newLine = false; TQString str; - DOM::NodeImpl* lastNode = d->m_tqfindNode; + DOM::NodeImpl* lastNode = d->m_findNode; while ( obj && !newLine ) { // Grab text from render object @@ -3164,7 +3164,7 @@ bool KHTMLPart::tqfindTextNext( bool reverse ) { khtml::RenderTextArea *parent= static_cast<khtml::RenderTextArea *>(obj->parent()); s = parent->text(); - s = s.tqreplace(0xa0, ' '); + s = s.replace(0xa0, ' '); tmpTextArea = parent; } else if ( renderLineText ) @@ -3172,7 +3172,7 @@ bool KHTMLPart::tqfindTextNext( bool reverse ) khtml::RenderLineEdit *parentLine= static_cast<khtml::RenderLineEdit *>(obj); if (parentLine->widget()->echoMode() == TQLineEdit::Normal) s = parentLine->widget()->text(); - s = s.tqreplace(0xa0, ' '); + s = s.replace(0xa0, ' '); } else if ( obj->isText() ) { @@ -3200,7 +3200,7 @@ bool KHTMLPart::tqfindTextNext( bool reverse ) if ( isLink && obj->parent()!=tmpTextArea ) { s = static_cast<khtml::RenderText *>(obj)->data().string(); - s = s.tqreplace(0xa0, ' '); + s = s.replace(0xa0, ' '); } } else if ( obj->isBR() ) @@ -3208,11 +3208,11 @@ bool KHTMLPart::tqfindTextNext( bool reverse ) else if ( !obj->isInline() && !str.isEmpty() ) s = '\n'; - if ( lastNode == d->m_tqfindNodeEnd ) - s.truncate( d->m_tqfindPosEnd ); + if ( lastNode == d->m_findNodeEnd ) + s.truncate( d->m_findPosEnd ); if ( !s.isEmpty() ) { - newLine = s.tqfind( '\n' ) != -1; // did we just get a newline? + newLine = s.find( '\n' ) != -1; // did we just get a newline? if( !( options & KFindDialog::FindBackwards )) { //kdDebug(6050) << "StringPortion: " << index << "-" << index+s.length()-1 << " -> " << lastNode << endl; @@ -3251,37 +3251,37 @@ bool KHTMLPart::tqfindTextNext( bool reverse ) //kdDebug()<<" str : "<<str<<endl; if ( !str.isEmpty() ) { - d->m_tqfind->setData( str, d->m_tqfindPos ); + d->m_find->setData( str, d->m_findPos ); } - d->m_tqfindPos = -1; // not used during the tqfindnext loops. Only during init. - d->m_tqfindNodePrevious = d->m_tqfindNode; - d->m_tqfindNode = lastNode; + d->m_findPos = -1; // not used during the findnext loops. Only during init. + d->m_findNodePrevious = d->m_findNode; + d->m_findNode = lastNode; } - if ( !d->m_tqfind->needData() ) // happens if str was empty + if ( !d->m_find->needData() ) // happens if str was empty { // Let KFind inspect the text fragment, and emit highlighted if a match is found - res = d->m_tqfind->tqfind(); + res = d->m_find->find(); } } // end while if ( res == KFind::NoMatch ) // i.e. we're done { kdDebug() << "No more matches." << endl; - if ( !(options & FindNoPopups) && d->m_tqfind->shouldRestart() ) + if ( !(options & FindNoPopups) && d->m_find->shouldRestart() ) { //kdDebug(6050) << "Restarting" << endl; initFindNode( false, options & KFindDialog::FindBackwards, false ); - d->m_tqfind->resetCounts(); - tqfindTextNext( reverse ); + d->m_find->resetCounts(); + findTextNext( reverse ); } else // really done { //kdDebug(6050) << "Finishing" << endl; - //delete d->m_tqfind; - //d->m_tqfind = 0L; + //delete d->m_find; + //d->m_find = 0L; initFindNode( false, options & KFindDialog::FindBackwards, false ); - d->m_tqfind->resetCounts(); + d->m_find->resetCounts(); slotClearSelection(); } kdDebug() << "Dialog closed." << endl; @@ -3422,12 +3422,12 @@ void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length ) } emitSelectionChanged(); - // make the tqfinddialog move away from the selected area - if ( d->m_tqfindDialog && !highlightedRect.isNull() ) + // make the finddialog move away from the selected area + if ( d->m_findDialog && !highlightedRect.isNull() ) { highlightedRect.moveBy( -d->m_view->contentsX(), -d->m_view->contentsY() ); //kdDebug(6050) << "avoiding " << highlightedRect << endl; - KDialog::avoidArea( d->m_tqfindDialog, highlightedRect ); + KDialog::avoidArea( d->m_findDialog, highlightedRect ); } } @@ -3731,8 +3731,8 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi return; } - if (url.tqfind( TQString::tqfromLatin1( "javascript:" ),0, false ) == 0 ) { - TQString jscode = KURL::decode_string( url.mid( url.tqfind( "javascript:", 0, false ) ) ); + if (url.find( TQString::fromLatin1( "javascript:" ),0, false ) == 0 ) { + TQString jscode = KURL::decode_string( url.mid( url.find( "javascript:", 0, false ) ) ); jscode = KStringHandler::rsqueeze( jscode, 80 ); // truncate if too long if (url.startsWith("javascript:window.open")) jscode += i18n(" (In new window)"); @@ -3796,7 +3796,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi else if ( ok && S_ISREG( buff.st_mode ) ) { if (buff.st_size < 1024) - text = i18n("%2 (%1 bytes)").arg((long) buff.st_size).arg(text2); // always put the URL last, in case it tqcontains '%' + text = i18n("%2 (%1 bytes)").arg((long) buff.st_size).arg(text2); // always put the URL last, in case it contains '%' else { float d = (float) buff.st_size/1024.0; @@ -3838,29 +3838,29 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi extra = i18n(" (In other frame)"); } - if (u.protocol() == TQString::tqfromLatin1("mailto")) { - TQString mailtoMsg /* = TQString::tqfromLatin1("<img src=%1>").arg(locate("icon", TQString::tqfromLatin1("locolor/16x16/actions/mail_send.png")))*/; + if (u.protocol() == TQString::fromLatin1("mailto")) { + TQString mailtoMsg /* = TQString::fromLatin1("<img src=%1>").arg(locate("icon", TQString::fromLatin1("locolor/16x16/actions/mail_send.png")))*/; mailtoMsg += i18n("Email to: ") + KURL::decode_string(u.path()); TQStringList queries = TQStringList::split('&', u.query().mid(1)); TQStringList::Iterator it = queries.begin(); const TQStringList::Iterator itEnd = queries.end(); for (; it != itEnd; ++it) - if ((*it).startsWith(TQString::tqfromLatin1("subject="))) + if ((*it).startsWith(TQString::fromLatin1("subject="))) mailtoMsg += i18n(" - Subject: ") + KURL::decode_string((*it).mid(8)); - else if ((*it).startsWith(TQString::tqfromLatin1("cc="))) + else if ((*it).startsWith(TQString::fromLatin1("cc="))) mailtoMsg += i18n(" - CC: ") + KURL::decode_string((*it).mid(3)); - else if ((*it).startsWith(TQString::tqfromLatin1("bcc="))) + else if ((*it).startsWith(TQString::fromLatin1("bcc="))) mailtoMsg += i18n(" - BCC: ") + KURL::decode_string((*it).mid(4)); mailtoMsg = TQStyleSheet::escape(mailtoMsg); - mailtoMsg.tqreplace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString::null); + mailtoMsg.replace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString::null); setStatusBarText("<qt>"+mailtoMsg, BarHoverText); return; } // Is this check necessary at all? (Frerich) #if 0 - else if (u.protocol() == TQString::tqfromLatin1("http")) { + else if (u.protocol() == TQString::fromLatin1("http")) { DOM::Node hrefNode = nodeUnderMouse().parentNode(); - while (hrefNode.nodeName().string() != TQString::tqfromLatin1("A") && !hrefNode.isNull()) + while (hrefNode.nodeName().string() != TQString::fromLatin1("A") && !hrefNode.isNull()) hrefNode = hrefNode.parentNode(); if (!hrefNode.isNull()) { @@ -3868,12 +3868,12 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi if (!hreflangNode.isNull()) { TQString countryCode = hreflangNode.nodeValue().string().lower(); // Map the language code to an appropriate country code. - if (countryCode == TQString::tqfromLatin1("en")) - countryCode = TQString::tqfromLatin1("gb"); - TQString flagImg = TQString::tqfromLatin1("<img src=%1>").arg( - locate("locale", TQString::tqfromLatin1("l10n/") + if (countryCode == TQString::fromLatin1("en")) + countryCode = TQString::fromLatin1("gb"); + TQString flagImg = TQString::fromLatin1("<img src=%1>").arg( + locate("locale", TQString::fromLatin1("l10n/") + countryCode - + TQString::tqfromLatin1("/flag.png"))); + + TQString::fromLatin1("/flag.png"))); emit setStatusBarText(flagImg + u.prettyURL() + extra); } } @@ -3906,7 +3906,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c if ( !target.isEmpty() ) hasTarget = true; - if ( url.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { crossFrameExecuteScript( target, KURL::decode_string( url.mid( 11 ) ) ); return false; @@ -3965,7 +3965,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c } } - if (!d->m_referrer.isEmpty() && !args.metaData().tqcontains("referrer")) + if (!d->m_referrer.isEmpty() && !args.metaData().contains("referrer")) args.metaData()["referrer"] = d->m_referrer; @@ -4027,7 +4027,7 @@ void KHTMLPart::slotViewDocumentSource() } } - (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile ); + (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile ); } void KHTMLPart::slotViewPageInfo() @@ -4108,7 +4108,7 @@ void KHTMLPart::slotViewFrameSource() } } - (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile ); + (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile ); } KURL KHTMLPart::backgroundURL() const @@ -4276,7 +4276,7 @@ void KHTMLPart::updateActions() { TQObject *ext = KParts::BrowserExtension::childObject( frame ); if ( ext ) - enablePrintFrame = ext->tqmetaObject()->slotNames().tqcontains( "print()" ); + enablePrintFrame = ext->metaObject()->slotNames().contains( "print()" ); } d->m_paPrintFrame->setEnabled( enablePrintFrame ); @@ -4305,7 +4305,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con const TQStringList ¶ms, bool isIFrame ) { //kdDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )" << endl; - FrameIt it = d->m_frames.tqfind( frameName ); + FrameIt it = d->m_frames.find( frameName ); if ( it == d->m_frames.end() ) { khtml::ChildFrame * child = new khtml::ChildFrame; @@ -4319,12 +4319,12 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con (*it)->m_params = params; // Support for <frame src="javascript:string"> - if ( url.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { if ( processObjectRequest(*it, KURL("about:blank"), TQString("text/html") ) ) { KHTMLPart* p = static_cast<KHTMLPart*>(static_cast<KParts::ReadOnlyPart *>((*it)->m_part)); - // See if we want to tqreplace content with javascript: output.. + // See if we want to replace content with javascript: output.. TQVariant res = p->executeScript( DOM::Node(), KURL::decode_string( url.right( url.length() - 11) ) ); if ( res.type() == TQVariant::String ) { p->begin(); @@ -4341,7 +4341,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con TQString KHTMLPart::requestFrameName() { - return TQString::tqfromLatin1("<!--frame %1-->").arg(d->m_frameNameId++); + return TQString::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++); } bool KHTMLPart::requestObject( khtml::RenderPart *frame, const TQString &url, const TQString &serviceType, @@ -4393,7 +4393,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const child->m_args = args; child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload); child->m_serviceName = TQString::null; - if (!d->m_referrer.isEmpty() && !child->m_args.metaData().tqcontains( "referrer" )) + if (!d->m_referrer.isEmpty() && !child->m_args.metaData().contains( "referrer" )) child->m_args.metaData()["referrer"] = d->m_referrer; child->m_args.metaData().insert("PropagateHttpHeader", "true"); @@ -4408,7 +4408,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const // We want a KHTMLPart if the HTML says <frame src=""> or <frame src="about:blank"> if ((url.isEmpty() || url.url() == "about:blank") && args.serviceType.isEmpty()) - args.serviceType = TQString::tqfromLatin1( "text/html" ); + args.serviceType = TQString::fromLatin1( "text/html" ); if ( args.serviceType.isEmpty() ) { kdDebug(6050) << "Running new KHTMLRun for " << this << " and child=" << child << endl; @@ -4596,10 +4596,10 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload); - // make sure the part has a way to tqfind out about the mimetype. + // make sure the part has a way to find out about the mimetype. // we actually set it in child->m_args in requestObject already, // but it's useless if we had to use a KHTMLRun instance, as the - // point the run object is to tqfind out exactly the mimetype. + // point the run object is to find out exactly the mimetype. child->m_args.serviceType = mimetype; // if not a frame set child as completed @@ -4643,19 +4643,19 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url } } -KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const char *widgetName, +KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms ) { TQString constr; if ( !serviceName.isEmpty() ) - constr.append( TQString::tqfromLatin1( "Name == '%1'" ).arg( serviceName ) ); + constr.append( TQString::fromLatin1( "Name == '%1'" ).arg( serviceName ) ); KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString::null ); if ( offers.isEmpty() ) { - int pos = mimetype.tqfind( "-plugin" ); + int pos = mimetype.find( "-plugin" ); if (pos < 0) return 0L; TQString stripped_mime = mimetype.left( pos ); @@ -4675,13 +4675,13 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const cha KParts::ReadOnlyPart *res = 0L; const char *className = "KParts::ReadOnlyPart"; - if ( service->serviceTypes().tqcontains( "Browser/View" ) ) + if ( service->serviceTypes().contains( "Browser/View" ) ) className = "Browser/View"; if ( factory->inherits( "KParts::Factory" ) ) - res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( tqparentWidget, widgetName, parent, name, className, params )); + res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params )); else - res = static_cast<KParts::ReadOnlyPart *>(factory->create( tqparentWidget, widgetName, className )); + res = static_cast<KParts::ReadOnlyPart *>(factory->create( parentWidget, widgetName, className )); if ( res ) { serviceTypes = service->serviceTypes(); @@ -4701,7 +4701,7 @@ KParts::PartManager *KHTMLPart::partManager() { if ( !d->m_manager && d->m_view ) { - d->m_manager = new KParts::PartManager( d->m_view->tqtopLevelWidget(), this, "khtml part manager" ); + d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "khtml part manager" ); d->m_manager->setAllowNestedParts( true ); connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); @@ -4777,7 +4777,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt "WarnOnUnencryptedForm"); // Move this setting into KSSL instead KConfig *config = kapp->config(); - TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); KConfigGroupSaver saver( config, grpNotifMsgs ); if (!config->readBoolEntry("WarnOnUnencryptedForm", true)) { @@ -4811,7 +4811,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt TQString urlstring = u.url(); - if ( urlstring.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { + if ( urlstring.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { urlstring = KURL::decode_string(urlstring); crossFrameExecuteScript( _target, urlstring.right( urlstring.length() - 11) ); return; @@ -4873,18 +4873,18 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt TQString bodyEnc; if (contentType.lower() == "multipart/form-data") { // FIXME: is this correct? I suspect not - bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(), + bodyEnc = KURL::encode_string(TQString::fromLatin1(formData.data(), formData.size())); } else if (contentType.lower() == "text/plain") { // Convention seems to be to decode, and s/&/\n/ - TQString tmpbody = TQString::tqfromLatin1(formData.data(), + TQString tmpbody = TQString::fromLatin1(formData.data(), formData.size()); - tmpbody.tqreplace(TQRegExp("[&]"), "\n"); - tmpbody.tqreplace(TQRegExp("[+]"), " "); + tmpbody.replace(TQRegExp("[&]"), "\n"); + tmpbody.replace(TQRegExp("[+]"), " "); tmpbody = KURL::decode_string(tmpbody); // Decode the rest of it bodyEnc = KURL::encode_string(tmpbody); // Recode for the URL } else { - bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(), + bodyEnc = KURL::encode_string(TQString::fromLatin1(formData.data(), formData.size())); } @@ -4895,7 +4895,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt if ( strcmp( action, "get" ) == 0 ) { if (u.protocol() != "mailto") - u.setQuery( TQString::tqfromLatin1( formData.data(), formData.size() ) ); + u.setQuery( TQString::fromLatin1( formData.data(), formData.size() ) ); args.setDoPost( false ); } else { @@ -4975,7 +4975,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl ) KHTMLPopupGUIClient* client = new KHTMLPopupGUIClient( this, d->m_popupMenuXML, linkKURL ); TQGuardedPtr<TQObject> guard( client ); - TQString mimetype = TQString::tqfromLatin1( "text/html" ); + TQString mimetype = TQString::fromLatin1( "text/html" ); args.metaData()["referrer"] = referrer; if (!linkUrl.isEmpty()) // over a link @@ -4989,7 +4989,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl ) const TQString fname(popupURL.fileName(false)); if (!fname.isEmpty() && !popupURL.hasRef() && popupURL.query().isEmpty()) { - KMimeType::Ptr pmt = KMimeType::tqfindByPath(fname,0,true); + KMimeType::Ptr pmt = KMimeType::findByPath(fname,0,true); // Further check for mime types guessed from the extension which, // on a web page, are more likely to be a script delivering content @@ -5095,7 +5095,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg // TODO: handle child target correctly! currently the script are always executed fur the parent TQString urlStr = url.url(); - if ( urlStr.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { + if ( urlStr.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { TQString script = KURL::decode_string( urlStr.right( urlStr.length() - 11 ) ); executeScript( DOM::Node(), script ); return; @@ -5103,17 +5103,17 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg TQString frameName = args.frameName.lower(); if ( !frameName.isEmpty() ) { - if ( frameName == TQString::tqfromLatin1( "_top" ) ) + if ( frameName == TQString::fromLatin1( "_top" ) ) { emit d->m_extension->openURLRequest( url, args ); return; } - else if ( frameName == TQString::tqfromLatin1( "_blank" ) ) + else if ( frameName == TQString::fromLatin1( "_blank" ) ) { emit d->m_extension->createNewWindow( url, args ); return; } - else if ( frameName == TQString::tqfromLatin1( "_parent" ) ) + else if ( frameName == TQString::fromLatin1( "_parent" ) ) { KParts::URLArgs newArgs( args ); newArgs.frameName = TQString::null; @@ -5121,7 +5121,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg emit d->m_extension->openURLRequest( url, newArgs ); return; } - else if ( frameName != TQString::tqfromLatin1( "_self" ) ) + else if ( frameName != TQString::fromLatin1( "_self" ) ) { khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args ); @@ -5139,7 +5139,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg // Inform someone that we are about to show something else. child->m_bNotify = true; requestObject( child, url, args ); - } else if ( frameName== "_self" ) // this is for embedded objects (via <object>) which want to tqreplace the current document + } else if ( frameName== "_self" ) // this is for embedded objects (via <object>) which want to replace the current document { KParts::URLArgs newArgs( args ); newArgs.frameName = TQString::null; @@ -5209,10 +5209,10 @@ bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart) } KHTMLPart * -KHTMLPart::tqfindFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame ) +KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame ) { #ifdef DEBUG_FINDFRAME - kdDebug(6050) << "KHTMLPart::tqfindFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " tqfindFrameParent( " << f << " )" << endl; + kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl; #endif // Check access KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart); @@ -5224,12 +5224,12 @@ KHTMLPart::tqfindFrameParent( KParts::ReadOnlyPart *callingPart, const TQString if (!childFrame && !parentPart() && (TQString::fromLocal8Bit(name()) == f)) return this; - FrameIt it = d->m_frames.tqfind( f ); + FrameIt it = d->m_frames.find( f ); const FrameIt end = d->m_frames.end(); if ( it != end ) { #ifdef DEBUG_FINDFRAME - kdDebug(6050) << "KHTMLPart::tqfindFrameParent: FOUND!" << endl; + kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl; #endif if (childFrame) *childFrame = *it; @@ -5242,7 +5242,7 @@ KHTMLPart::tqfindFrameParent( KParts::ReadOnlyPart *callingPart, const TQString KParts::ReadOnlyPart* const p = (*it)->m_part; if ( p && p->inherits( "KHTMLPart" )) { - KHTMLPart* const frameParent = static_cast<KHTMLPart*>(p)->tqfindFrameParent(callingPart, f, childFrame); + KHTMLPart* const frameParent = static_cast<KHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame); if (frameParent) return frameParent; } @@ -5251,10 +5251,10 @@ KHTMLPart::tqfindFrameParent( KParts::ReadOnlyPart *callingPart, const TQString } -KHTMLPart *KHTMLPart::tqfindFrame( const TQString &f ) +KHTMLPart *KHTMLPart::findFrame( const TQString &f ) { khtml::ChildFrame *childFrame; - KHTMLPart *parentFrame = tqfindFrameParent(this, f, &childFrame); + KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame); if (parentFrame) { KParts::ReadOnlyPart *p = childFrame->m_part; @@ -5264,10 +5264,10 @@ KHTMLPart *KHTMLPart::tqfindFrame( const TQString &f ) return 0; } -KParts::ReadOnlyPart *KHTMLPart::tqfindFramePart(const TQString &f) +KParts::ReadOnlyPart *KHTMLPart::findFramePart(const TQString &f) { khtml::ChildFrame *childFrame; - return tqfindFrameParent(this, f, &childFrame) ? static_cast<KParts::ReadOnlyPart *>(childFrame->m_part) : 0L; + return findFrameParent(this, f, &childFrame) ? static_cast<KParts::ReadOnlyPart *>(childFrame->m_part) : 0L; } KParts::ReadOnlyPart *KHTMLPart::currentFrame() const @@ -5287,12 +5287,12 @@ KParts::ReadOnlyPart *KHTMLPart::currentFrame() const bool KHTMLPart::frameExists( const TQString &frameName ) { - ConstFrameIt it = d->m_frames.tqfind( frameName ); + ConstFrameIt it = d->m_frames.find( frameName ); if ( it == d->m_frames.end() ) return false; // WABA: We only return true if the child actually has a frame - // set. Otherwise we might tqfind our preloaded-selve. + // set. Otherwise we might find our preloaded-selve. // This happens when we restore the frameset. return (!(*it)->m_frame.isNull()); } @@ -5327,7 +5327,7 @@ khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl; #endif khtml::ChildFrame *childFrame; - KHTMLPart *childPart = tqfindFrameParent(callingHtmlPart, args.frameName, &childFrame); + KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame); if (childPart) { if (childPart == this) @@ -5360,8 +5360,8 @@ void KHTMLPart::saveState( TQDataStream &stream ) kdDebug( 6050 ) << indent << "saveState this=" << this << " '" << name() << "' saving URL " << m_url.url() << endl; #endif - stream << m_url << (TQ_INT32)d->m_view->contentsX() << (TQ_INT32)d->m_view->contentsY() - << (TQ_INT32) d->m_view->contentsWidth() << (TQ_INT32) d->m_view->contentsHeight() << (TQ_INT32) d->m_view->marginWidth() << (TQ_INT32) d->m_view->marginHeight(); + stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY() + << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight(); // save link cursor position int focusNodeNumber; @@ -5431,7 +5431,7 @@ void KHTMLPart::saveState( TQDataStream &stream ) } // Save frame data - stream << (TQ_UINT32) frameNameLst.count(); + stream << (Q_UINT32) frameNameLst.count(); stream << frameNameLst << frameServiceTypeLst << frameServiceNameLst << frameURLLst << frameStateBufferLst; #ifndef NDEBUG s_saveStateIndentLevel = indentLevel; @@ -5441,8 +5441,8 @@ void KHTMLPart::saveState( TQDataStream &stream ) void KHTMLPart::restoreState( TQDataStream &stream ) { KURL u; - TQ_INT32 xOffset, yOffset, wContents, hContents, mWidth, mHeight; - TQ_UINT32 frameCount; + Q_INT32 xOffset, yOffset, wContents, hContents, mWidth, mHeight; + Q_UINT32 frameCount; TQStringList frameNames, frameServiceTypes, docState, frameServiceNames; KURL::List frameURLs; TQValueList<TQByteArray> frameStateBuffers; @@ -5649,8 +5649,8 @@ DOM::Node KHTMLPart::nonSharedNodeUnderMouse() const void KHTMLPart::emitSelectionChanged() { emit d->m_extension->enableAction( "copy", hasSelection() ); - if ( d->m_tqfindDialog ) - d->m_tqfindDialog->setHasSelection( hasSelection() ); + if ( d->m_findDialog ) + d->m_findDialog->setHasSelection( hasSelection() ); emit d->m_extension->selectionInfo( selectedText() ); emit selectionChanged(); @@ -5696,7 +5696,7 @@ void KHTMLPart::zoomIn(const int stepping[], int count) int zoomFactor = d->m_zoomFactor; if (zoomFactor < maxZoom) { - // tqfind the entry nearest to the given zoomsizes + // find the entry nearest to the given zoomsizes for (int i = 0; i < count; ++i) if (stepping[i] > zoomFactor) { zoomFactor = stepping[i]; @@ -5710,7 +5710,7 @@ void KHTMLPart::zoomOut(const int stepping[], int count) { int zoomFactor = d->m_zoomFactor; if (zoomFactor > minZoom) { - // tqfind the entry nearest to the given zoomsizes + // find the entry nearest to the given zoomsizes for (int i = count-1; i >= 0; --i) if (stepping[i] < zoomFactor) { zoomFactor = stepping[i]; @@ -5912,7 +5912,7 @@ TQPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ) { kdDebug( 6050 ) << this << "KHTMLPart::openURLInFrame " << url << endl; - FrameIt it = d->m_frames.tqfind( urlArgs.frameName ); + FrameIt it = d->m_frames.find( urlArgs.frameName ); if ( it == d->m_frames.end() ) return false; @@ -6192,7 +6192,7 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se if (obj->isText() && selectLines) { int pos; khtml::RenderText *renderer = static_cast<khtml::RenderText *>(obj); - khtml::InlineTextBox *run = renderer->tqfindInlineTextBox( offset, pos ); + khtml::InlineTextBox *run = renderer->findInlineTextBox( offset, pos ); DOMString t = node->nodeValue(); DOM::NodeImpl* selNode = 0; long selOfs = 0; @@ -6609,7 +6609,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event ) // get selected text and paste to the clipboard #ifndef QT_NO_CLIPBOARD TQString text = selectedText(); - text.tqreplace(TQChar(0xa0), ' '); + text.replace(TQChar(0xa0), ' '); disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); kapp->clipboard()->setText(text,QClipboard::Selection); connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); @@ -6658,9 +6658,9 @@ void KHTMLPart::slotPrintFrame() if ( !ext ) return; - TQMetaObject *mo = ext->tqmetaObject(); + TQMetaObject *mo = ext->metaObject(); - int idx = mo->tqfindSlot( "print()", true ); + int idx = mo->findSlot( "print()", true ); if ( idx >= 0 ) { QUObject o[ 1 ]; ext->qt_invoke( idx, o ); @@ -6753,7 +6753,7 @@ void KHTMLPart::selectAll() NodeImpl *next; // Look for first text/cdata node that has a renderer, - // or first childless tqreplaced element + // or first childless replaced element while ( first && !(first->renderer() && ((first->nodeType() == Node::TEXT_NODE || first->nodeType() == Node::CDATA_SECTION_NODE) || (first->renderer()->isReplaced() && !first->renderer()->firstChild())))) @@ -6775,8 +6775,8 @@ void KHTMLPart::selectAll() else last = d->m_doc; // Look for last text/cdata node that has a renderer, - // or last childless tqreplaced element - // ### Instead of changing this loop, use tqfindLastSelectableNode + // or last childless replaced element + // ### Instead of changing this loop, use findLastSelectableNode // in render_table.cpp (LS) while ( last && !(last->renderer() && ((last->nodeType() == Node::TEXT_NODE || last->nodeType() == Node::CDATA_SECTION_NODE) @@ -6854,7 +6854,7 @@ void KHTMLPart::slotPartRemoved( KParts::Part *part ) if (factory()) { factory()->removeClient( part ); } - if (childClients()->tqcontainsRef(part)) { + if (childClients()->containsRef(part)) { removeChildClient( part ); } } @@ -6877,7 +6877,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) if (frame->frameStyle() != TQFrame::NoFrame) { frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken); - frame->tqrepaint(); + frame->repaint(); } } @@ -6905,7 +6905,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) if (frame->frameStyle() != TQFrame::NoFrame) { frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain); - frame->tqrepaint(); + frame->repaint(); } kdDebug(6050) << "new active frame " << d->m_activeFrame << endl; } @@ -6999,7 +6999,7 @@ bool KHTMLPart::pluginPageQuestionAsked(const TQString& mimetype) const if ( parent ) return parent->pluginPageQuestionAsked(mimetype); - return d->m_pluginPageQuestionAsked.tqcontains(mimetype); + return d->m_pluginPageQuestionAsked.contains(mimetype); } void KHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype) @@ -7157,7 +7157,7 @@ void KHTMLPart::openWallet(DOM::HTMLFormElementImpl *form) } if (!d->m_wq) { - KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); + KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); d->m_wq = new KHTMLWalletQueue(this); d->m_wq->wallet = wallet; connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); @@ -7199,7 +7199,7 @@ void KHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString> } if (!d->m_wq) { - KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); + KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); d->m_wq = new KHTMLWalletQueue(this); d->m_wq->wallet = wallet; connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); @@ -7249,7 +7249,7 @@ void KHTMLPart::walletOpened(KWallet::Wallet *wallet) { if (!d->m_statusBarWalletLabel) { d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - d->m_statusBarWalletLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + d->m_statusBarWalletLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarWalletLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false); d->m_statusBarWalletLabel->setPixmap(SmallIcon("wallet_open", instance())); @@ -7379,14 +7379,14 @@ void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart if ( enable && originPart ) { d->m_openableSuppressedPopups++; - if ( d->m_suppressedPopupOriginParts.tqfindIndex( originPart ) == -1 ) + if ( d->m_suppressedPopupOriginParts.findIndex( originPart ) == -1 ) d->m_suppressedPopupOriginParts.append( originPart ); } if ( enable && !d->m_statusBarPopupLabel ) { d->m_statusBarPopupLabel = new KURLLabel( d->m_statusBarExtension->statusBar() ); d->m_statusBarPopupLabel->setFixedHeight( instance()->iconLoader()->currentSize( KIcon::Small) ); - d->m_statusBarPopupLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + d->m_statusBarPopupLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarPopupLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarPopupLabel, 0, false ); d->m_statusBarPopupLabel->setPixmap( SmallIcon( "window_suppressed", instance() ) ); diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h index e3c7b53f6..af8a1695d 100644 --- a/khtml/khtml_part.h +++ b/khtml/khtml_part.h @@ -243,10 +243,10 @@ public: * rendered in. You can specify two different parent objects for a * KHTMLPart, one parent for the KHTMLPart document and on parent * for the KHTMLView. If the second @p parent argument is 0L, then - * @p tqparentWidget is used as parent for both objects, the part and + * @p parentWidget is used as parent for both objects, the part and * the view. */ - KHTMLPart( TQWidget *tqparentWidget = 0, const char *widgetname = 0, + KHTMLPart( TQWidget *parentWidget = 0, const char *widgetname = 0, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); KHTMLPart( KHTMLView *view, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); @@ -629,7 +629,7 @@ public: * default style sheet. * * This gives a wide range of possibilities to - * change the tqlayout of the page. + * change the layout of the page. * * To have an effect this function has to be called after calling begin(). */ @@ -640,7 +640,7 @@ public: * default style sheet. * * This gives a wide range of possibilities to - * change the tqlayout of the page. + * change the layout of the page. * * To have an effect this function has to be called after calling begin(). */ @@ -697,7 +697,7 @@ public: TQCursor urlCursor() const; /** - * Extra Find options that can be used when calling the extended tqfindText(). + * Extra Find options that can be used when calling the extended findText(). * @since 3.3 */ enum FindOptions @@ -712,46 +712,46 @@ public: * search for. * @since 3.3 */ - void tqfindText(); + void findText(); /** * Starts a new search, but bypasses the user dialog. * @param str The string to search for. * @param options Find options. * @param parent Parent used for centering popups like "string not found". - * @param tqfindDialog Optionally, you can supply your own dialog. + * @param findDialog Optionally, you can supply your own dialog. * @since 3.3 */ - void tqfindText( const TQString &str, long options, TQWidget *parent = 0, - KFindDialog *tqfindDialog = 0 ); + void findText( const TQString &str, long options, TQWidget *parent = 0, + KFindDialog *findDialog = 0 ); /** * Initiates a text search. */ - void tqfindTextBegin(); + void findTextBegin(); /** * Finds the next occurrence of the string or expression. * If isRegExp is true then str is converted to a TQRegExp, and caseSensitive is ignored. - * @deprecated, use tqfindText( str, options, parent, tqfindDialog ) + * @deprecated, use findText( str, options, parent, findDialog ) */ - bool tqfindTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp ); + bool findTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp ); /** - * Finds the next occurence of a string set by @ref tqfindText() + * Finds the next occurence of a string set by @ref findText() * @return true if a new match was found. * @since 3.3 */ - bool tqfindTextNext(); + bool findTextNext(); /** - * Finds the next occurence of a string set by @ref tqfindText() - * @param reverse if true, revert seach direction (only if no tqfind dialog is used) + * Finds the next occurence of a string set by @ref findText() + * @param reverse if true, revert seach direction (only if no find dialog is used) * @return true if a new match was found. * @since 3.5 */ // KDE4 merge with default = false - bool tqfindTextNext( bool reverse ); + bool findTextNext( bool reverse ); /** * Sets the Zoom factor. The value is given in percent, larger values mean a @@ -906,17 +906,17 @@ public: /** * Finds a frame by name. Returns 0L if frame can't be found. */ - KHTMLPart *tqfindFrame( const TQString &f ); + KHTMLPart *findFrame( const TQString &f ); /** - * Recursively tqfinds the part containing the frame with name @p f + * Recursively finds the part containing the frame with name @p f * and checks if it is accessible by @p callingPart * Returns 0L if no suitable frame can't be found. * Returns parent part if a suitable frame was found and * frame info in @p *childFrame * @since 3.3 */ - KHTMLPart *tqfindFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame=0 ); + KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, khtml::ChildFrame **childFrame=0 ); /** * Return the current frame (the one that has focus) @@ -927,7 +927,7 @@ public: /** * Returns whether a frame with the specified name is exists or not. - * In contrary to the tqfindFrame method this one also returns true + * In contrary to the findFrame method this one also returns true * if the frame is defined but no displaying component has been * found/loaded, yet. */ @@ -941,7 +941,7 @@ public: /** * Finds a frame by name. Returns 0L if frame can't be found. */ - KParts::ReadOnlyPart *tqfindFramePart( const TQString &f ); + KParts::ReadOnlyPart *findFramePart( const TQString &f ); /** * Called by KJS. * Sets the StatusBarText assigned @@ -952,7 +952,7 @@ public: /** * Called by KJS. * Sets the DefaultStatusBarText assigned - * via window.defaulttqStatus + * via window.defaultStatus */ void setJSDefaultStatusBarText( const TQString &text ); @@ -966,7 +966,7 @@ public: /** * Called by KJS. * Returns the DefaultStatusBarText assigned - * via window.defaulttqStatus + * via window.defaultStatus */ TQString jsDefaultStatusBarText() const; @@ -1028,7 +1028,7 @@ public: KURL toplevelURL(); /** - * Checks whether the page tqcontains unsubmitted form changes. + * Checks whether the page contains unsubmitted form changes. * * @return true if form changes exist * @since 3.3 @@ -1168,7 +1168,7 @@ protected: * to be a object of your derived type, in which case you should return a new instance for * the mimetype 'text/html' . */ - virtual KParts::ReadOnlyPart *createPart( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms); diff --git a/khtml/khtml_printsettings.cpp b/khtml/khtml_printsettings.cpp index e41d6f2f8..1b3e9c245 100644 --- a/khtml/khtml_printsettings.cpp +++ b/khtml/khtml_printsettings.cpp @@ -44,7 +44,7 @@ KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name) "<p><strong>'Print header'</strong></p>" "<p>" "If this checkbox is enabled, the printout of the HTML document will " - "contain a header line at the top of each page. This header tqcontains " + "contain a header line at the top of each page. This header contains " "the current date, the location URL of the printed page and the page " "number." "</p>" diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp index c07b44b79..90770d38f 100644 --- a/khtml/khtml_run.cpp +++ b/khtml/khtml_run.cpp @@ -30,7 +30,7 @@ KHTMLRun::KHTMLRun( KHTMLPart *part, khtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args, bool hideErrorDialog ) - : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->tqtopLevelWidget() : 0, + : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0, false, false, hideErrorDialog ), m_child( child ) { diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 5401bc300..8e1c0f934 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -40,7 +40,7 @@ struct KPerDomainSettings { bool m_bEnablePlugins : 1; // don't forget to maintain the bitfields as the enums grow KHTMLSettings::KJSWindowOpenPolicy m_windowOpenPolicy : 2; - KHTMLSettings::KJSWindowtqStatusPolicy m_windowtqStatusPolicy : 1; + KHTMLSettings::KJSWindowStatusPolicy m_windowStatusPolicy : 1; KHTMLSettings::KJSWindowFocusPolicy m_windowFocusPolicy : 1; KHTMLSettings::KJSWindowMovePolicy m_windowMovePolicy : 1; KHTMLSettings::KJSWindowResizePolicy m_windowResizePolicy : 1; @@ -52,7 +52,7 @@ struct KPerDomainSettings { kdDebug() << " m_bEnableJavaScript: " << m_bEnableJavaScript << endl; kdDebug() << " m_bEnablePlugins: " << m_bEnablePlugins << endl; kdDebug() << " m_windowOpenPolicy: " << m_windowOpenPolicy << endl; - kdDebug() << " m_windowtqStatusPolicy: " << m_windowtqStatusPolicy << endl; + kdDebug() << " m_windowStatusPolicy: " << m_windowStatusPolicy << endl; kdDebug() << " m_windowFocusPolicy: " << m_windowFocusPolicy << endl; kdDebug() << " m_windowMovePolicy: " << m_windowMovePolicy << endl; kdDebug() << " m_windowResizePolicy: " << m_windowResizePolicy << endl; @@ -121,7 +121,7 @@ static KPerDomainSettings &setup_per_domain_policy( kdWarning() << "setup_per_domain_policy: domain is empty" << endl; } const TQString ldomain = domain.lower(); - PolicyMap::iterator it = d->domainPolicy.tqfind(ldomain); + PolicyMap::iterator it = d->domainPolicy.find(ldomain); if (it == d->domainPolicy.end()) { // simply copy global domain settings (they should have been initialized // by this time) @@ -138,9 +138,9 @@ KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str if (!_str) ret = KJavaScriptDunno; - if (_str.lower() == TQString::tqfromLatin1("accept")) + if (_str.lower() == TQString::fromLatin1("accept")) ret = KJavaScriptAccept; - else if (_str.lower() == TQString::tqfromLatin1("reject")) + else if (_str.lower() == TQString::fromLatin1("reject")) ret = KJavaScriptReject; return ret; @@ -161,7 +161,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice) { TQString tmp(configStr); - int splitIndex = tmp.tqfind(':'); + int splitIndex = tmp.find(':'); if ( splitIndex == -1) { domain = configStr.lower(); @@ -172,7 +172,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai { domain = tmp.left(splitIndex).lower(); TQString adviceString = tmp.mid( splitIndex+1, tmp.length() ); - int splitIndex2 = adviceString.tqfind( ':' ); + int splitIndex2 = adviceString.find( ':' ); if( splitIndex2 == -1 ) { // Java advice only javaAdvice = strToAdvice( adviceString ); @@ -189,63 +189,63 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai void KHTMLSettings::readDomainSettings(KConfig *config, bool reset, bool global, KPerDomainSettings &pd_settings) { TQString jsPrefix = global ? TQString::null - : TQString::tqfromLatin1("javascript."); + : TQString::fromLatin1("javascript."); TQString javaPrefix = global ? TQString::null - : TQString::tqfromLatin1("java."); + : TQString::fromLatin1("java."); TQString pluginsPrefix = global ? TQString::null - : TQString::tqfromLatin1("plugins."); + : TQString::fromLatin1("plugins."); // The setting for Java - TQString key = javaPrefix + TQString::tqfromLatin1("EnableJava"); + TQString key = javaPrefix + TQString::fromLatin1("EnableJava"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_bEnableJava = config->readBoolEntry( key, false ); else if ( !global ) pd_settings.m_bEnableJava = d->global.m_bEnableJava; // The setting for Plugins - key = pluginsPrefix + TQString::tqfromLatin1("EnablePlugins"); + key = pluginsPrefix + TQString::fromLatin1("EnablePlugins"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_bEnablePlugins = config->readBoolEntry( key, true ); else if ( !global ) pd_settings.m_bEnablePlugins = d->global.m_bEnablePlugins; // The setting for JavaScript - key = jsPrefix + TQString::tqfromLatin1("EnableJavaScript"); + key = jsPrefix + TQString::fromLatin1("EnableJavaScript"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_bEnableJavaScript = config->readBoolEntry( key, true ); else if ( !global ) pd_settings.m_bEnableJavaScript = d->global.m_bEnableJavaScript; // window property policies - key = jsPrefix + TQString::tqfromLatin1("WindowOpenPolicy"); + key = jsPrefix + TQString::fromLatin1("WindowOpenPolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowOpenPolicy = (KJSWindowOpenPolicy) config->readUnsignedNumEntry( key, KJSWindowOpenSmart ); else if ( !global ) pd_settings.m_windowOpenPolicy = d->global.m_windowOpenPolicy; - key = jsPrefix + TQString::tqfromLatin1("WindowMovePolicy"); + key = jsPrefix + TQString::fromLatin1("WindowMovePolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowMovePolicy = (KJSWindowMovePolicy) config->readUnsignedNumEntry( key, KJSWindowMoveAllow ); else if ( !global ) pd_settings.m_windowMovePolicy = d->global.m_windowMovePolicy; - key = jsPrefix + TQString::tqfromLatin1("WindowResizePolicy"); + key = jsPrefix + TQString::fromLatin1("WindowResizePolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowResizePolicy = (KJSWindowResizePolicy) config->readUnsignedNumEntry( key, KJSWindowResizeAllow ); else if ( !global ) pd_settings.m_windowResizePolicy = d->global.m_windowResizePolicy; - key = jsPrefix + TQString::tqfromLatin1("WindowtqStatusPolicy"); + key = jsPrefix + TQString::fromLatin1("WindowStatusPolicy"); if ( (global && reset) || config->hasKey( key ) ) - pd_settings.m_windowtqStatusPolicy = (KJSWindowtqStatusPolicy) - config->readUnsignedNumEntry( key, KJSWindowtqStatusAllow ); + pd_settings.m_windowStatusPolicy = (KJSWindowStatusPolicy) + config->readUnsignedNumEntry( key, KJSWindowStatusAllow ); else if ( !global ) - pd_settings.m_windowtqStatusPolicy = d->global.m_windowtqStatusPolicy; + pd_settings.m_windowStatusPolicy = d->global.m_windowStatusPolicy; - key = jsPrefix + TQString::tqfromLatin1("WindowFocusPolicy"); + key = jsPrefix + TQString::fromLatin1("WindowFocusPolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowFocusPolicy = (KJSWindowFocusPolicy) config->readUnsignedNumEntry( key, KJSWindowFocusAllow ); @@ -508,7 +508,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) const TQStringList::ConstIterator itEnd = dl.end(); for (; it != itEnd; ++it) { const TQString domain = (*it).lower(); - TQMap<TQString,int>::Iterator pos = domainList.tqfind(domain); + TQMap<TQString,int>::Iterator pos = domainList.find(domain); if (pos == notfound) domainList.insert(domain,0); }/*next it*/ } @@ -611,7 +611,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) { TQCString javaPolicy = adviceToStr( it.data() ); TQCString javaScriptPolicy = adviceToStr( KJavaScriptDunno ); - domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); + domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); } config->writeEntry( "JavaDomainSettings", domainConfig ); } @@ -624,7 +624,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) { TQCString javaPolicy = adviceToStr( KJavaScriptDunno ); TQCString javaScriptPolicy = adviceToStr( it.data() ); - domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); + domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); } config->writeEntry( "ECMADomainSettings", domainConfig ); } @@ -656,7 +656,7 @@ static const KPerDomainSettings &lookup_hostname_policy( const PolicyMap::const_iterator notfound = d->domainPolicy.end(); // First check whether there is a perfect match. - PolicyMap::const_iterator it = d->domainPolicy.tqfind(hostname); + PolicyMap::const_iterator it = d->domainPolicy.find(hostname); if( it != notfound ) { #ifdef DEBUG_SETTINGS kdDebug() << "perfect match" << endl; @@ -670,9 +670,9 @@ static const KPerDomainSettings &lookup_hostname_policy( // there's no dots left. TQString host_part = hostname; int dot_idx = -1; - while( (dot_idx = host_part.tqfind(TQChar('.'))) >= 0 ) { + while( (dot_idx = host_part.find(TQChar('.'))) >= 0 ) { host_part.remove(0,dot_idx); - it = d->domainPolicy.tqfind(host_part); + it = d->domainPolicy.find(host_part); Q_ASSERT(notfound == d->domainPolicy.end()); if( it != notfound ) { #ifdef DEBUG_SETTINGS @@ -822,9 +822,9 @@ KHTMLSettings::KJSWindowResizePolicy KHTMLSettings::windowResizePolicy( return lookup_hostname_policy(d,hostname.lower()).m_windowResizePolicy; } -KHTMLSettings::KJSWindowtqStatusPolicy KHTMLSettings::windowtqStatusPolicy( +KHTMLSettings::KJSWindowStatusPolicy KHTMLSettings::windowStatusPolicy( const TQString& hostname) const { - return lookup_hostname_policy(d,hostname.lower()).m_windowtqStatusPolicy; + return lookup_hostname_policy(d,hostname.lower()).m_windowStatusPolicy; } KHTMLSettings::KJSWindowFocusPolicy KHTMLSettings::windowFocusPolicy( @@ -887,8 +887,8 @@ const TQString &KHTMLSettings::availableFamilies() const TQStringList::Iterator fEnd = families.end(); for ( ; f != fEnd; ++f ) { - (*f).tqreplace( foundryExp, ""); - if (!s.tqcontains(*f)) + (*f).replace( foundryExp, ""); + if (!s.contains(*f)) s << *f; } s.sort(); diff --git a/khtml/khtml_settings.h b/khtml/khtml_settings.h index b0e3fab1d..d7ef32eab 100644 --- a/khtml/khtml_settings.h +++ b/khtml/khtml_settings.h @@ -65,11 +65,11 @@ public: }; /** - * This enum specifies the policy for window.status and .defaulttqStatus + * This enum specifies the policy for window.status and .defaultStatus */ - enum KJSWindowtqStatusPolicy { - KJSWindowtqStatusAllow=0, - KJSWindowtqStatusIgnore + enum KJSWindowStatusPolicy { + KJSWindowStatusAllow=0, + KJSWindowStatusIgnore }; /** @@ -182,7 +182,7 @@ public: KJSWindowOpenPolicy windowOpenPolicy( const TQString& hostname = TQString::null ) const; KJSWindowMovePolicy windowMovePolicy( const TQString& hostname = TQString::null ) const; KJSWindowResizePolicy windowResizePolicy( const TQString& hostname = TQString::null ) const; - KJSWindowtqStatusPolicy windowtqStatusPolicy( const TQString& hostname = TQString::null ) const; + KJSWindowStatusPolicy windowStatusPolicy( const TQString& hostname = TQString::null ) const; KJSWindowFocusPolicy windowFocusPolicy( const TQString& hostname = TQString::null ) const; // helpers for parsing domain-specific configuration, used in KControl module as well diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp index 46833c5f0..03279e968 100644 --- a/khtml/khtmlimage.cpp +++ b/khtml/khtmlimage.cpp @@ -48,24 +48,24 @@ KHTMLImageFactory::~KHTMLImageFactory() delete s_instance; } -KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) prof = KHTMLPart::BrowserViewGUI; - return new KHTMLImage( tqparentWidget, widgetName, parent, name, prof ); + return new KHTMLImage( parentWidget, widgetName, parent, name, prof ); } -KHTMLImage::KHTMLImage( TQWidget *tqparentWidget, const char *widgetName, +KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ), m_image( 0 ) { KHTMLPart* parentPart = ::qt_cast<KHTMLPart *>( parent ); setInstance( KHTMLImageFactory::instance(), prof == KHTMLPart::BrowserViewGUI && !parentPart ); - TQVBox *box = new TQVBox( tqparentWidget, widgetName ); + TQVBox *box = new TQVBox( parentWidget, widgetName ); m_khtml = new KHTMLPart( box, widgetName, this, "htmlimagepart", prof ); m_khtml->setAutoloadImages( true ); @@ -302,7 +302,7 @@ bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) { case TQEvent::DragMove: case TQEvent::DragLeave: case TQEvent::Drop: { - // tqfind out if this part is embedded in a frame, and send the + // find out if this part is embedded in a frame, and send the // event to its outside widget KHTMLPart *p = ::qt_cast<KHTMLPart *>(parent()); if (p) diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h index 735df4491..dda918177 100644 --- a/khtml/khtmlimage.h +++ b/khtml/khtmlimage.h @@ -44,7 +44,7 @@ public: KHTMLImageFactory(); virtual ~KHTMLImageFactory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); @@ -61,7 +61,7 @@ class KHTMLImage : public KParts::ReadOnlyPart, public khtml::CachedObjectClient { Q_OBJECT public: - KHTMLImage( TQWidget *tqparentWidget, const char *widgetName, + KHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ); virtual ~KHTMLImage(); diff --git a/khtml/khtmlpart_p.h b/khtml/khtmlpart_p.h index 871ea62d7..0047dde54 100644 --- a/khtml/khtmlpart_p.h +++ b/khtml/khtmlpart_p.h @@ -72,7 +72,7 @@ namespace KParts namespace khtml { - class KDE_EXPORT ChildFrame : public TQObject + class KDE_EXPORT ChildFrame : public QObject { Q_OBJECT public: @@ -118,7 +118,7 @@ namespace khtml struct KHTMLFrameList : public TQValueList<khtml::ChildFrame*> { - Iterator tqfind( const TQString &name ) KDE_NO_EXPORT; + Iterator find( const TQString &name ) KDE_NO_EXPORT; }; typedef KHTMLFrameList::ConstIterator ConstFrameIt; @@ -127,7 +127,7 @@ typedef KHTMLFrameList::Iterator FrameIt; static int khtml_part_dcop_counter = 0; -class KHTMLWalletQueue : public TQObject +class KHTMLWalletQueue : public QObject { Q_OBJECT public: @@ -214,8 +214,8 @@ public: m_jobPercent = 0; m_haveEncoding = false; m_activeFrame = 0L; - m_tqfind = 0; - m_tqfindDialog = 0; + m_find = 0; + m_findDialog = 0; m_ssl_in_use = false; m_jsedlg = 0; m_formNotification = KHTMLPart::NoNotification; @@ -516,29 +516,29 @@ public: }; TQValueList<StringPortion> m_stringPortions; - KFind *m_tqfind; - KFindDialog *m_tqfindDialog; + KFind *m_find; + KFindDialog *m_findDialog; - struct tqfindState + struct findState { - tqfindState() : options( 0 ), last_dir( -1 ) {} + findState() : options( 0 ), last_dir( -1 ) {} TQStringList history; TQString text; int options; int last_dir; // -1=unknown,0=forward,1=backward }; - tqfindState m_lastFindState; + findState m_lastFindState; KJSErrorDlg *m_jsedlg; - DOM::NodeImpl *m_tqfindNode; // current node - DOM::NodeImpl *m_tqfindNodeEnd; // end node - DOM::NodeImpl *m_tqfindNodeStart; // start node - DOM::NodeImpl *m_tqfindNodePrevious; // previous node used for tqfind - int m_tqfindPos; // current pos in current node - int m_tqfindPosEnd; // pos in end node - int m_tqfindPosStart; // pos in start node + DOM::NodeImpl *m_findNode; // current node + DOM::NodeImpl *m_findNodeEnd; // end node + DOM::NodeImpl *m_findNodeStart; // start node + DOM::NodeImpl *m_findNodePrevious; // previous node used for find + int m_findPos; // current pos in current node + int m_findPosEnd; // pos in end node + int m_findPosStart; // pos in start node ///////// //TQGuardedPtr<KParts::Part> m_activeFrame; diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 90df688d6..850d8e9cd 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -220,7 +220,7 @@ public: #ifdef DEBUG_PIXEL timer.start(); pixelbooth = 0; - tqrepaintbooth = 0; + repaintbooth = 0; #endif scrollBarMoved = false; contentsMoving = false; @@ -237,16 +237,16 @@ public: scrollingSelf = false; delete postponed_autorepeat; postponed_autorepeat = NULL; - tqlayoutTimerId = 0; - tqrepaintTimerId = 0; + layoutTimerId = 0; + repaintTimerId = 0; scrollTimerId = 0; scrollSuspended = false; scrollSuspendPreActivate = false; complete = false; - firstRetqlayout = true; + firstRelayout = true; needsFullRepaint = true; dirtyLayout = false; - tqlayoutSchedulingEnabled = true; + layoutSchedulingEnabled = true; painting = false; updateRegion = TQRegion(); m_dialogsAllowed = true; @@ -324,7 +324,7 @@ public: #ifdef DEBUG_PIXEL TQTime timer; unsigned int pixelbooth; - unsigned int tqrepaintbooth; + unsigned int repaintbooth; #endif TQPainter *tp; @@ -356,10 +356,10 @@ public: int prevMouseX, prevMouseY; bool scrollingSelf; - int tqlayoutTimerId; + int layoutTimerId; TQKeyEvent* postponed_autorepeat; - int tqrepaintTimerId; + int repaintTimerId; int scrollTimerId; int scrollTiming; int scrollBy; @@ -367,8 +367,8 @@ public: bool scrollSuspended :1; bool scrollSuspendPreActivate :1; bool complete :1; - bool firstRetqlayout :1; - bool tqlayoutSchedulingEnabled :1; + bool firstRelayout :1; + bool layoutSchedulingEnabled :1; bool needsFullRepaint :1; bool painting :1; bool possibleTripleClick :1; @@ -382,9 +382,9 @@ public: EditorContext *m_editorContext; #endif // KHTML_NO_CARET #ifndef KHTML_NO_TYPE_AHEAD_FIND - TQString tqfindString; + TQString findString; TQTimer timer; - bool tqfindLinksOnly; + bool findLinksOnly; bool typeAheadActivated; #endif // KHTML_NO_TYPE_AHEAD_FIND bool accessKeysEnabled; @@ -423,7 +423,7 @@ public: * @return true if an appropriate area was found -- only in this case r and * s are valid, false otherwise */ -static bool tqfindImageMapRect(HTMLImageElementImpl *img, const TQPoint &scrollOfs, +static bool findImageMapRect(HTMLImageElementImpl *img, const TQPoint &scrollOfs, const TQPoint &p, TQRect &r, TQString &s) { HTMLMapElementImpl* map; @@ -466,7 +466,7 @@ void KHTMLToolTip::maybeTip(const TQPoint& p) // for images, check if it is part of a client-side image map, // and query the <area>s' title attributes, too if (e->id() == ID_IMG && !e->getAttribute( ATTR_USEMAP ).isEmpty()) { - found = tqfindImageMapRect(static_cast<HTMLImageElementImpl *>(e), + found = findImageMapRect(static_cast<HTMLImageElementImpl *>(e), m_view->viewportToContents(TQPoint(0, 0)), p, r, s); } if (!found) { @@ -512,7 +512,7 @@ KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name) #endif #ifndef KHTML_NO_TYPE_AHEAD_FIND - connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(tqfindTimeout())); + connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(findTimeout())); #endif // KHTML_NO_TYPE_AHEAD_FIND init(); @@ -571,7 +571,7 @@ void KHTMLView::clear() #ifndef KHTML_NO_TYPE_AHEAD_FIND if( d->typeAheadActivated ) - tqfindTimeout(); + findTimeout(); #endif if (d->accessKeysEnabled && d->accessKeysActivated) accessKeysTimeout(); @@ -608,7 +608,7 @@ void KHTMLView::resizeEvent (TQResizeEvent* e) int dh = e->oldSize().height() - e->size().height(); // if we are shrinking the view, don't allow the content to overflow - // before the tqlayout occurs - we don't know if we need scrollbars yet + // before the layout occurs - we don't know if we need scrollbars yet dw = dw>0 ? kMax(0, contentsWidth()-dw) : contentsWidth(); dh = dh>0 ? kMax(0, contentsHeight()-dh) : contentsHeight(); @@ -627,8 +627,8 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e) //int w = visibleWidth(); //int h = visibleHeight(); - if (d->tqlayoutSchedulingEnabled) - tqlayout(); + if (d->layoutSchedulingEnabled) + layout(); #ifndef KHTML_NO_CARET else { hideCaret(); @@ -650,14 +650,14 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) #ifdef DEBUG_PIXEL if ( d->timer.elapsed() > 5000 ) { - qDebug( "drawed %d pixels in %d tqrepaints the last %d milliseconds", - d->pixelbooth, d->tqrepaintbooth, d->timer.elapsed() ); + qDebug( "drawed %d pixels in %d repaints the last %d milliseconds", + d->pixelbooth, d->repaintbooth, d->timer.elapsed() ); d->timer.restart(); d->pixelbooth = 0; - d->tqrepaintbooth = 0; + d->repaintbooth = 0; } d->pixelbooth += ew*eh; - d->tqrepaintbooth++; + d->repaintbooth++; #endif //kdDebug( 6000 ) << "drawContents this="<< this <<" x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl; @@ -665,9 +665,9 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) p->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base)); return; } else if ( d->complete && static_cast<RenderCanvas*>(m_part->xmlDocImpl()->renderer())->needsLayout() ) { - // an external update request happens while we have a tqlayout scheduled - unscheduleRetqlayout(); - tqlayout(); + // an external update request happens while we have a layout scheduled + unscheduleRelayout(); + layout(); } if (d->painting) { @@ -696,13 +696,13 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) (g.right() <= pt.x()) || (g.left() > pt.x()+ew) )) continue; RenderLayer* rl = rw->needsMask() ? rw->enclosingStackingContext() : 0; - TQRegion tqmask = rl ? rl->getMask() : TQRegion(); - if (!tqmask.isNull()) { + TQRegion mask = rl ? rl->getMask() : TQRegion(); + if (!mask.isNull()) { TQPoint o(0,0); o = contentsToViewport(o); - tqmask.translate(o.x(),o.y()); - tqmask = tqmask.intersect( TQRect(g.x(),g.y(),g.width(),g.height()) ); - cr -= tqmask; + mask.translate(o.x(),o.y()); + mask = mask.intersect( TQRect(g.x(),g.y(),g.width(),g.height()) ); + cr -= mask; } else { cr -= g; } @@ -797,7 +797,7 @@ void KHTMLView::setMarginHeight(int h) _marginHeight = h; } -void KHTMLView::tqlayout() +void KHTMLView::layout() { if( m_part && m_part->xmlDocImpl() ) { DOM::DocumentImpl *document = m_part->xmlDocImpl(); @@ -805,7 +805,7 @@ void KHTMLView::tqlayout() khtml::RenderCanvas* canvas = static_cast<khtml::RenderCanvas *>(document->renderer()); if ( !canvas ) return; - d->tqlayoutSchedulingEnabled=false; + d->layoutSchedulingEnabled=false; // the reference object for the overflow property on canvas RenderObject * ref = 0; @@ -847,7 +847,7 @@ void KHTMLView::tqlayout() if (TQScrollView::vScrollBarMode() == AlwaysOff) TQScrollView::setVScrollBarMode(d->vmode); } } - d->needsFullRepaint = d->firstRetqlayout; + d->needsFullRepaint = d->firstRelayout; if (_height != visibleHeight() || _width != visibleWidth()) {; d->needsFullRepaint = true; _height = visibleHeight(); @@ -855,19 +855,19 @@ void KHTMLView::tqlayout() } //TQTime qt; //qt.start(); - canvas->tqlayout(); + canvas->layout(); emit finishedLayout(); - if (d->firstRetqlayout) { - // make sure firstRetqlayout is set to false now in case this tqlayout + if (d->firstRelayout) { + // make sure firstRelayout is set to false now in case this layout // wasn't scheduled - d->firstRetqlayout = false; + d->firstRelayout = false; verticalScrollBar()->setEnabled( true ); horizontalScrollBar()->setEnabled( true ); } #if 0 ElementImpl *listitem = m_part->xmlDocImpl()->getElementById("__test_element__"); - if (listitem) kdDebug(6000) << "after tqlayout, before tqrepaint" << endl; + if (listitem) kdDebug(6000) << "after layout, before repaint" << endl; if (listitem) dumpLineBoxes(static_cast<RenderFlow *>(listitem->renderer())); #endif #ifndef KHTML_NO_CARET @@ -885,14 +885,14 @@ void KHTMLView::tqlayout() emit hideAccessKeys(); displayAccessKeys(); } - //kdDebug( 6000 ) << "TIME: tqlayout() dt=" << qt.elapsed() << endl; + //kdDebug( 6000 ) << "TIME: layout() dt=" << qt.elapsed() << endl; } else _width = visibleWidth(); - killTimer(d->tqlayoutTimerId); - d->tqlayoutTimerId = 0; - d->tqlayoutSchedulingEnabled=true; + killTimer(d->layoutTimerId); + d->layoutTimerId = 0; + d->layoutSchedulingEnabled=true; } void KHTMLView::closeChildDialogs() @@ -972,7 +972,7 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) if ( !d->m_mouseScrollIndicator ) { TQPixmap pixmap, icon; pixmap.resize( 48, 48 ); - pixmap.fill( TQColor( tqRgba( 127, 127, 127, 127 ) ) ); + pixmap.fill( TQColor( qRgba( 127, 127, 127, 127 ) ) ); TQPainter p( &pixmap ); icon = KGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small ); @@ -1000,24 +1000,24 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) d->m_mouseScrollIndicator->show(); d->m_mouseScrollIndicator->unsetCursor(); - TQBitmap tqmask = d->m_mouseScrollIndicator->paletteBackgroundPixmap()->createHeuristicMask( true ); + TQBitmap mask = d->m_mouseScrollIndicator->paletteBackgroundPixmap()->createHeuristicMask( true ); if ( hasHorBar && !hasVerBar ) { TQBitmap bm( 16, 16, true ); - bitBlt( &tqmask, 16, 0, &bm, 0, 0, -1, -1 ); - bitBlt( &tqmask, 16, 32, &bm, 0, 0, -1, -1 ); + bitBlt( &mask, 16, 0, &bm, 0, 0, -1, -1 ); + bitBlt( &mask, 16, 32, &bm, 0, 0, -1, -1 ); d->m_mouseScrollIndicator->setCursor( KCursor::SizeHorCursor ); } else if ( !hasHorBar && hasVerBar ) { TQBitmap bm( 16, 16, true ); - bitBlt( &tqmask, 0, 16, &bm, 0, 0, -1, -1 ); - bitBlt( &tqmask, 32, 16, &bm, 0, 0, -1, -1 ); + bitBlt( &mask, 0, 16, &bm, 0, 0, -1, -1 ); + bitBlt( &mask, 32, 16, &bm, 0, 0, -1, -1 ); d->m_mouseScrollIndicator->setCursor( KCursor::SizeVerCursor ); } else d->m_mouseScrollIndicator->setCursor( KCursor::SizeAllCursor ); - d->m_mouseScrollIndicator->setMask( tqmask ); + d->m_mouseScrollIndicator->setMask( mask ); } else { if ( hasHorBar && !hasVerBar ) @@ -1179,7 +1179,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) if (d->clickCount > 0 && TQPoint(d->clickX-xm,d->clickY-ym).manhattanLength() > TQApplication::startDragDistance()) { - d->clickCount = 0; // moving the mouse outside the threshold tqinvalidates the click + d->clickCount = 0; // moving the mouse outside the threshold invalidates the click } // execute the scheduled script. This is to make sure the mouseover events come after the mouseout events @@ -1202,7 +1202,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) c = KCursor::ibeamCursor(); if ( mev.url.length() && m_part->settings()->changeCursor() ) { c = m_part->urlCursor(); - if (mev.url.string().startsWith("mailto:") && mev.url.string().tqfind('@')>0) + if (mev.url.string().startsWith("mailto:") && mev.url.string().find('@')>0) mailtoCursor = true; else newWindowCursor = targetOpensNewWindow( m_part, mev.target.string() ); @@ -1217,7 +1217,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) break; case CURSOR_POINTER: c = m_part->urlCursor(); - if (mev.url.string().startsWith("mailto:") && mev.url.string().tqfind('@')>0) + if (mev.url.string().startsWith("mailto:") && mev.url.string().find('@')>0) mailtoCursor = true; else newWindowCursor = targetOpensNewWindow( m_part, mev.target.string() ); @@ -1285,8 +1285,8 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) attr.save_under = True; XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr ); d->cursor_icon_widget->resize( icon_pixmap.width(), icon_pixmap.height()); - if( icon_pixmap.tqmask() ) - d->cursor_icon_widget->setMask( *icon_pixmap.tqmask()); + if( icon_pixmap.mask() ) + d->cursor_icon_widget->setMask( *icon_pixmap.mask()); else d->cursor_icon_widget->clearMask(); d->cursor_icon_widget->setBackgroundPixmap( icon_pixmap ); @@ -1447,18 +1447,18 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke ) #ifndef KHTML_NO_TYPE_AHEAD_FIND if(d->typeAheadActivated) { - // type-ahead tqfind aka tqfind-as-you-type + // type-ahead find aka find-as-you-type if(_ke->key() == Key_BackSpace) { - d->tqfindString = d->tqfindString.left(d->tqfindString.length() - 1); + d->findString = d->findString.left(d->findString.length() - 1); - if(!d->tqfindString.isEmpty()) + if(!d->findString.isEmpty()) { - tqfindAhead(false); + findAhead(false); } else { - tqfindTimeout(); + findTimeout(); } d->timer.start(3000, true); @@ -1467,16 +1467,16 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke ) } else if(_ke->key() == Key_Escape) { - tqfindTimeout(); + findTimeout(); _ke->accept(); return; } else if(_ke->key() == Key_Space || !_ke->text().stripWhiteSpace().isEmpty()) { - d->tqfindString += _ke->text(); + d->findString += _ke->text(); - tqfindAhead(true); + findAhead(true); d->timer.start(3000, true); _ke->accept(); @@ -1636,11 +1636,11 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke ) _ke->accept(); } -void KHTMLView::tqfindTimeout() +void KHTMLView::findTimeout() { #ifndef KHTML_NO_TYPE_AHEAD_FIND d->typeAheadActivated = false; - d->tqfindString = ""; + d->findString = ""; m_part->setStatusBarText(i18n("Find stopped."), KHTMLPart::BarDefaultText); m_part->enableFindAheadActions( true ); #endif // KHTML_NO_TYPE_AHEAD_FIND @@ -1651,33 +1651,33 @@ void KHTMLView::startFindAhead( bool linksOnly ) { if( linksOnly ) { - d->tqfindLinksOnly = true; - m_part->setStatusBarText(i18n("Starting -- tqfind links as you type"), + d->findLinksOnly = true; + m_part->setStatusBarText(i18n("Starting -- find links as you type"), KHTMLPart::BarDefaultText); } else { - d->tqfindLinksOnly = false; - m_part->setStatusBarText(i18n("Starting -- tqfind text as you type"), + d->findLinksOnly = false; + m_part->setStatusBarText(i18n("Starting -- find text as you type"), KHTMLPart::BarDefaultText); } - m_part->tqfindTextBegin(); + m_part->findTextBegin(); d->typeAheadActivated = true; // disable, so that the shortcut ( / or ' by default ) doesn't interfere m_part->enableFindAheadActions( false ); d->timer.start(3000, true); } -void KHTMLView::tqfindAhead(bool increase) +void KHTMLView::findAhead(bool increase) { TQString status; - if(d->tqfindLinksOnly) + if(d->findLinksOnly) { - m_part->tqfindText(d->tqfindString, KHTMLPart::FindNoPopups | + m_part->findText(d->findString, KHTMLPart::FindNoPopups | KHTMLPart::FindLinksOnly, this); - if(m_part->tqfindTextNext()) + if(m_part->findTextNext()) { status = i18n("Link found: \"%1\"."); } @@ -1689,8 +1689,8 @@ void KHTMLView::tqfindAhead(bool increase) } else { - m_part->tqfindText(d->tqfindString, KHTMLPart::FindNoPopups, this); - if(m_part->tqfindTextNext()) + m_part->findText(d->findString, KHTMLPart::FindNoPopups, this); + if(m_part->findTextNext()) { status = i18n("Text found: \"%1\"."); } @@ -1701,7 +1701,7 @@ void KHTMLView::tqfindAhead(bool increase) } } - m_part->setStatusBarText(status.arg(d->tqfindString.lower()), + m_part->setStatusBarText(status.arg(d->findString.lower()), KHTMLPart::BarDefaultText); } @@ -1802,7 +1802,7 @@ void KHTMLView::contentsContextMenuEvent ( TQContextMenuEvent * /*ce*/ ) bool KHTMLView::focusNextPrevChild( bool next ) { - // Now try to tqfind the next child + // Now try to find the next child if (m_part->xmlDocImpl() && focusNextPrevNode(next)) { if (m_part->xmlDocImpl()->focusNode()) @@ -1903,7 +1903,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) if (c->isWidgetType()) { TQWidget *w = static_cast<TQWidget *>(c); // don't install the event filter on toplevels - if (w->tqparentWidget(true) == view) { + if (w->parentWidget(true) == view) { if (!strcmp(w->name(), "__khtml")) { w->installEventFilter(this); w->unsetCursor(); @@ -1931,7 +1931,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) TQWidget *c = v; while (v && v != view) { c = v; - v = v->tqparentWidget(true); + v = v->parentWidget(true); } if (v && !strcmp(c->name(), "__khtml")) { @@ -1941,23 +1941,23 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Paint: if (!allowWidgetPaintEvents) { // eat the event. Like this we can control exactly when the widget - // get's tqrepainted. + // get's repainted. block = true; int x = 0, y = 0; TQWidget *v = w; while (v && v != view) { x += v->x(); y += v->y(); - v = v->tqparentWidget(); + v = v->parentWidget(); } viewportToContents( x, y, x, y ); TQPaintEvent *pe = static_cast<TQPaintEvent *>(e); bool asap = !d->contentsMoving && ::qt_cast<TQScrollView *>(c); - // TQScrollView needs fast tqrepaints + // TQScrollView needs fast repaints if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() && !static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer())->needsLayout() ) { - tqrepaintContents(x + pe->rect().x(), y + pe->rect().y(), + repaintContents(x + pe->rect().x(), y + pe->rect().y(), pe->rect().width(), pe->rect().height(), true); } else { scheduleRepaint(x + pe->rect().x(), y + pe->rect().y(), @@ -1969,7 +1969,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonDblClick: { - if ( (w->tqparentWidget() == view || ::qt_cast<TQScrollView*>(c)) && !::qt_cast<TQScrollBar *>(w)) { + if ( (w->parentWidget() == view || ::qt_cast<TQScrollView*>(c)) && !::qt_cast<TQScrollBar *>(w)) { TQMouseEvent *me = static_cast<TQMouseEvent *>(e); TQPoint pt = w->mapTo( view, me->pos()); TQMouseEvent me2(me->type(), pt, me->button(), me->state()); @@ -1988,7 +1988,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) } case TQEvent::KeyPress: case TQEvent::KeyRelease: - if (w->tqparentWidget() == view && !::qt_cast<TQScrollBar *>(w)) { + if (w->parentWidget() == view && !::qt_cast<TQScrollBar *>(w)) { TQKeyEvent *ke = static_cast<TQKeyEvent *>(e); if (e->type() == TQEvent::KeyPress) keyPressEvent(ke); @@ -2272,19 +2272,19 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal TQString accesskey; if( s.length() == 1 ) { TQChar a = s.string()[ 0 ].upper(); - if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !tqcontains + if( qFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains accesskey = a; } - if( accesskey.isNull() && fallbacks.tqcontains( en )) { + if( accesskey.isNull() && fallbacks.contains( en )) { TQChar a = fallbacks[ en ].upper(); - if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !tqcontains + if( qFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains accesskey = TQString( "<qt><i>" ) + a + "</i></qt>"; } if( !accesskey.isNull()) { TQRect rec=en->getRect(); TQLabel *lab=new TQLabel(accesskey,viewport(),0,Qt::WDestructiveClose); connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(tqrepaintAccessKeys()), lab, TQT_SLOT(tqrepaint())); + connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint())); lab->setPalette(TQToolTip::palette()); lab->setLineWidth(2); lab->setFrameStyle(TQFrame::Box | TQFrame::Plain); @@ -2352,7 +2352,7 @@ bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller ) DocumentImpl *doc = m_part->xmlDocImpl(); if( !doc ) return false; - ElementImpl* node = doc->tqfindAccessKeyElement( c ); + ElementImpl* node = doc->findAccessKeyElement( c ); if( !node ) { TQPtrList<KParts::ReadOnlyPart> frames = m_part->frames(); for( TQPtrListIterator<KParts::ReadOnlyPart> it( frames ); @@ -2621,7 +2621,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const } if( ignore ) continue; - if( text.isNull() && labels.tqcontains( element )) + if( text.isNull() && labels.contains( element )) text = labels[ element ]; if( text.isNull() && text_before ) text = getElementText( element, false ); @@ -2681,7 +2681,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const for( TQValueList< QPair< TQString, TQChar > >::ConstIterator it = priorities.begin(); it != priorities.end(); ++it ) - if( text == (*it).first && keys.tqcontains( (*it).second )) { + if( text == (*it).first && keys.contains( (*it).second )) { key = (*it).second; break; } @@ -2694,7 +2694,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const for( TQStringList::ConstIterator it = words.begin(); it != words.end(); ++it ) { - if( keys.tqcontains( (*it)[ 0 ].upper())) { + if( keys.contains( (*it)[ 0 ].upper())) { key = (*it)[ 0 ].upper(); break; } @@ -2704,7 +2704,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const for( unsigned int i = 0; i < text.length(); ++i ) { - if( keys.tqcontains( text[ i ].upper())) { + if( keys.contains( text[ i ].upper())) { key = text[ i ].upper(); break; } @@ -2753,7 +2753,7 @@ bool KHTMLView::pagedMode() const void KHTMLView::setWidgetVisible(RenderWidget* w, bool vis) { if (vis) { - d->visibleWidgets.tqreplace(w, w->widget()); + d->visibleWidgets.replace(w, w->widget()); } else d->visibleWidgets.remove(w); @@ -2825,7 +2825,7 @@ void KHTMLView::print(bool quick) root->makePageBreakAvoidBlocks(); root->setNeedsLayoutAndMinMaxRecalc(); - root->tqlayout(); + root->layout(); khtml::RenderWidget::flushWidgetResizes(); // make sure widgets have their final size // check sizes ask for action.. (scale or clip) @@ -2835,7 +2835,7 @@ void KHTMLView::print(bool quick) int headerHeight = 0; TQFont headerFont("Sans Serif", 8); - TQString headerLeft = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(),true); + TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(),true); TQString headerMid = docname; TQString headerRight; @@ -2877,7 +2877,7 @@ void KHTMLView::print(bool quick) root->setHeight(pageHeight); root->setPageBottom(pageHeight); root->setNeedsLayout(true); - root->tqlayoutIfNeeded(); + root->layoutIfNeeded(); // m_part->slotDebugRenderTree(); // Squeeze header to make it it on the page. @@ -2933,7 +2933,7 @@ void KHTMLView::print(bool quick) root->layer()->paint(p, TQRect(0, top, pageWidth, pageHeight)); // m_part->xmlDocImpl()->renderer()->layer()->paint(p, TQRect(0, top, pageWidth, pageHeight)); -// root->tqrepaint(); +// root->repaint(); // p->flush(); kdDebug(6000) << "printed: page " << page <<" bottom At = " << bottom << endl; @@ -2945,7 +2945,7 @@ void KHTMLView::print(bool quick) p->end(); delete p; - // and now reset the tqlayout to the usual one... + // and now reset the layout to the usual one... root->setPagedMode(false); root->setStaticMode(false); d->paged = false; @@ -3038,7 +3038,7 @@ void KHTMLView::restoreScrollBar() int ow = visibleWidth(); TQScrollView::setVScrollBarMode(d->vmode); if (visibleWidth() != ow) - tqlayout(); + layout(); d->prevScrollbarVisible = verticalScrollBar()->isVisible(); } @@ -3081,7 +3081,7 @@ void KHTMLView::addFormCompletionItem(const TQString &name, const TQString &valu if (cc_number) return; TQStringList items = formCompletionItems(name); - if (!items.tqcontains(value)) + if (!items.contains(value)) items.prepend(value); while ((int)items.count() > m_part->settings()->maxFormCompletionItems()) items.remove(items.fromLast()); @@ -3121,7 +3121,7 @@ bool KHTMLView::nonPasswordStorableSite(const TQString& host) const TQStringList sites = d->formCompletions->readListEntry("Sites"); d->formCompletions->setGroup(TQString::null);//reset - return (sites.tqfind(host) != sites.end()); + return (sites.find(host) != sites.end()); } // returns true if event should be swallowed @@ -3274,7 +3274,7 @@ void KHTMLView::viewportWheelEvent(TQWheelEvent* e) emit zoomView( - e->delta() ); e->accept(); } - else if (d->firstRetqlayout) + else if (d->firstRelayout) { e->accept(); } @@ -3373,7 +3373,7 @@ void KHTMLView::focusOutEvent( TQFocusEvent *e ) #ifndef KHTML_NO_TYPE_AHEAD_FIND if(d->typeAheadActivated) { - tqfindTimeout(); + findTimeout(); } m_part->enableFindAheadActions( false ); #endif // KHTML_NO_TYPE_AHEAD_FIND @@ -3413,13 +3413,13 @@ void KHTMLView::focusOutEvent( TQFocusEvent *e ) void KHTMLView::slotScrollBarMoved() { - if ( !d->firstRetqlayout && !d->complete && m_part->xmlDocImpl() && - d->tqlayoutSchedulingEnabled) { - // contents scroll while we are not complete: we need to check our tqlayout *now* + if ( !d->firstRelayout && !d->complete && m_part->xmlDocImpl() && + d->layoutSchedulingEnabled) { + // contents scroll while we are not complete: we need to check our layout *now* khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas *>( m_part->xmlDocImpl()->renderer() ); if (root && root->needsLayout()) { - unscheduleRetqlayout(); - tqlayout(); + unscheduleRelayout(); + layout(); } } if (!d->scrollingSelf) { @@ -3467,11 +3467,11 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) } return; } - else if ( e->timerId() == d->tqlayoutTimerId ) { + else if ( e->timerId() == d->layoutTimerId ) { d->dirtyLayout = true; - tqlayout(); - if (d->firstRetqlayout) { - d->firstRetqlayout = false; + layout(); + if (d->firstRelayout) { + d->firstRelayout = false; verticalScrollBar()->setEnabled( true ); horizontalScrollBar()->setEnabled( true ); } @@ -3497,18 +3497,18 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas *>(document->renderer()); if ( root && root->needsLayout() ) { - killTimer(d->tqrepaintTimerId); - d->tqrepaintTimerId = 0; - scheduleRetqlayout(); + killTimer(d->repaintTimerId); + d->repaintTimerId = 0; + scheduleRelayout(); return; } } setStaticBackground(d->useSlowRepaints); -// kdDebug() << "scheduled tqrepaint "<< d->tqrepaintTimerId << endl; - killTimer(d->tqrepaintTimerId); - d->tqrepaintTimerId = 0; +// kdDebug() << "scheduled repaint "<< d->repaintTimerId << endl; + killTimer(d->repaintTimerId); + d->repaintTimerId = 0; TQRect updateRegion; TQMemArray<TQRect> rects = d->updateRegion.rects(); @@ -3522,7 +3522,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) TQRect newRegion = updateRegion.unite(rects[i]); if (2*newRegion.height() > 3*updateRegion.height() ) { - tqrepaintContents( updateRegion ); + repaintContents( updateRegion ); updateRegion = rects[i]; } else @@ -3530,12 +3530,12 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) } if ( !updateRegion.isNull() ) - tqrepaintContents( updateRegion ); + repaintContents( updateRegion ); - // As widgets can only be accurately positioned during painting, every tqlayout might - // dissociate a widget from its RenderWidget. E.g: if a RenderWidget was visible before tqlayout, but the tqlayout - // pushed it out of the viewport, it will not be tqrepainted, and consequently it's assocoated widget won't be repositioned! - // Thus we need to check each supposedly 'visible' widget at the end of each tqlayout, and remove it in case it's no more in sight. + // As widgets can only be accurately positioned during painting, every layout might + // dissociate a widget from its RenderWidget. E.g: if a RenderWidget was visible before layout, but the layout + // pushed it out of the viewport, it will not be repainted, and consequently it's assocoated widget won't be repositioned! + // Thus we need to check each supposedly 'visible' widget at the end of each layout, and remove it in case it's no more in sight. if (d->dirtyLayout && !d->visibleWidgets.isEmpty()) { TQWidget* w; @@ -3556,7 +3556,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) addChild(w, 0, -500000); } - emit tqrepaintAccessKeys(); + emit repaintAccessKeys(); if (d->emitCompletedAfterRepaint) { bool full = d->emitCompletedAfterRepaint == KHTMLViewPrivate::CSFull; d->emitCompletedAfterRepaint = KHTMLViewPrivate::CSNone; @@ -3567,31 +3567,31 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) } } -void KHTMLView::scheduleRetqlayout(khtml::RenderObject * /*clippedObj*/) +void KHTMLView::scheduleRelayout(khtml::RenderObject * /*clippedObj*/) { - if (!d->tqlayoutSchedulingEnabled || d->tqlayoutTimerId) + if (!d->layoutSchedulingEnabled || d->layoutTimerId) return; - d->tqlayoutTimerId = startTimer( m_part->xmlDocImpl() && m_part->xmlDocImpl()->parsing() + d->layoutTimerId = startTimer( m_part->xmlDocImpl() && m_part->xmlDocImpl()->parsing() ? 1000 : 0 ); } -void KHTMLView::unscheduleRetqlayout() +void KHTMLView::unscheduleRelayout() { - if (!d->tqlayoutTimerId) + if (!d->layoutTimerId) return; - killTimer(d->tqlayoutTimerId); - d->tqlayoutTimerId = 0; + killTimer(d->layoutTimerId); + d->layoutTimerId = 0; } void KHTMLView::unscheduleRepaint() { - if (!d->tqrepaintTimerId) + if (!d->repaintTimerId) return; - killTimer(d->tqrepaintTimerId); - d->tqrepaintTimerId = 0; + killTimer(d->repaintTimerId); + d->repaintTimerId = 0; } void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap) @@ -3618,8 +3618,8 @@ void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap) if (asap && !parsing) unscheduleRepaint(); - if ( !d->tqrepaintTimerId ) - d->tqrepaintTimerId = startTimer( time ); + if ( !d->repaintTimerId ) + d->repaintTimerId = startTimer( time ); // kdDebug() << "starting timer " << time << endl; } @@ -3630,24 +3630,24 @@ void KHTMLView::complete( bool pendingAction ) d->complete = true; - // is there a retqlayout pending? - if (d->tqlayoutTimerId) + // is there a relayout pending? + if (d->layoutTimerId) { -// kdDebug() << "requesting retqlayout now" << endl; +// kdDebug() << "requesting relayout now" << endl; // do it now - killTimer(d->tqlayoutTimerId); - d->tqlayoutTimerId = startTimer( 0 ); + killTimer(d->layoutTimerId); + d->layoutTimerId = startTimer( 0 ); d->emitCompletedAfterRepaint = pendingAction ? KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull; } - // is there a tqrepaint pending? - if (d->tqrepaintTimerId) + // is there a repaint pending? + if (d->repaintTimerId) { -// kdDebug() << "requesting tqrepaint now" << endl; +// kdDebug() << "requesting repaint now" << endl; // do it now - killTimer(d->tqrepaintTimerId); - d->tqrepaintTimerId = startTimer( 20 ); + killTimer(d->repaintTimerId); + d->repaintTimerId = startTimer( 20 ); d->emitCompletedAfterRepaint = pendingAction ? KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull; } @@ -3698,7 +3698,7 @@ void KHTMLView::initCaret(bool keepSelection) }/*end if*/ // kdDebug(6200) << "d->m_selectionStart " << m_part->d->m_selectionStart.handle() // << " d->m_selectionEnd " << m_part->d->m_selectionEnd.handle() << endl; - // ### does not tqrepaint the selection on keepSelection!=false + // ### does not repaint the selection on keepSelection!=false moveCaretTo(m_part->d->caretNode().handle(), m_part->d->caretOffset(), !keepSelection); // kdDebug(6200) << "d->m_selectionStart " << m_part->d->m_selectionStart.handle() // << " d->m_selectionEnd " << m_part->d->m_selectionEnd.handle() << endl; @@ -3841,7 +3841,7 @@ void KHTMLView::showCaret(bool forceRepaint) d->m_caretViewContext->width, d->m_caretViewContext->height); } else { - tqrepaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, + repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, d->m_caretViewContext->width, d->m_caretViewContext->height); }/*end if*/ @@ -3873,9 +3873,9 @@ void KHTMLView::hideCaret() if (d->m_caretViewContext->visible) { // kdDebug(6200) << "redraw caret hidden" << endl; d->m_caretViewContext->visible = false; - // force tqrepaint, otherwise the event won't be handled + // force repaint, otherwise the event won't be handled // before the focus leaves the window - tqrepaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, + repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, d->m_caretViewContext->width, d->m_caretViewContext->height); d->m_caretViewContext->visible = true; @@ -4115,16 +4115,16 @@ bool KHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel) RenderFlow *base = static_cast<RenderFlow *>(baseElem ? baseElem->renderer() : 0); if (!node) return false; - // need to tqfind out the node's inline box. If there is none, this function + // need to find out the node's inline box. If there is none, this function // will snap to the next node that has one. This is necessary to make the // caret visible in any case. CaretBoxLineDeleter cblDeleter; // RenderBlock *cb; long r_ofs; CaretBoxIterator cbit; - CaretBoxLine *cbl = tqfindCaretBoxLine(node, offset, &cblDeleter, base, r_ofs, cbit); + CaretBoxLine *cbl = findCaretBoxLine(node, offset, &cblDeleter, base, r_ofs, cbit); if(!cbl) { - kdWarning() << "KHTMLView::moveCaretTo - tqfindCaretBoxLine() returns NULL" << endl; + kdWarning() << "KHTMLView::moveCaretTo - findCaretBoxLine() returns NULL" << endl; return false; } @@ -4143,7 +4143,7 @@ bool KHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel) } else { // box has no associated element -> do not use // this case should actually never happen. box = 0; - kdError(6200) << "Box tqcontains no node! Crash imminent" << endl; + kdError(6200) << "Box contains no node! Crash imminent" << endl; }/*end if*/ } @@ -4226,7 +4226,7 @@ void KHTMLView::placeCaretOnLine(CaretBox *caretBox, int x, int absx, int absy) kdDebug(6200) << "xPos: " << caretBox->xPos() << " yPos: " << caretBox->yPos() << " width: " << caretBox->width() << " height: " << caretBox->height() << endl; InlineTextBox *tb = static_cast<InlineTextBox *>(caretBox->inlineBox()); - if (caretBox->isInlineTextBox()) { kdDebug(6200) << "tqcontains \"" << TQString(static_cast<RenderText *>(tb->object())->str->s + tb->m_start, tb->m_len) << "\"" << endl;} + if (caretBox->isInlineTextBox()) { kdDebug(6200) << "contains \"" << TQString(static_cast<RenderText *>(tb->object())->str->s + tb->m_start, tb->m_len) << "\"" << endl;} #endif // inquire height of caret int caretHeight = caretBox->height(); @@ -4264,7 +4264,7 @@ void KHTMLView::placeCaretOnLine(CaretBox *caretBox, int x, int absx, int absy) r_ofs = caretBox->minOffset(); // somewhere within this block } else if (x > xPos && x <= xPos + caretBoxWidth) { - if (isText) { // tqfind out where exactly + if (isText) { // find out where exactly r_ofs = static_cast<InlineTextBox *>(caretBox->inlineBox()) ->offsetForPoint(x, d->m_caretViewContext->x); #if DEBUG_CARETMODE > 2 @@ -4426,7 +4426,7 @@ void KHTMLView::placeCaretOnChar(CaretBox *hintBox) d->m_caretViewContext->origX = d->m_caretViewContext->x; d->scrollBarMoved = false; #if DEBUG_CARETMODE > 3 - //if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().tqunicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl; + //if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().unicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl; #endif ensureNodeHasFocus(m_part->d->caretNode().handle()); caretOn(); diff --git a/khtml/khtmlview.h b/khtml/khtmlview.h index 46fe457ff..a79eff17f 100644 --- a/khtml/khtmlview.h +++ b/khtml/khtmlview.h @@ -162,7 +162,7 @@ public: /** * ensure the display is up to date */ - void tqlayout(); // KDE 4.0: make private + void layout(); // KDE 4.0: make private /** * Display all accesskeys in small tooltips */ @@ -172,15 +172,15 @@ public: signals: /** - * This signal is used for internal tqlayouting. Don't use it to check if rendering finished. + * This signal is used for internal layouting. Don't use it to check if rendering finished. * Use @ref KHTMLPart completed() signal instead. */ void finishedLayout(); void cleared(); void zoomView( int ); void hideAccessKeys(); - void tqrepaintAccessKeys(); - void tqfindAheadActive( bool ); + void repaintAccessKeys(); + void findAheadActive( bool ); //#define NO_SMOOTH_SCROLL_HACK #ifndef NO_SMOOTH_SCROLL_HACK public slots: @@ -231,12 +231,12 @@ protected slots: #ifndef NO_SMOOTH_SCROLL_HACK void scrollTick(); #else - void scrollTick() {}; // tqmoc cannot handle #if + void scrollTick() {}; // moc cannot handle #if #endif private slots: void tripleClickTimeout(); - void tqfindTimeout(); + void findTimeout(); void accessKeysTimeout(); /** @@ -248,8 +248,8 @@ private slots: private: - void scheduleRetqlayout(khtml::RenderObject* clippedObj=0); - void unscheduleRetqlayout(); + void scheduleRelayout(khtml::RenderObject* clippedObj=0); + void unscheduleRelayout(); void scheduleRepaint(int x, int y, int w, int h, bool asap=false); void unscheduleRepaint(); @@ -329,7 +329,7 @@ private: void complete( bool pendingAction ); #ifndef KHTML_NO_TYPE_AHEAD_FIND - void tqfindAhead(bool increase); + void findAhead(bool increase); void updateFindAheadTimeout(); void startFindAhead( bool linksOnly ); #endif // KHTML_NO_TYPE_AHEAD_FIND @@ -384,8 +384,8 @@ private: * * These operations are executed unconditionally, regardless of the * focus, and the caret display policy. - * @param forceRepaint @p true to force an immediate tqrepaint, otherwise - * do a scheduled tqrepaint + * @param forceRepaint @p true to force an immediate repaint, otherwise + * do a scheduled repaint */ void showCaret(bool forceRepaint = false); /** makes the caret invisible, but does not influence the frequency timer. diff --git a/khtml/kjserrordlg.ui b/khtml/kjserrordlg.ui index 1b7bf0c22..3e2eea389 100644 --- a/khtml/kjserrordlg.ui +++ b/khtml/kjserrordlg.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>KJSErrorDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>311</width> <height>21</height> @@ -125,8 +125,8 @@ <slot>setURL( const QString & url )</slot> <slot>clear()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/khtml/kmultipart/Makefile.am b/khtml/kmultipart/Makefile.am index e16d7f683..b6d6af0df 100644 --- a/khtml/kmultipart/Makefile.am +++ b/khtml/kmultipart/Makefile.am @@ -9,7 +9,7 @@ libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfi libkmultipart_la_DEPENDENCIES = $(LIB_KPARTS) libkmultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -# Automatically generate tqmoc files +# Automatically generate moc files METASOURCES = AUTO # Install the .desktop file into the kde_services directory diff --git a/khtml/kmultipart/README b/khtml/kmultipart/README index 14c871b7b..c8a342d68 100644 --- a/khtml/kmultipart/README +++ b/khtml/kmultipart/README @@ -1,5 +1,5 @@ KMultiPart implements "server push" for KHTML/Konqueror: -it handles the multipart/mixed and multipart/x-mixed-tqreplace +it handles the multipart/mixed and multipart/x-mixed-replace mimetype, embedding the appropriate component (part). Documentation at http://www.netscape.com/assist/net_sites/pushpull.html @@ -12,5 +12,5 @@ Testcases: TODO: * Use the new streaming API of KParts to pipe data into the part, the current code does that for KHTML only. -* Change KHTML so that it embeds KMultiPart for images which send multipart/x-mixed-tqreplace +* Change KHTML so that it embeds KMultiPart for images which send multipart/x-mixed-replace data. diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index a9fef06b5..17ea9d485 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -93,7 +93,7 @@ Data for the second and last object. */ -KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName, +KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ) : KParts::ReadOnlyPart( parent, name ) { @@ -101,7 +101,7 @@ KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName, setInstance( KMultiPartFactory::instance() ); - TQVBox *box = new TQVBox( tqparentWidget, widgetName ); + TQVBox *box = new TQVBox( parentWidget, widgetName ); setWidget( box ); m_extension = new KParts::BrowserExtension( this ); @@ -234,7 +234,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) } else if ( !qstrnicmp( line.data(), "Content-Encoding:", 17 ) ) { - TQString encoding = TQString::tqfromLatin1(line.data()+17).stripWhiteSpace().lower(); + TQString encoding = TQString::fromLatin1(line.data()+17).stripWhiteSpace().lower(); if (encoding == "gzip" || encoding == "x-gzip") { m_gzip = true; } else { @@ -245,8 +245,8 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) else if ( !qstrnicmp( line.data(), "Content-Type:", 13 ) ) { Q_ASSERT( m_nextMimeType.isNull() ); - m_nextMimeType = TQString::tqfromLatin1( line.data() + 14 ).stripWhiteSpace(); - int semicolon = m_nextMimeType.tqfind( ';' ); + m_nextMimeType = TQString::fromLatin1( line.data() + 14 ).stripWhiteSpace(); + int semicolon = m_nextMimeType.find( ';' ); if ( semicolon != -1 ) m_nextMimeType = m_nextMimeType.left( semicolon ); kdDebug() << "m_nextMimeType=" << m_nextMimeType << endl; @@ -266,14 +266,14 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) else if ( !line.isEmpty() ) // this happens with e.g. Set-Cookie: kdDebug() << "Ignoring header " << line << endl; } else { - if ( !tqstrncmp( line, m_boundary, m_boundaryLength ) ) + if ( !qstrncmp( line, m_boundary, m_boundaryLength ) ) { #ifdef DEBUG_PARSING kdDebug() << "boundary found!" << endl; kdDebug() << "after it is " << line.data() + m_boundaryLength << endl; #endif // Was it the very last boundary ? - if ( !tqstrncmp( line.data() + m_boundaryLength, "--", 2 ) ) + if ( !qstrncmp( line.data() + m_boundaryLength, "--", 2 ) ) { #ifdef DEBUG_PARSING kdDebug() << "Completed!" << endl; @@ -312,7 +312,7 @@ void KMultiPart::setPart( const TQString& mimeType ) guiFactory->removeClient( this ); kdDebug() << "KMultiPart::setPart " << mimeType << endl; delete m_part; - // Try to tqfind an appropriate viewer component + // Try to find an appropriate viewer component m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart> ( m_mimeType, TQString::null, widget(), 0L, this, 0L ); if ( !m_part ) { diff --git a/khtml/kmultipart/kmultipart.desktop b/khtml/kmultipart/kmultipart.desktop index 3bec7ad0f..6419edac6 100644 --- a/khtml/kmultipart/kmultipart.desktop +++ b/khtml/kmultipart/kmultipart.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -MimeType=multipart/mixed;multipart/x-mixed-tqreplace +MimeType=multipart/mixed;multipart/x-mixed-replace Name=Embeddable Component for multipart/mixed Name[af]=Inlegbare Komponent vir multideel/gemeng Name[be]=Унутраны кампанент для multipart/mixed diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h index a17269d74..f3bf95219 100644 --- a/khtml/kmultipart/kmultipart.h +++ b/khtml/kmultipart/kmultipart.h @@ -40,7 +40,7 @@ class KMultiPart : public KParts::ReadOnlyPart { Q_OBJECT public: - KMultiPart( TQWidget *tqparentWidget, const char *widgetName, + KMultiPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ); virtual ~KMultiPart(); diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp index e259a27c9..5efcaf98d 100644 --- a/khtml/misc/arena.cpp +++ b/khtml/misc/arena.cpp @@ -30,7 +30,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. @@ -104,7 +104,7 @@ void InitArenaPool(ArenaPool *pool, const char* /*name*/, unsigned int size = POOL_SIZE; if (align == 0) align = ARENA_DEFAULT_ALIGN; - pool->tqmask = BITMASK(CeilingLog2(align)); + pool->mask = BITMASK(CeilingLog2(align)); pool->first.next = NULL; pool->first.base = pool->first.avail = pool->first.limit = (uword)ARENA_ALIGN(pool, &pool->first + 1); @@ -140,10 +140,10 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb) char *rp; /* returned pointer */ #ifdef DEBUG_ARENA_MALLOC - assert((nb & pool->tqmask) == 0); + assert((nb & pool->mask) == 0); #endif - nb = (uword)ARENA_ALIGN(pool, nb); /* force tqalignment */ + nb = (uword)ARENA_ALIGN(pool, nb); /* force alignment */ /* attempt to allocate from arenas at pool->current */ { @@ -197,7 +197,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb) } else #endif sz = pool->arenasize > nb ? pool->arenasize : nb; - sz += sizeof *a + pool->tqmask; /* header and tqalignment slop */ + sz += sizeof *a + pool->mask; /* header and alignment slop */ pool->cumul += sz; #ifdef DEBUG_ARENA_MALLOC i++; diff --git a/khtml/misc/arena.h b/khtml/misc/arena.h index bbf8b9d42..6415b00bb 100644 --- a/khtml/misc/arena.h +++ b/khtml/misc/arena.h @@ -30,7 +30,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. @@ -74,7 +74,7 @@ struct ArenaPool { unsigned int arenasize; unsigned int largealloc; // threshold for fractional allocation strategy unsigned int cumul; // total bytes in pool. - uword tqmask; // Mask (power-of-2 - 1) + uword mask; // Mask (power-of-2 - 1) }; void InitArenaPool(ArenaPool *pool, const char *name, diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp index 9e5808d9e..f227f4014 100644 --- a/khtml/misc/decoder.cpp +++ b/khtml/misc/decoder.cpp @@ -166,11 +166,11 @@ static void skipComment(const char *&ptr, const char *pEnd) } // Returns the position of the encoding string. -static int tqfindXMLEncoding(const TQCString &str, int &encodingLength) +static int findXMLEncoding(const TQCString &str, int &encodingLength) { int len = str.length(); - int pos = str.tqfind("encoding"); + int pos = str.find("encoding"); if (pos == -1) return -1; pos += 8; @@ -287,7 +287,7 @@ TQString Decoder::decode(const char *data, int len) buffer.append(data, len); #else if(m_codec->mibEnum() != 1000) { // utf16 - // tqreplace '\0' by spaces, for buggy pages + // replace '\0' by spaces, for buggy pages char *d = const_cast<char *>(data); int i = len - 1; while(i >= 0) { @@ -329,7 +329,7 @@ TQString Decoder::decode(const char *data, int len) break; TQCString str(ptr, end - ptr + 1); //+1 as it must include the \0 terminator int len; - int pos = tqfindXMLEncoding(str, len); + int pos = findXMLEncoding(str, len); if (pos != -1) { setEncoding(str.mid(pos, len), EncodingFromXMLHeader); if (m_type == EncodingFromXMLHeader) @@ -365,10 +365,10 @@ TQString Decoder::decode(const char *data, int len) TQCString str( ptr, (end-ptr)+1); str = str.lower(); int pos = 0; - //if( (pos = str.tqfind("http-equiv", pos)) == -1) break; - //if( (pos = str.tqfind("content-type", pos)) == -1) break; + //if( (pos = str.find("http-equiv", pos)) == -1) break; + //if( (pos = str.find("content-type", pos)) == -1) break; while( pos < ( int ) str.length() ) { - if( (pos = str.tqfind("charset", pos)) == -1) break; + if( (pos = str.find("charset", pos)) == -1) break; pos += 7; // skip whitespace.. while( pos < (int)str.length() && str[pos] <= ' ' ) pos++; diff --git a/khtml/misc/helper.cpp b/khtml/misc/helper.cpp index 9300acb1e..f56a4ba92 100644 --- a/khtml/misc/helper.cpp +++ b/khtml/misc/helper.cpp @@ -66,15 +66,15 @@ double calcHue(double temp1, double temp2, double hueVal) // explanation available at http://en.wikipedia.org/wiki/HSL_color_space // all values are in the range of 0 to 1.0 -QRgb khtml::tqRgbaFromHsla(double h, double s, double l, double a) +QRgb khtml::qRgbaFromHsla(double h, double s, double l, double a) { double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s; double temp1 = 2.0 * l - temp2; - return tqRgba(calcHue(temp1, temp2, h + 1.0 / 3.0) * 255, calcHue(temp1, temp2, h) * 255, calcHue(temp1, temp2, h - 1.0 / 3.0) * 255, a * 255); + return qRgba(calcHue(temp1, temp2, h + 1.0 / 3.0) * 255, calcHue(temp1, temp2, h) * 255, calcHue(temp1, temp2, h - 1.0 / 3.0) * 255, a * 255); } -/** tqfinds out the background color of an element +/** finds out the background color of an element * @param obj render object * @return the background color. It is guaranteed that a valid color is returned. */ diff --git a/khtml/misc/helper.h b/khtml/misc/helper.h index abfcf8c88..85442fae8 100644 --- a/khtml/misc/helper.h +++ b/khtml/misc/helper.h @@ -40,9 +40,9 @@ namespace khtml bool hasSufficientContrast(const TQColor &c1, const TQColor &c2); TQColor retrieveBackgroundColor(const RenderObject *obj); - QRgb tqRgbaFromHsla(double h, double s, double l, double a); + QRgb qRgbaFromHsla(double h, double s, double l, double a); - //enumerator for tqfindSelectionNode + //enumerator for findSelectionNode enum FindSelectionResult { SelectionPointBefore, SelectionPointAfter, SelectionPointInside, diff --git a/khtml/misc/htmlattrs.c b/khtml/misc/htmlattrs.c index 86b526e3d..779792e71 100644 --- a/khtml/misc/htmlattrs.c +++ b/khtml/misc/htmlattrs.c @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.3 */ -/* Command-line: gperf -c -a -L ANSI-C -P -G -D -E -C -o -t -k '*' -NtqfindAttr -Hhash_attr -Wwordlist_attr -Qspool_attr -s 2 htmlattrs.gperf */ +/* Command-line: gperf -c -a -L ANSI-C -P -G -D -E -C -o -t -k '*' -NfindAttr -Hhash_attr -Wwordlist_attr -Qspool_attr -s 2 htmlattrs.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ @@ -188,7 +188,7 @@ struct spool_attr_t char spool_attr_str42[sizeof("rules")]; char spool_attr_str43[sizeof("compact")]; char spool_attr_str44[sizeof("rev")]; - char spool_attr_str45[sizeof("tqshape")]; + char spool_attr_str45[sizeof("shape")]; char spool_attr_str46[sizeof("charset")]; char spool_attr_str47[sizeof("charoff")]; char spool_attr_str48[sizeof("lang")]; @@ -343,7 +343,7 @@ static const struct spool_attr_t spool_attr_contents = "rules", "compact", "rev", - "tqshape", + "shape", "charset", "charoff", "lang", @@ -830,7 +830,7 @@ __attribute__ ((__gnu_inline__)) #endif #endif const struct attrs * -tqfindAttr (register const char *str, register unsigned int len) +findAttr (register const char *str, register unsigned int len) { if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { diff --git a/khtml/misc/htmlattrs.in b/khtml/misc/htmlattrs.in index 25bff2e50..263b2fd7b 100644 --- a/khtml/misc/htmlattrs.in +++ b/khtml/misc/htmlattrs.in @@ -80,7 +80,7 @@ scrollamount scrolldelay scrolling selected -tqshape +shape size span start diff --git a/khtml/misc/htmlhashes.cpp b/khtml/misc/htmlhashes.cpp index 98b126a00..593c1ce96 100644 --- a/khtml/misc/htmlhashes.cpp +++ b/khtml/misc/htmlhashes.cpp @@ -27,7 +27,7 @@ int khtml::getTagID(const char *tagStr, int len) { - const struct tags *tagPtr = tqfindTag(tagStr, len); + const struct tags *tagPtr = findTag(tagStr, len); if (!tagPtr) return 0; @@ -36,7 +36,7 @@ int khtml::getTagID(const char *tagStr, int len) int khtml::getAttrID(const char *tagStr, int len) { - const struct attrs *tagPtr = tqfindAttr(tagStr, len); + const struct attrs *tagPtr = findAttr(tagStr, len); if (!tagPtr) return 0; diff --git a/khtml/misc/htmltags.c b/khtml/misc/htmltags.c index 4ee80430f..1342e62bf 100644 --- a/khtml/misc/htmltags.c +++ b/khtml/misc/htmltags.c @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.1 */ -/* Command-line: gperf -a -L ANSI-C -P -D -E -C -l -o -t -k '*' -NtqfindTag -Hhash_tag -Wwordlist_tag -Qspool_Tag htmltags.gperf */ +/* Command-line: gperf -a -L ANSI-C -P -D -E -C -l -o -t -k '*' -NfindTag -Hhash_tag -Wwordlist_tag -Qspool_Tag htmltags.gperf */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ @@ -338,7 +338,7 @@ static const struct spool_Tag_t spool_Tag_contents = __inline #endif const struct tags * -tqfindTag (register const char *str, register unsigned int len) +findTag (register const char *str, register unsigned int len) { enum { diff --git a/khtml/misc/khtmllayout.h b/khtml/misc/khtmllayout.h index a67e7019e..e4fb531a1 100644 --- a/khtml/misc/khtmllayout.h +++ b/khtml/misc/khtmllayout.h @@ -18,22 +18,22 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - This widget holds some useful definitions needed for tqlayouting Elements + This widget holds some useful definitions needed for layouting Elements */ #ifndef HTML_LAYOUT_H #define HTML_LAYOUT_H /* - * this namespace tqcontains definitions for various types needed for - * tqlayouting. + * this namespace contains definitions for various types needed for + * layouting. */ namespace khtml { const int UNDEFINED = -1; - // tqalignment + // alignment enum VAlign { VNone=0, Bottom, VCenter, Top, Baseline }; enum HAlign { HDefault, Left, HCenter, Right, HNone = 0 }; @@ -103,7 +103,7 @@ namespace khtml unsigned type : 3; bool quirk : 1; } l; - TQ_UINT32 _length; + Q_UINT32 _length; }; }; diff --git a/khtml/misc/knsplugininstaller.cpp b/khtml/misc/knsplugininstaller.cpp index 5cf5c7d01..1a9bf62bb 100644 --- a/khtml/misc/knsplugininstaller.cpp +++ b/khtml/misc/knsplugininstaller.cpp @@ -95,7 +95,7 @@ bool KNSPluginInstallEngine::pluginAvailable() if(!loadXmlConfig()) return false; - return tqfindPlugin(); + return findPlugin(); } bool KNSPluginInstallEngine::isActive() @@ -152,7 +152,7 @@ bool KNSPluginInstallEngine::loadXmlConfig() return true; } -bool KNSPluginInstallEngine::tqfindPlugin() +bool KNSPluginInstallEngine::findPlugin() { // get system infos @@ -428,12 +428,12 @@ void KNSPluginWizard::initLicencePage() void KNSPluginWizard::initInstallationProgressPage() { m_installationProgressWidget = new TQWidget(this); - TQVBoxLayout *tqlayout = new TQVBoxLayout(m_installationProgressWidget); - tqlayout->addWidget(new TQLabel(i18n("Installation in progress."), m_installationProgressWidget)); - tqlayout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding )); + TQVBoxLayout *layout = new TQVBoxLayout(m_installationProgressWidget); + layout->addWidget(new TQLabel(i18n("Installation in progress."), m_installationProgressWidget)); + layout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding )); m_installationProgressBar = new KProgress(m_installationProgressWidget); m_installationProgressBar->setTotalSteps(100); - tqlayout->addWidget(m_installationProgressBar); + layout->addWidget(m_installationProgressBar); addPage( m_installationProgressWidget, i18n("Plugin installation")); @@ -442,11 +442,11 @@ void KNSPluginWizard::initInstallationProgressPage() { void KNSPluginWizard::initFinishPage() { m_finishWidget = new TQWidget(this); - TQVBoxLayout *tqlayout = new TQVBoxLayout(m_finishWidget); - tqlayout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding )); + TQVBoxLayout *layout = new TQVBoxLayout(m_finishWidget); + layout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding )); m_finishLabel = new TQLabel(m_finishWidget); - tqlayout->addWidget(m_finishLabel); - tqlayout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding )); + layout->addWidget(m_finishLabel); + layout->addItem(new TQSpacerItem(40,20,TQSizePolicy::Expanding,TQSizePolicy::Expanding )); addPage(m_finishWidget, i18n("Installation status")); diff --git a/khtml/misc/knsplugininstaller.h b/khtml/misc/knsplugininstaller.h index 92dad0207..0d9535ba9 100644 --- a/khtml/misc/knsplugininstaller.h +++ b/khtml/misc/knsplugininstaller.h @@ -43,7 +43,7 @@ class TQStringList; /* - * This class tqcontains all the infos needed to install a given plugin + * This class contains all the infos needed to install a given plugin * Takes and parse a TQDomNode in its constructor */ class KNSPluginInfo @@ -87,7 +87,7 @@ private: * This class contain all the the methods used to perform a plugin installation * */ -class KNSPluginInstallEngine : public TQObject +class KNSPluginInstallEngine : public QObject { Q_OBJECT public: @@ -129,7 +129,7 @@ private: /* * parse the xml configuration file */ - bool tqfindPlugin(); + bool findPlugin(); TQMap<TQString, TQString> m_archMap; diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index 3f8c7c29f..d6e463b02 100644 --- a/khtml/misc/loader.cpp +++ b/khtml/misc/loader.cpp @@ -144,7 +144,7 @@ void CachedObject::deref(CachedObjectClient *c) assert( c ); assert( m_clients.count() ); assert( !canDelete() ); - assert( m_clients.tqfind( c ) ); + assert( m_clients.find( c ) ); Cache::flush(); @@ -213,7 +213,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI : CachedObject(url, CSSStyleSheet, _cachePolicy, 0) { // Set the type we want (probably css or xml) - TQString ah = TQString::tqfromLatin1( accept ); + TQString ah = TQString::fromLatin1( accept ); if ( !ah.isEmpty() ) ah += ","; ah += "*/*;q=0.1"; @@ -327,7 +327,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro // It's javascript we want. // But some websites think their scripts are <some wrong mimetype here> // and refuse to serve them if we only accept application/x-javascript. - setAccept( TQString::tqfromLatin1("*/*") ); + setAccept( TQString::fromLatin1("*/*") ); // load the file Cache::loader()->load(dl, this, false); m_loading = true; @@ -476,7 +476,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl pixPart = 0; bg = 0; scaled = 0; - bgColor = tqRgba( 0, 0, 0, 0xFF ); + bgColor = qRgba( 0, 0, 0, 0xFF ); typeChecked = false; isFullyTransparent = false; monochrome = false; @@ -526,7 +526,7 @@ void CachedImage::deref( CachedObjectClient *c ) const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int xHeight) { - static QRgb bgTransparent = tqRgba( 0, 0, 0, 0xFF ); + static QRgb bgTransparent = qRgba( 0, 0, 0, 0xFF ); TQSize s(pixmap_size()); int w = xWidth; @@ -564,7 +564,7 @@ const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int x bgSize = TQSize(xWidth, xHeight); //See whether we can - and should - pre-blend - if (isvalid && (r.hasAlphaChannel() || r.tqmask() )) { + if (isvalid && (r.hasAlphaChannel() || r.mask() )) { bg = new TQPixmap(xWidth, xHeight, r.depth()); bg->fill(newc); bitBlt(bg, 0, 0, src); @@ -692,10 +692,10 @@ void CachedImage::movieUpdated( const TQRect& r ) do_notify(m->framePixmap(), r); } -void CachedImage::movietqStatus(int status) +void CachedImage::movieStatus(int status) { #ifdef LOADER_DEBUG - qDebug("movietqStatus(%d)", status); + qDebug("movieStatus(%d)", status); #endif // ### the html image objects are supposed to send the load event after every frame (according to @@ -709,8 +709,8 @@ void CachedImage::movietqStatus(int status) const TQImage& im = m->frameImage(); monochrome = ( ( im.depth() <= 8 ) && ( im.numColors() - int( im.hasAlphaBuffer() ) <= 2 ) ); for (int i = 0; monochrome && i < im.numColors(); ++i) - if (im.colorTable()[i] != tqRgb(0xff, 0xff, 0xff) && - im.colorTable()[i] != tqRgb(0x00, 0x00, 0x00)) + if (im.colorTable()[i] != qRgb(0xff, 0xff, 0xff) && + im.colorTable()[i] != qRgb(0x00, 0x00, 0x00)) monochrome = false; if( (im.width() < 5 || im.height() < 5) && im.hasAlphaBuffer()) // only evaluate for small images { @@ -743,14 +743,14 @@ void CachedImage::movietqStatus(int status) { setShowAnimations( KHTMLSettings::KAnimationDisabled ); - // monochrome alphatqmasked images are usually about 10000 times + // monochrome alphamasked images are usually about 10000 times // faster to draw, so this is worth the hack if (p && monochrome && p->depth() > 1) { TQPixmap* pix = new TQPixmap; pix->convertFromImage( p->convertToImage().convertDepth( 1 ), MonoOnly|AvoidDither ); - if ( p->tqmask() ) - pix->setMask( *p->tqmask() ); + if ( p->mask() ) + pix->setMask( *p->mask() ); delete p; p = pix; monochrome = false; @@ -766,7 +766,7 @@ void CachedImage::movietqStatus(int status) { #ifdef LOADER_DEBUG TQRect r(valid_rect()); - qDebug("movie tqStatus frame update %d/%d/%d/%d, pixmap size %d/%d", r.x(), r.y(), r.right(), r.bottom(), + qDebug("movie Status frame update %d/%d/%d/%d, pixmap size %d/%d", r.x(), r.y(), r.right(), r.bottom(), pixmap().size().width(), pixmap().size().height()); #endif do_notify(pixmap(), valid_rect()); @@ -787,7 +787,7 @@ void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimati delete p; p = new TQPixmap(m->framePixmap()); m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); - m->disconnecttqStatus( this, TQT_SLOT( movietqStatus( int ) )); + m->disconnectStatus( this, TQT_SLOT( movieStatus( int ) )); m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie())); imgSource = 0; @@ -816,7 +816,7 @@ void CachedImage::clear() delete p; p = 0; delete bg; bg = 0; delete scaled; scaled = 0; - bgColor = tqRgba( 0, 0, 0, 0xff ); + bgColor = qRgba( 0, 0, 0, 0xff ); bgSize = TQSize(-1,-1); delete pixPart; pixPart = 0; @@ -850,7 +850,7 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof ) imgSource = new ImageSource( _buffer.buffer()); m = new TQMovie( imgSource, 8192 ); m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); - m->connecttqStatus( this, TQT_SLOT( movietqStatus(int))); + m->connectStatus( this, TQT_SLOT( movieStatus(int))); m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); } } @@ -902,9 +902,9 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof ) void CachedImage::finish() { - tqStatus oldtqStatus = m_status; + Status oldStatus = m_status; CachedObject::finish(); - if ( oldtqStatus != m_status ) { + if ( oldStatus != m_status ) { const TQPixmap &pm = pixmap(); do_notify( pm, pm.rect() ); } @@ -981,7 +981,7 @@ void DocLoader::setExpireDate(time_t _expireDate, bool relative) void DocLoader::insertCachedObject( CachedObject* o ) const { - if ( m_docObjects.tqfind(o) ) + if ( m_docObjects.find(o) ) return; m_docObjects.insert( o, o ); if ( m_docObjects.count() > 3 * m_docObjects.size() ) @@ -993,7 +993,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL) bool reload = false; if (m_cachePolicy == KIO::CC_Verify) { - if (!m_reloadedURLs.tqcontains(fullURL)) + if (!m_reloadedURLs.contains(fullURL)) { if (existing && existing->isExpired()) { @@ -1005,7 +1005,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL) } else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh)) { - if (!m_reloadedURLs.tqcontains(fullURL)) + if (!m_reloadedURLs.contains(fullURL)) { if (existing) { @@ -1078,7 +1078,7 @@ void DocLoader::setAutoloadImages( bool enable ) { CachedImage *img = const_cast<CachedImage*>( static_cast<const CachedImage *>( it.current()) ); - CachedObject::tqStatus status = img->status(); + CachedObject::Status status = img->status(); if ( status != CachedObject::Unknown ) continue; @@ -1167,7 +1167,7 @@ void Loader::servePendingRequests() { job->addMetaData( "cross-domain", part->toplevelURL().url() ); if (part->widget()) - job->setWindow (part->widget()->tqtopLevelWidget()); + job->setWindow (part->widget()->topLevelWidget()); } } @@ -1427,7 +1427,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify; TQString url = kurl.url(); - CachedObject* o = cache->tqfind(url); + CachedObject* o = cache->find(url); if ( o && o->type() != CachedType ) { removeCacheEntry( o ); @@ -1436,7 +1436,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c if ( o && dl->needReload( o, url ) ) { o = 0; - assert( cache->tqfind( url ) == 0 ); + assert( cache->find( url ) == 0 ); } if(!o) @@ -1464,7 +1464,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_data) { - CachedObject *o = cache->tqfind(url); + CachedObject *o = cache->find(url); if(o) removeCacheEntry(o); @@ -1474,7 +1474,7 @@ void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_d void Cache::preloadScript( const TQString &url, const TQString &script_data) { - CachedObject *o = cache->tqfind(url); + CachedObject *o = cache->find(url); if(o) removeCacheEntry(o); diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h index 2e62e7f39..4314e950e 100644 --- a/khtml/misc/loader.h +++ b/khtml/misc/loader.h @@ -91,7 +91,7 @@ namespace khtml Script }; - enum tqStatus { + enum Status { Unknown, // let imagecache decide what to do with it New, // inserting new image Pending, // only partially loaded @@ -127,8 +127,8 @@ namespace khtml int count() const { return m_clients.count(); } int accessCount() const { return m_accessCount; } - void setStatus(tqStatus s) { m_status = s; } - tqStatus status() const { return m_status; } + void setStatus(Status s) { m_status = s; } + Status status() const { return m_status; } virtual void setCharset( const TQString& /*charset*/ ) {} @@ -167,7 +167,7 @@ namespace khtml TQString m_accept; Request *m_request; Type m_type; - tqStatus m_status; + Status m_status; int m_accessCount; KIO::CacheControl m_cachePolicy; time_t m_expireDate; @@ -302,7 +302,7 @@ namespace khtml * gets called, whenever a TQMovie changes frame */ void movieUpdated( const TQRect &rect ); - void movietqStatus(int); + void movieStatus(int); void movieResize(const TQSize&); void deleteMovie(); @@ -405,7 +405,7 @@ namespace khtml /** * @internal */ - class Loader : public TQObject + class Loader : public QObject { Q_OBJECT @@ -486,7 +486,7 @@ namespace khtml /** * clears the cache * Warning: call this only at the end of your program, to clean - * up memory (useful for tqfinding memory holes) + * up memory (useful for finding memory holes) */ KDE_EXPORT static void clear(); diff --git a/khtml/misc/loader_jpeg.cpp b/khtml/misc/loader_jpeg.cpp index fe9b8620f..57174fe1b 100644 --- a/khtml/misc/loader_jpeg.cpp +++ b/khtml/misc/loader_jpeg.cpp @@ -305,7 +305,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* cinfo.src->bytes_in_buffer = (size_t) jsrc.valid_buffer_len; #ifdef BUFFER_DEBUG - qDebug("buffer tqcontains %d bytes", jsrc.valid_buffer_len); + qDebug("buffer contains %d bytes", jsrc.valid_buffer_len); #endif if(state == Init) @@ -358,7 +358,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* } else if ( cinfo.output_components == 1 ) { image.create( cinfo.output_width, cinfo.output_height, 8, 256 ); for (int i=0; i<256; i++) - image.setColor(i, tqRgb(i,i,i)); + image.setColor(i, qRgb(i,i,i)); } #ifdef JPEG_DEBUG @@ -431,7 +431,7 @@ again: for (uint i=cinfo.output_width; i--; ) { in-=3; - out[i] = tqRgb(in[0], in[1], in[2]); + out[i] = qRgb(in[0], in[1], in[2]); } } } diff --git a/khtml/misc/makeattrs b/khtml/misc/makeattrs index 1cf3c4b79..48a02c045 100644 --- a/khtml/misc/makeattrs +++ b/khtml/misc/makeattrs @@ -72,7 +72,7 @@ print header "const char* getAttrName(unsigned short id) KDE_NO_EXPORT;\n"; print header "\n#endif\n"; close header; -my $result = system("/bin/sh", "-c", "gperf -c -a -L 'ANSI-C' -P -G -D -E -C -o -t -k '*' -NtqfindAttr -Hhash_attr -Wwordlist_attr -Qspool_attr -s 2 htmlattrs.gperf > htmlattrs.c"); +my $result = system("/bin/sh", "-c", "gperf -c -a -L 'ANSI-C' -P -G -D -E -C -o -t -k '*' -NfindAttr -Hhash_attr -Wwordlist_attr -Qspool_attr -s 2 htmlattrs.gperf > htmlattrs.c"); if ($result) { unlink "htmlattrs.c"; exit $result; diff --git a/khtml/misc/maketags b/khtml/misc/maketags index e40c3e869..a460cf8e4 100644 --- a/khtml/misc/maketags +++ b/khtml/misc/maketags @@ -76,7 +76,7 @@ close out; print header "\n#endif\n"; close header; -my $result = system("/bin/sh", "-c", "gperf -a -L 'ANSI-C' -P -D -E -C -l -o -t -k '*' -NtqfindTag -Hhash_tag -Wwordlist_tag -Qspool_Tag htmltags.gperf > htmltags.c"); +my $result = system("/bin/sh", "-c", "gperf -a -L 'ANSI-C' -P -D -E -C -l -o -t -k '*' -NfindTag -Hhash_tag -Wwordlist_tag -Qspool_Tag htmltags.gperf > htmltags.c"); if ($result) { unlink "htmltags.c"; exit $result; diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h index 52a9c5fdb..125e8e07d 100644 --- a/khtml/misc/multimap.h +++ b/khtml/misc/multimap.h @@ -32,7 +32,7 @@ template<class T> class MultiMapPtrList; // KMultiMap is an implementaition of a Map with multiple entries per key. // It is originally designed to work like a shell for TQPtrDict<TQPtrList>, but -// TQPtrList have been tqreplaced with a much faster hash set. +// TQPtrList have been replaced with a much faster hash set. template<class T> class KMultiMap { public: @@ -42,7 +42,7 @@ public: typedef MultiMapPtrList<T> List; void append(void* key, T* element) { - List *list = dict.tqfind(key); + List *list = dict.find(key); if (!list){ list = new List(8); dict.insert(key, list); @@ -50,7 +50,7 @@ public: list->append(element); } void remove(void* key, T* element) { - List *list = dict.tqfind(key); + List *list = dict.find(key); if (list) { list->remove(element); if (list->isEmpty()) dict.remove(key); @@ -59,8 +59,8 @@ public: void remove(void* key) { dict.remove(key); } - List* tqfind(void* key) { - return dict.tqfind(key); + List* find(void* key) { + return dict.find(key); } private: TQPtrDict<List> dict; @@ -70,7 +70,7 @@ private: static inline unsigned int stupidHash(void* ptr) { unsigned long val = (unsigned long)ptr; - // remove tqalignment and multiply by a prime unlikely to be a factor of size + // remove alignment and multiply by a prime unlikely to be a factor of size val = (val >> 4) * 1237; return val; } @@ -147,7 +147,7 @@ public: } return false; } - bool tqcontains(void* e) { + bool contains(void* e) { if (count == 0) return false; unsigned int t_size = size(); unsigned int hash = stupidHash(e); @@ -277,10 +277,10 @@ public: t_current = t_next; } } - bool tqcontains(T* e) { + bool contains(T* e) { PtrListEntry *t_current = m_first; while (t_current) { - if (t_current->tqcontains(e)) return true; + if (t_current->contains(e)) return true; t_current = t_current->next; } return false; diff --git a/khtml/misc/stringit.h b/khtml/misc/stringit.h index d56a78397..789f22af8 100644 --- a/khtml/misc/stringit.h +++ b/khtml/misc/stringit.h @@ -46,7 +46,7 @@ public: DOMStringIt(TQChar *str, uint len) { s = str, l = len; lines = 0; } DOMStringIt(const TQString &str) - { s = str.tqunicode(); l = str.length(); lines = 0; } + { s = str.unicode(); l = str.length(); lines = 0; } DOMStringIt *operator++() { @@ -85,13 +85,13 @@ class TokenizerSubstring friend class TokenizerString; public: TokenizerSubstring() : m_length(0), m_current(0) {} - TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.tqunicode()) {} + TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.unicode()) {} TokenizerSubstring(const TQChar *str, int length) : m_length(length), m_current(length == 0 ? 0 : str) {} void clear() { m_length = 0; m_current = 0; } void appendTo(TQString &str) const { - if (m_string.tqunicode() == m_current) { + if (m_string.unicode() == m_current) { if (str.isEmpty()) str = m_string; else 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 diff --git a/khtml/test/align2.html b/khtml/test/align2.html index 18dbfc43e..56f3feb70 100644 --- a/khtml/test/align2.html +++ b/khtml/test/align2.html @@ -4,14 +4,14 @@ </HEAD> <BODY> <H1>Align Test 2</H1> -This page tqcontains regression tests for vertical tqalignment of images. +This page contains regression tests for vertical alignment of images. Each test consist of a table with a colored background. Within the table an empty image is shown with a border of 1 pixel around it. <HR> <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=10 width=50 border=1> -<FONT size=7>This image has no tqalignment</FONT> +<FONT size=7>This image has no alignment</FONT> </td></tr> </TABLE> <HR> @@ -39,7 +39,7 @@ Within the table an empty image is shown with a border of 1 pixel around it. <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=150 width=50 border=1> -<FONT size=7>This image has no tqalignment</FONT> +<FONT size=7>This image has no alignment</FONT> <IMG SRC="unknown.gif" height=50 width=50 border=1> </td></tr> </TABLE> @@ -68,7 +68,7 @@ Within the table an empty image is shown with a border of 1 pixel around it. <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=10 width=50 border=1> -<FONT>This image has no tqalignment</FONT> +<FONT>This image has no alignment</FONT> </td></tr> </TABLE> <HR> @@ -96,7 +96,7 @@ Within the table an empty image is shown with a border of 1 pixel around it. <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=150 width=50 border=1> -<FONT>This image has no tqalignment</FONT> +<FONT>This image has no alignment</FONT> <IMG SRC="unknown.gif" height=50 width=50 border=1> </td></tr> </TABLE> diff --git a/khtml/test/button.html b/khtml/test/button.html index 4ef6552f2..b9c3ae177 100644 --- a/khtml/test/button.html +++ b/khtml/test/button.html @@ -1,7 +1,7 @@ <html> <body bgcolor=white> text before -<button name=button type=submit value="this should get tqreplaced by the contents"> +<button name=button type=submit value="this should get replaced by the contents"> some text <table width=200 border=1> <tr><td bgcolor=red>1<td bgcolor=blue>2</tr> diff --git a/khtml/test/color.html b/khtml/test/color.html index a53940d68..ff5617214 100644 --- a/khtml/test/color.html +++ b/khtml/test/color.html @@ -4,7 +4,7 @@ </HEAD> <BODY> <H1>Color Test 1</H1> -This page tqcontains regression tests for the parsing of colors. +This page contains regression tests for the parsing of colors. Each test consist of a table with a colored background. Within the table the name of the color is written in black text. <HR> diff --git a/khtml/test/image_map.html b/khtml/test/image_map.html index 35d170d2a..21e002382 100644 --- a/khtml/test/image_map.html +++ b/khtml/test/image_map.html @@ -13,11 +13,11 @@ Moving the mouse cursor over the image should show different destinations <!-- =============== TOP IMAGE MAP =========== --> <MAP name="topbar"> -<AREA tqshape="rect" coords="90,0,120,18" href="http://www.kde.org/faq/kdefaq.html"> -<AREA tqshape="rect" coords="130,0,205,18" href="ftp://ftp.kde.org/pub/kde/"> -<AREA tqshape="rect" coords="215,0,295,18" href="http://www.kde.org/absolute_url.html"> -<AREA tqshape="rect" coords="305,0,355,18" href="relative_url_index.html"> -<AREA tqshape="default" nohref> +<AREA shape="rect" coords="90,0,120,18" href="http://www.kde.org/faq/kdefaq.html"> +<AREA shape="rect" coords="130,0,205,18" href="ftp://ftp.kde.org/pub/kde/"> +<AREA shape="rect" coords="215,0,295,18" href="http://www.kde.org/absolute_url.html"> +<AREA shape="rect" coords="305,0,355,18" href="relative_url_index.html"> +<AREA shape="default" nohref> </MAP> </BODY> diff --git a/khtml/test/lake.class b/khtml/test/lake.class Binary files differindex dfd476292..3196702b1 100644 --- a/khtml/test/lake.class +++ b/khtml/test/lake.class diff --git a/khtml/test/nbsp.html b/khtml/test/nbsp.html index e64c23c7f..7a8bde9de 100644 --- a/khtml/test/nbsp.html +++ b/khtml/test/nbsp.html @@ -4,7 +4,7 @@ <body> <H1>NBSP Test</H1> This page is a regression test to test non-breaking spaces.<BR> -The following text tqcontains normal and non-breaking spaces.<BR> +The following text contains normal and non-breaking spaces.<BR> After each 'a' a non-breaking space occurs. After each 'b' a breaking space occurs: <HR> diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 70a34b984..288f0df6b 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -92,7 +92,7 @@ #include <kparts/browserextension.h> #include "khtmlview.h" -#include "rendering/render_tqreplaced.h" +#include "rendering/render_replaced.h" #include "xml/dom_docimpl.h" #include "html/html_baseimpl.h" #include "dom/dom_doc.h" @@ -215,9 +215,9 @@ Value RegTestFunction::call(ExecState *exec, Object &/*thisObj*/, const List &ar switch (id) { case Print: { UString str = args[0].toString(exec); - if ( str.qstring().lower().tqfind( "failed!" ) >= 0 ) + if ( str.qstring().lower().find( "failed!" ) >= 0 ) m_regTest->saw_failure = true; - TQString res = str.qstring().tqreplace('\007', ""); + TQString res = str.qstring().replace('\007', ""); m_regTest->m_currentOutput += res + "\n"; break; } @@ -236,7 +236,7 @@ Value RegTestFunction::call(ExecState *exec, Object &/*thisObj*/, const List &ar if ( docimpl && docimpl->view() && docimpl->renderer() ) { docimpl->updateRendering(); - docimpl->view()->tqlayout(); + docimpl->view()->layout(); } TQString filename = args[0].toString(exec).qstring(); filename = RegressionTest::curr->m_currentCategory+"/"+filename; @@ -676,7 +676,7 @@ RegressionTest::RegressionTest(KHTMLPart *part, const TQString &baseDir, const T { m_part = part; m_baseDir = baseDir; - m_baseDir = m_baseDir.tqreplace( "//", "/" ); + m_baseDir = m_baseDir.replace( "//", "/" ); if ( m_baseDir.endsWith( "/" ) ) m_baseDir = m_baseDir.left( m_baseDir.length() - 1 ); if (outputDir.isEmpty()) @@ -770,16 +770,16 @@ bool RegressionTest::runTests(TQString relPath, bool mustExist, int known_failur TQString filename = sourceDir[fileno]; TQString relFilename = relPath.isEmpty() ? filename : relPath+"/"+filename; - if (filename == "." || filename == ".." || ignoreFiles.tqcontains(filename) ) + if (filename == "." || filename == ".." || ignoreFiles.contains(filename) ) continue; int failure_type = NoFailure; - if ( failureFiles.tqcontains( filename ) ) + if ( failureFiles.contains( filename ) ) failure_type |= AllFailure; - if ( failureFiles.tqcontains ( filename + "-render" ) ) + if ( failureFiles.contains ( filename + "-render" ) ) failure_type |= RenderFailure; - if ( failureFiles.tqcontains ( filename + "-dump.png" ) ) + if ( failureFiles.contains ( filename + "-dump.png" ) ) failure_type |= PaintFailure; - if ( failureFiles.tqcontains ( filename + "-dom" ) ) + if ( failureFiles.contains ( filename + "-dom" ) ) failure_type |= DomFailure; runTests(relFilename, false, failure_type ); } @@ -849,7 +849,7 @@ void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* pa if ( node.handle()->id() == ID_FRAME ) { outputStream << endl; TQString frameName = static_cast<DOM::HTMLFrameElementImpl *>( node.handle() )->name.string(); - KHTMLPart* frame = part->tqfindFrame( frameName ); + KHTMLPart* frame = part->findFrame( frameName ); Q_ASSERT( frame ); if ( frame ) getPartDOMOutput( outputStream, frame, indent ); @@ -923,7 +923,7 @@ void RegressionTest::dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part names.sort(); for ( TQStringList::iterator it = names.begin(); it != names.end(); ++it ) { outputStream << "FRAME: " << (*it) << "\n"; - KHTMLPart* frame = part->tqfindFrame( (*it) ); + KHTMLPart* frame = part->findFrame( (*it) ); Q_ASSERT( frame ); if ( frame ) dumpRenderTree( outputStream, frame ); @@ -943,7 +943,7 @@ TQString RegressionTest::getPartOutput( OutputType type) getPartDOMOutput( outputStream, m_part, 0 ); } - dump.tqreplace( m_baseDir + "/tests", TQString::tqfromLatin1( "REGRESSION_SRCDIR" ) ); + dump.replace( m_baseDir + "/tests", TQString::fromLatin1( "REGRESSION_SRCDIR" ) ); return dump; } @@ -1000,9 +1000,9 @@ bool RegressionTest::imageEqual( const TQImage &lhsi, const TQImage &rhsi ) for ( int x = 0; x < w; ++x ) { QRgb l = ls[x]; QRgb r = rs[x]; - if ( ( abs( tqRed( l ) - tqRed(r ) ) < 20 ) && - ( abs( tqGreen( l ) - tqGreen(r ) ) < 20 ) && - ( abs( tqBlue( l ) - tqBlue(r ) ) < 20 ) ) + if ( ( abs( qRed( l ) - qRed(r ) ) < 20 ) && + ( abs( qGreen( l ) - qGreen(r ) ) < 20 ) && + ( abs( qBlue( l ) - qBlue(r ) ) < 20 ) ) continue; kdDebug() << "pixel (" << x << ", " << y << ") is different " << TQColor( lhsi.pixel ( x, y ) ) << " " << TQColor( rhsi.pixel ( x, y ) ) << endl; return false; @@ -1045,15 +1045,15 @@ void RegressionTest::doJavascriptReport( const TQString &test ) cl = TQString( "<html><head><title>%1</title>" ).arg( test ); cl += "<body><tt>"; TQString text = "\n" + m_currentOutput; - text.tqreplace( '<', "<" ); - text.tqreplace( '>', ">" ); - text.tqreplace( TQRegExp( "\nFAILED" ), "\n<span style='color: red'>FAILED</span>" ); - text.tqreplace( TQRegExp( "\nFAIL" ), "\n<span style='color: red'>FAIL</span>" ); - text.tqreplace( TQRegExp( "\nPASSED" ), "\n<span style='color: green'>PASSED</span>" ); - text.tqreplace( TQRegExp( "\nPASS" ), "\n<span style='color: green'>PASS</span>" ); + text.replace( '<', "<" ); + text.replace( '>', ">" ); + text.replace( TQRegExp( "\nFAILED" ), "\n<span style='color: red'>FAILED</span>" ); + text.replace( TQRegExp( "\nFAIL" ), "\n<span style='color: red'>FAIL</span>" ); + text.replace( TQRegExp( "\nPASSED" ), "\n<span style='color: green'>PASSED</span>" ); + text.replace( TQRegExp( "\nPASS" ), "\n<span style='color: green'>PASS</span>" ); if ( text.at( 0 ) == '\n' ) text = text.mid( 1, text.length() ); - text.tqreplace( '\n', "<br>\n" ); + text.replace( '\n', "<br>\n" ); cl += text; cl += "</tt></body></html>"; compare.writeBlock( cl.latin1(), cl.length() ); @@ -1063,7 +1063,7 @@ void RegressionTest::doJavascriptReport( const TQString &test ) /** returns the path in a way that is relatively reachable from base. * @param base base directory (must not include trailing slash) * @param path directory/file to be relatively reached by base - * @return path with all elements tqreplaced by .. and concerning path elements + * @return path with all elements replaced by .. and concerning path elements * to be relatively reachable from base. */ static TQString makeRelativePath(const TQString &base, const TQString &path) @@ -1077,10 +1077,10 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) int pos = 0; do { pos++; - int newpos = absBase.tqfind('/', pos); + int newpos = absBase.find('/', pos); if (newpos == -1) newpos = absBase.length(); - TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos); - TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos); + TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos); + TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos); // kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl; // kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl; // kdDebug() << "pos: " << pos << " newpos: " << newpos << endl; @@ -1094,11 +1094,11 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) TQString rel; { - TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos); - TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos); + TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos); + TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos); // generate as many .. as there are path elements in relBase if (relBase.string().length() > 0) { - for (int i = relBase.string().tqcontains('/'); i > 0; --i) + for (int i = relBase.string().contains('/'); i > 0; --i) rel += "../"; rel += ".."; if (relPath.string().length() > 0) rel += "/"; @@ -1138,13 +1138,13 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) if ( failures & RenderFailure ) { renderDiff += "<pre>"; - FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-render %3/%2-render" ) + FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-render %3/%2-render" ) .arg ( test, test, relOutputDir ).latin1(), "r" ); TQTextIStream *is = new TQTextIStream( pipe ); for ( int line = 0; line < 100 && !is->eof(); ++line ) { TQString line = is->readLine(); - line = line.tqreplace( '<', "<" ); - line = line.tqreplace( '>', ">" ); + line = line.replace( '<', "<" ); + line = line.replace( '>', ">" ); renderDiff += line + "\n"; } delete is; @@ -1154,13 +1154,13 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) if ( failures & DomFailure ) { domDiff += "<pre>"; - FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-dom %3/%2-dom" ) + FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-dom %3/%2-dom" ) .arg ( test, test, relOutputDir ).latin1(), "r" ); TQTextIStream *is = new TQTextIStream( pipe ); for ( int line = 0; line < 100 && !is->eof(); ++line ) { TQString line = is->readLine(); - line = line.tqreplace( '<', "<" ); - line = line.tqreplace( '>', ">" ); + line = line.replace( '<', "<" ); + line = line.replace( '>', ">" ); domDiff += line + "\n"; } delete is; @@ -1254,7 +1254,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) void RegressionTest::testStaticFile(const TQString & filename) { - tqApp->mainWidget()->resize( 800, 600); // restore size + qApp->mainWidget()->resize( 800, 600); // restore size // Set arguments KParts::URLArgs args; @@ -1400,11 +1400,11 @@ public: void RegressionTest::testJSFile(const TQString & filename ) { - tqApp->mainWidget()->resize( 800, 600); // restore size + qApp->mainWidget()->resize( 800, 600); // restore size // create interpreter // note: this is different from the interpreter used by the part, - // it tqcontains regression test-specific objects & functions + // it contains regression test-specific objects & functions Object global(new GlobalImp()); khtml::ChildFrame frame; frame.m_part = m_part; @@ -1571,7 +1571,7 @@ void RegressionTest::printDescription(const TQString& description) if (!description.isEmpty()) { TQString desc = description; - desc.tqreplace( '\n', ' ' ); + desc.replace( '\n', ' ' ); printf(" [%s]", desc.latin1()); } @@ -1591,7 +1591,7 @@ void RegressionTest::createMissingDirs(const TQString & filename) pathComponents.prepend(parentDir.absFilePath()); while (!parentDir.exists()) { TQString parentPath = parentDir.absFilePath(); - int slashPos = parentPath.tqfindRev('/'); + int slashPos = parentPath.findRev('/'); if (slashPos < 0) break; parentPath = parentPath.left(slashPos); @@ -1636,7 +1636,7 @@ bool RegressionTest::svnIgnored( const TQString &filename ) void RegressionTest::resizeTopLevelWidget( int w, int h ) { - tqApp->mainWidget()->resize( w, h ); + qApp->mainWidget()->resize( w, h ); // Since we're not visible, this doesn't have an immediate effect, TQWidget posts the event TQApplication::sendPostedEvents( 0, TQEvent::Resize ); } diff --git a/khtml/test_regression.h b/khtml/test_regression.h index df76f4439..1ec4e7d33 100644 --- a/khtml/test_regression.h +++ b/khtml/test_regression.h @@ -36,7 +36,7 @@ class TQTimer; /** * @internal */ -class PartMonitor : public TQObject +class PartMonitor : public QObject { Q_OBJECT public: @@ -122,7 +122,7 @@ class ScriptInterpreter; /** * @internal */ -class RegressionTest : public TQObject +class RegressionTest : public QObject { Q_OBJECT public: diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp index 5bbd05d31..a10146480 100644 --- a/khtml/test_regression_fontoverload.cpp +++ b/khtml/test_regression_fontoverload.cpp @@ -98,7 +98,7 @@ QFakeFontEngine::QFakeFontEngine( XFontStruct *fs, const char *name, int size ) : QFontEngineXLFD( fs, name, 0) { pixS = size; - ahem = TQString::tqfromLatin1(name).tqcontains("ahem"); + ahem = TQString::fromLatin1(name).contains("ahem"); } QFakeFontEngine::~QFakeFontEngine() @@ -152,7 +152,7 @@ int QFakeFontEngine::leading() const // the original uses double and creates quite random results depending // on the compiler flags int l = ( _size * 15 + 50) / 100; - // only valid on i386 without -O2 assert(l == int(tqRound(_size * 0.15))); + // only valid on i386 without -O2 assert(l == int(qRound(_size * 0.15))); return (l > 0) ? l : 1; } @@ -207,7 +207,7 @@ static TQString helv_pickxlfd( int pixelsize, bool italic, bool bold ) } KDE_EXPORT QFontEngine * -TQFontDatabase::tqfindFont( TQFont::Script script, const QFontPrivate *fp, +TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp, const QFontDef &request, int ) { TQString xlfd; @@ -361,7 +361,7 @@ void KApplication::dcopFailure( const TQString & ) #include <kparts/historyprovider.h> -bool KParts::HistoryProvider::tqcontains( const TQString& t ) const +bool KParts::HistoryProvider::contains( const TQString& t ) const { return ( t == "http://www.kde.org/" || t == "http://www.google.com/"); } diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp index d98d875b2..7765cee8a 100644 --- a/khtml/testkhtml.cpp +++ b/khtml/testkhtml.cpp @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) TQObject::connect( doc, TQT_SIGNAL(completed()), dummy, TQT_SLOT(handleDone()) ); - if (args->url(0).url().right(4).tqfind(".xml", 0, false) == 0) { + if (args->url(0).url().right(4).find(".xml", 0, false) == 0) { KParts::URLArgs ags(doc->browserExtension()->urlArgs()); ags.serviceType = "text/xml"; doc->browserExtension()->setURLArgs(ags); @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) doc->setURLCursor(TQCursor(Qt::PointingHandCursor)); a.setTopWidget(doc->widget()); TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)), - doc->widget()->tqtopLevelWidget(), TQT_SLOT(setCaption(const TQString &))); + doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &))); doc->widget()->show(); toplevel->show(); ((TQScrollView *)doc->widget())->viewport()->show(); @@ -142,7 +142,7 @@ void Dummy::doBenchmark() results.clear(); TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(), - TQString::tqfromLatin1("Please select directory with tests")); + TQString::fromLatin1("Please select directory with tests")); if (!directory.isEmpty()) { settings.writePathEntry("path", directory); @@ -184,14 +184,14 @@ void Dummy::nextRun() for (int pos = 0; pos < timings.size(); ++pos) { int t = timings[pos]; if (pos < COLD_RUNS) - m_part->write(TQString::tqfromLatin1("<td>(Cold):") + TQString::number(t) + "</td>"); + m_part->write(TQString::fromLatin1("<td>(Cold):") + TQString::number(t) + "</td>"); else { total += t; - m_part->write(TQString::tqfromLatin1("<td><i>") + TQString::number(t) + "</i></td>"); + m_part->write(TQString::fromLatin1("<td><i>") + TQString::number(t) + "</i></td>"); } } - m_part->write(TQString::tqfromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>"); + m_part->write(TQString::fromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>"); m_part->write("</tr>"); } diff --git a/khtml/testkhtml.h b/khtml/testkhtml.h index 4fd76d044..b945ec942 100644 --- a/khtml/testkhtml.h +++ b/khtml/testkhtml.h @@ -8,7 +8,7 @@ /** * @internal */ -class Dummy : public TQObject +class Dummy : public QObject { Q_OBJECT public: diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp index 25e595baa..bcc2fca3a 100644 --- a/khtml/xml/dom2_eventsimpl.cpp +++ b/khtml/xml/dom2_eventsimpl.cpp @@ -48,7 +48,7 @@ EventImpl::EventImpl() m_currentTarget = 0; m_eventPhase = 0; m_target = 0; - m_createTime = TQDateTime::tqcurrentDateTime(); + m_createTime = TQDateTime::currentDateTime(); m_defaultHandled = false; } @@ -67,7 +67,7 @@ EventImpl::EventImpl(EventId _id, bool canBubbleArg, bool cancelableArg) m_currentTarget = 0; m_eventPhase = 0; m_target = 0; - m_createTime = TQDateTime::tqcurrentDateTime(); + m_createTime = TQDateTime::currentDateTime(); m_defaultHandled = false; } @@ -499,14 +499,14 @@ public: } L toLeft(R r) { - TQMapIterator<R,L> i( m_rToL.tqfind(r) ); + TQMapIterator<R,L> i( m_rToL.find(r) ); if (i != m_rToL.end()) return *i; return L(); } R toRight(L l) { - TQMapIterator<L,R> i = m_lToR.tqfind(l); + TQMapIterator<L,R> i = m_lToR.find(l); if (i != m_lToR.end()) return *i; return R(); @@ -590,10 +590,10 @@ KeyEventBaseImpl::KeyEventBaseImpl(EventId id, bool canBubbleArg, bool cancelabl m_keyVal = key->ascii(); m_virtKeyVal = virtKeyToQtKey()->toLeft(key->key()); - // m_keyVal should contain the tqunicode value + // m_keyVal should contain the unicode value // of the pressed key if available. if (m_virtKeyVal == DOM_VK_UNDEFINED && !key->text().isEmpty()) - m_keyVal = key->text().tqunicode()[0]; + m_keyVal = key->text().unicode()[0]; // key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together. m_modifier = key->state(); @@ -739,18 +739,18 @@ DOMString KeyboardEventImpl::keyIdentifier() const { if (unsigned special = virtKeyVal()) if (const char* id = keyIdentifiersToVirtKeys()->toLeft(special)) - return TQString::tqfromLatin1(id); + return TQString::fromLatin1(id); - if (unsigned tqunicode = keyVal()) - return TQString(TQChar(tqunicode)); + if (unsigned unicode = keyVal()) + return TQString(TQChar(unicode)); return "Unidentified"; } bool KeyboardEventImpl::getModifierState (const DOMString& keyIdentifierArg) const { - unsigned tqmask = keyModifiersToCode()->toRight(keyIdentifierArg.string().latin1()); - return m_modifier & tqmask; + unsigned mask = keyModifiersToCode()->toRight(keyIdentifierArg.string().latin1()); + return m_modifier & mask; } bool KeyboardEventImpl::isKeyboardEvent() const @@ -773,9 +773,9 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg, //Figure out the code information from the key identifier. if (keyIdentifierArg.length() == 1) { - //Likely to be normal tqunicode id, unless it's one of the few + //Likely to be normal unicode id, unless it's one of the few //special values. - unsigned short code = keyIdentifierArg.tqunicode()[0]; + unsigned short code = keyIdentifierArg.unicode()[0]; if (code > 0x20 && code != 0x7F) keyVal = code; } @@ -790,8 +790,8 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg, unsigned modifiers = 0; for (TQStringList::Iterator i = mods.begin(); i != mods.end(); ++i) - if (unsigned tqmask = keyModifiersToCode()->toRight((*i).latin1())) - modifiers |= tqmask; + if (unsigned mask = keyModifiersToCode()->toRight((*i).latin1())) + modifiers |= mask; initKeyBaseEvent(typeArg, canBubbleArg, cancelableArg, viewArg, keyVal, virtKeyVal, modifiers); @@ -819,7 +819,7 @@ int KeyboardEventImpl::keyCode() const if (m_virtKeyVal != DOM_VK_UNDEFINED) return m_virtKeyVal; else - return TQChar((unsigned short)m_keyVal).upper().tqunicode(); + return TQChar((unsigned short)m_keyVal).upper().unicode(); } int KeyboardEventImpl::charCode() const @@ -856,14 +856,14 @@ void TextEventImpl::initTextEvent(const DOMString &typeArg, //See whether we can get a key out of this. unsigned keyCode = 0; if (text.length() == 1) - keyCode = text.tqunicode()[0].tqunicode(); + keyCode = text.unicode()[0].unicode(); initKeyBaseEvent(typeArg, canBubbleArg, cancelableArg, viewArg, keyCode, 0, 0); } int TextEventImpl::keyCode() const { - //Mozilla returns 0 here unless this is a non-tqunicode key. + //Mozilla returns 0 here unless this is a non-unicode key. //IE stuffs everything here, and so we try to match it.. if (m_keyVal) return m_keyVal; @@ -872,8 +872,8 @@ int TextEventImpl::keyCode() const int TextEventImpl::charCode() const { - //On text events, in Mozilla charCode is 0 for non-tqunicode keys, - //and the tqunicode key otherwise... IE doesn't support this. + //On text events, in Mozilla charCode is 0 for non-unicode keys, + //and the unicode key otherwise... IE doesn't support this. if (m_virtKeyVal) return 0; return m_keyVal; diff --git a/khtml/xml/dom2_rangeimpl.cpp b/khtml/xml/dom2_rangeimpl.cpp index 0670c10dd..b160ce23f 100644 --- a/khtml/xml/dom2_rangeimpl.cpp +++ b/khtml/xml/dom2_rangeimpl.cpp @@ -833,14 +833,14 @@ DOMString RangeImpl::toString( int &exceptioncode ) * psuedo code: * * if start container is not text: - * count through the children to tqfind where we start (m_startOffset children) + * count through the children to find where we start (m_startOffset children) * * loop from the start position: * if the current node is text, add the text to our variable 'text', truncating/removing if at the end/start. * * if the node has children, step to the first child. * if the node has no children but does have siblings, step to the next sibling - * until we tqfind a sibling, go to next the parent but: + * until we find a sibling, go to next the parent but: * make sure this sibling isn't past the end of where we are supposed to go. (position > endOffset and the parent is the endContainer) * */ diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp index 6faeff108..36570d69a 100644 --- a/khtml/xml/dom_docimpl.cpp +++ b/khtml/xml/dom_docimpl.cpp @@ -128,7 +128,7 @@ DocumentTypeImpl *DOMImplementationImpl::createDocumentType( const DOMString &qu return 0; } - // INVALID_CHARACTER_ERR: Raised if the specified qualified name tqcontains an illegal character. + // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character. if (!Element::khtmlValidQualifiedName(qualifiedName)) { exceptioncode = DOMException::INVALID_CHARACTER_ERR; return 0; @@ -232,7 +232,7 @@ void ElementMappingCache::add(const TQString& id, ElementImpl* nd) { if (id.isEmpty()) return; - ItemInfo* info = m_dict.tqfind(id); + ItemInfo* info = m_dict.find(id); if (info) { info->ref++; @@ -251,7 +251,7 @@ void ElementMappingCache::set(const TQString& id, ElementImpl* nd) { if (id.isEmpty()) return; - ItemInfo* info = m_dict.tqfind(id); + ItemInfo* info = m_dict.find(id); info->nd = nd; } @@ -259,7 +259,7 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd) { if (id.isEmpty()) return; - ItemInfo* info = m_dict.tqfind(id); + ItemInfo* info = m_dict.find(id); info->ref--; if (info->ref == 0) { @@ -273,16 +273,16 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd) } } -bool ElementMappingCache::tqcontains(const TQString& id) +bool ElementMappingCache::contains(const TQString& id) { if (id.isEmpty()) return false; - return m_dict.tqfind(id); + return m_dict.find(id); } ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id) { if (id.isEmpty()) return 0; - return m_dict.tqfind(id); + return m_dict.find(id); } static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter; @@ -337,7 +337,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v) m_namespaceMap = new IdNameMapping(1); TQString xhtml(XHTML_NAMESPACE); m_namespaceMap->names.insert(emptyNamespace, new DOMStringImpl("")); - m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.tqunicode(), xhtml.length())); + m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.unicode(), xhtml.length())); m_namespaceMap->names[emptyNamespace]->ref(); m_namespaceMap->names[xhtmlNamespace]->ref(); m_namespaceMap->count+=2; @@ -1165,7 +1165,7 @@ void DocumentImpl::recalcStyle( StyleChange change ) //kdDebug( 6020 ) << "TIME: recalcStyle() dt=" << qt.elapsed() << endl; if (changed() && m_view) - m_view->tqlayout(); + m_view->layout(); bail_out: setChanged( false ); @@ -1219,9 +1219,9 @@ void DocumentImpl::updateLayout() updateRendering(); - // Only do a tqlayout if changes have occurred that make it necessary. + // Only do a layout if changes have occurred that make it necessary. if (m_view && renderer() && renderer()->needsLayout()) - m_view->tqlayout(); + m_view->layout(); m_ignorePendingStylesheets = oldIgnore; } @@ -1387,7 +1387,7 @@ void DocumentImpl::write( const TQString &text ) if (m_view) m_view->part()->resetFromScript(); m_tokenizer->setAutoClose(); - write(TQString::tqfromLatin1("<html>")); + write(TQString::fromLatin1("<html>")); } m_tokenizer->write(text, false); } @@ -1461,7 +1461,7 @@ NodeImpl *DocumentImpl::nextFocusNode(NodeImpl *fromNode) } if (fromTabIndex == 0) { - // Just need to tqfind the next selectable node after fromNode (in document order) that doesn't have a tab index + // Just need to find the next selectable node after fromNode (in document order) that doesn't have a tab index NodeImpl *n = fromNode->traverseNextNode(); while (n && !(n->isTabFocusable() && n->tabIndex() == 0)) n = n->traverseNextNode(); @@ -1471,7 +1471,7 @@ NodeImpl *DocumentImpl::nextFocusNode(NodeImpl *fromNode) // Find the lowest tab index out of all the nodes except fromNode, that is greater than or equal to fromNode's // tab index. For nodes with the same tab index as fromNode, we are only interested in those that come after // fromNode in document order. - // If we don't tqfind a suitable tab index, the next focus node will be one with a tab index of 0. + // If we don't find a suitable tab index, the next focus node will be one with a tab index of 0. unsigned short lowestSuitableTabIndex = 65535; NodeImpl *n; @@ -1578,7 +1578,7 @@ NodeImpl *DocumentImpl::previousFocusNode(NodeImpl *fromNode) // Find the lowest tab index out of all the nodes except fromNode, that is less than or equal to fromNode's // tab index. For nodes with the same tab index as fromNode, we are only interested in those before // fromNode. - // If we don't tqfind a suitable tab index, then there will be no previous focus node. + // If we don't find a suitable tab index, then there will be no previous focus node. unsigned short highestSuitableTabIndex = 0; NodeImpl *n; @@ -1622,7 +1622,7 @@ NodeImpl *DocumentImpl::previousFocusNode(NodeImpl *fromNode) } } -ElementImpl* DocumentImpl::tqfindAccessKeyElement(TQChar c) +ElementImpl* DocumentImpl::findAccessKeyElement(TQChar c) { c = c.upper(); for( NodeImpl* n = this; @@ -1668,9 +1668,9 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con { // get delay and url TQString str = content.string().stripWhiteSpace(); - int pos = str.tqfind(TQRegExp("[;,]")); + int pos = str.find(TQRegExp("[;,]")); if ( pos == -1 ) - pos = str.tqfind(TQRegExp("[ \t]")); + pos = str.find(TQRegExp("[ \t]")); bool ok = false; int delay = kMax( 0, content.implementation()->toInt(&ok) ); @@ -1685,7 +1685,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con pos++; while(pos < (int)str.length() && str[pos].isSpace()) pos++; str = str.mid(pos); - if(str.tqfind("url", 0, false ) == 0) str = str.mid(3); + if(str.find("url", 0, false ) == 0) str = str.mid(3); str = str.stripWhiteSpace(); if ( str.length() && str[0] == '=' ) str = str.mid( 1 ).stripWhiteSpace(); while(str.length() && @@ -1881,17 +1881,17 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI, TQString name = cs ? n.string() : n.string().upper(); if (!_nsURI) { - id = (NodeImpl::Id)(long) map->ids.tqfind( name ); + id = (NodeImpl::Id)(long) map->ids.find( name ); if (!id && _type != NodeImpl::NamespaceId) { - id = (NodeImpl::Id)(long) map->ids.tqfind( "aliases: " + name ); + id = (NodeImpl::Id)(long) map->ids.find( "aliases: " + name ); } } else { - id = (NodeImpl::Id)(long) map->ids.tqfind( name ); + id = (NodeImpl::Id)(long) map->ids.find( name ); if (!readonly && id && _prefix && _prefix->l) { // we were called in registration mode... check if the alias exists TQConstString px( _prefix->s, _prefix->l ); TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name); - if (!map->ids.tqfind( qn )) { + if (!map->ids.find( qn )) { map->ids.insert( qn, (void*)id ); } } @@ -2067,7 +2067,7 @@ void DocumentImpl::recalcStyleSelector() TQPtrList<StyleSheetImpl> oldStyleSheets = m_styleSheets->styleSheets; m_styleSheets->styleSheets.clear(); - TQString sheetUsed = view() ? view()->part()->d->m_sheetUsed.tqreplace("&&", "&") : TQString(); + TQString sheetUsed = view() ? view()->part()->d->m_sheetUsed.replace("&&", "&") : TQString(); bool autoselect = sheetUsed.isEmpty(); if (autoselect && !m_preferredStylesheetSet.isEmpty()) sheetUsed = m_preferredStylesheetSet.string(); @@ -2141,9 +2141,9 @@ void DocumentImpl::recalcStyleSelector() if ( title != sheetUsed ) sheet = 0; // don't use it - title = title.tqreplace('&', "&&"); + title = title.replace('&', "&&"); - if ( !m_availableSheets.tqcontains( title ) ) + if ( !m_availableSheets.contains( title ) ) m_availableSheets.append( title ); } } @@ -2170,7 +2170,7 @@ void DocumentImpl::recalcStyleSelector() // or we found the sheet we selected if (sheetUsed.isEmpty() || (!canResetSheet && tokenizer()) || - m_availableSheets.tqcontains(sheetUsed)) { + m_availableSheets.contains(sheetUsed)) { break; } @@ -2280,7 +2280,7 @@ void DocumentImpl::setFocusNode(NodeImpl *newFocusNode) if (m_focusNode != newFocusNode) return; // eww, I suck. set the qt focus correctly - // ### tqfind a better place in the code for this + // ### find a better place in the code for this if (view()) { if (!m_focusNode->renderer() || !m_focusNode->renderer()->isWidget()) view()->setFocus(); @@ -2690,7 +2690,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo( //Check to see if we have this sort of item cached. NodeListImpl::Cache* cached = - (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.tqfind(key.hash()); + (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.find(key.hash()); if (cached) { if (cached->key == key) { @@ -2710,7 +2710,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo( if (type != NodeListImpl::UNCACHEABLE) { newInfo->ref(); //Add the cache's reference - m_nodeListCache.tqreplace(key.hash(), newInfo); + m_nodeListCache.replace(key.hash(), newInfo); } return newInfo; diff --git a/khtml/xml/dom_docimpl.h b/khtml/xml/dom_docimpl.h index be26b0737..5e50c09a4 100644 --- a/khtml/xml/dom_docimpl.h +++ b/khtml/xml/dom_docimpl.h @@ -166,7 +166,7 @@ public: /** Returns true if the item exists */ - bool tqcontains(const TQString& id); + bool contains(const TQString& id); /** Returns the information for the given ID @@ -198,7 +198,7 @@ public: DocumentFragmentImpl *createDocumentFragment (); TextImpl *createTextNode ( DOMStringImpl* data ) { return new TextImpl( docPtr(), data); } TextImpl *createTextNode ( const TQString& data ) - { return createTextNode(new DOMStringImpl(data.tqunicode(), data.length())); } + { return createTextNode(new DOMStringImpl(data.unicode(), data.length())); } CommentImpl *createComment ( DOMStringImpl* data ); CDATASectionImpl *createCDATASection ( DOMStringImpl* data ); ProcessingInstructionImpl *createProcessingInstruction ( const DOMString &target, DOMStringImpl* data ); @@ -485,7 +485,7 @@ public: */ NodeImpl *previousFocusNode(NodeImpl *fromNode); - ElementImpl* tqfindAccessKeyElement(TQChar c); + ElementImpl* findAccessKeyElement(TQChar c); int nodeAbsIndex(NodeImpl *node); NodeImpl *nodeWithAbsIndex(int absIndex); @@ -616,7 +616,7 @@ protected: TQConstString px( _prefix->s, _prefix->l ); TQString name = cs ? n.string() : n.string().upper(); TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name); - if (!ids.tqfind( qn )) { + if (!ids.find( qn )) { ids.insert( qn, (void*)id ); } } diff --git a/khtml/xml/dom_elementimpl.cpp b/khtml/xml/dom_elementimpl.cpp index 21401e106..c41bef3dc 100644 --- a/khtml/xml/dom_elementimpl.cpp +++ b/khtml/xml/dom_elementimpl.cpp @@ -855,7 +855,7 @@ DOMString ElementImpl::toString() const for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) { DOMString kid = child->toString(); - result += TQConstString(kid.tqunicode(), kid.length()).string(); + result += TQConstString(kid.unicode(), kid.length()).string(); } result += "</"; @@ -972,11 +972,11 @@ NodeImpl *NamedAttrMapImpl::getNamedItem ( NodeImpl::Id id, bool nsAware, DOMStr { if (!m_element) return 0; - unsigned int tqmask = nsAware ? ~0L : NodeImpl_IdLocalMask; - id = (id & tqmask); + unsigned int mask = nsAware ? ~0L : NodeImpl_IdLocalMask; + id = (id & mask); for (unsigned long i = 0; i < m_attrCount; i++) { - if ((m_attrs[i].id() & tqmask) == id) { + if ((m_attrs[i].id() & mask) == id) { // if we are called with a qualified name, filter out NS-aware elements with non-matching name. if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) && strcasecmp(m_attrs[i].name(), DOMString(qName))) @@ -1000,11 +1000,11 @@ Node NamedAttrMapImpl::removeNamedItem ( NodeImpl::Id id, bool nsAware, DOMStrin exceptioncode = DOMException::NO_MODIFICATION_ALLOWED_ERR; return 0; } - unsigned int tqmask = nsAware ? ~0L : NodeImpl_IdLocalMask; - id = (id & tqmask); + unsigned int mask = nsAware ? ~0L : NodeImpl_IdLocalMask; + id = (id & mask); for (unsigned long i = 0; i < m_attrCount; i++) { - if ((m_attrs[i].id() & tqmask) == id) { + if ((m_attrs[i].id() & mask) == id) { // if we are called with a qualified name, filter out NS-aware elements with non-matching name. if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) && strcasecmp(m_attrs[i].name(), DOMString(qName))) @@ -1064,23 +1064,23 @@ Node NamedAttrMapImpl::setNamedItem ( NodeImpl* arg, bool nsAware, DOMStringImpl if (attr->ownerElement() == m_element) { // Already have this attribute. - // DOMTS core-1 test "hc_elementtqreplaceattributewithself" says we should return it. + // DOMTS core-1 test "hc_elementreplaceattributewithself" says we should return it. return attr; } - unsigned int tqmask = nsAware ? ~0L : NodeImpl_IdLocalMask; - NodeImpl::Id id = (attr->id() & tqmask); + unsigned int mask = nsAware ? ~0L : NodeImpl_IdLocalMask; + NodeImpl::Id id = (attr->id() & mask); for (unsigned long i = 0; i < m_attrCount; i++) { - if ((m_attrs[i].id() & tqmask) == id) { + if ((m_attrs[i].id() & mask) == id) { // if we are called with a qualified name, filter out NS-aware elements with non-matching name. if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) && strcasecmp(m_attrs[i].name(), DOMString(qName))) continue; - // Attribute exists; tqreplace it + // Attribute exists; replace it if (id == ATTR_ID) m_element->updateId(m_attrs[i].val(), attr->val()); - Node tqreplaced = m_attrs[i].createAttr(m_element,m_element->docPtr()); + Node replaced = m_attrs[i].createAttr(m_element,m_element->docPtr()); m_attrs[i].free(); m_attrs[i].m_attrId = 0; /* "has implementation" flag */ m_attrs[i].m_data.attr = attr; @@ -1089,7 +1089,7 @@ Node NamedAttrMapImpl::setNamedItem ( NodeImpl* arg, bool nsAware, DOMStringImpl m_element->parseAttribute(&m_attrs[i]); m_element->attributeChanged(m_attrs[i].id()); // ### dispatch mutation events - return tqreplaced; + return replaced; } } @@ -1142,10 +1142,10 @@ DOMStringImpl *NamedAttrMapImpl::valueAt(unsigned long index) const DOMStringImpl *NamedAttrMapImpl::getValue(NodeImpl::Id id, bool nsAware, DOMStringImpl* qName) const { - unsigned int tqmask = nsAware ? ~0L : NodeImpl_IdLocalMask; - id = (id & tqmask); + unsigned int mask = nsAware ? ~0L : NodeImpl_IdLocalMask; + id = (id & mask); for (unsigned long i = 0; i < m_attrCount; i++) - if ((m_attrs[i].id() & tqmask) == id) { + if ((m_attrs[i].id() & mask) == id) { // if we are called with a qualified name, filter out NS-aware elements with non-matching name. if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) && strcasecmp(m_attrs[i].name(), qName)) @@ -1167,12 +1167,12 @@ void NamedAttrMapImpl::setValue(NodeImpl::Id id, DOMStringImpl *value, DOMString removeNamedItem(id, nsAware, qName, exceptioncode); return; } - unsigned int tqmask = nsAware ? ~0L : NodeImpl_IdLocalMask; - NodeImpl::Id mid = (id & tqmask); + unsigned int mask = nsAware ? ~0L : NodeImpl_IdLocalMask; + NodeImpl::Id mid = (id & mask); // Check for an existing attribute. for (unsigned long i = 0; i < m_attrCount; i++) { - if ((m_attrs[i].id() & tqmask) == mid) { + if ((m_attrs[i].id() & mask) == mid) { // if we are called with a qualified name, filter out NS-aware elements with non-matching name. if (qName && (namespacePart(m_attrs[i].id()) != defaultNamespace) && strcasecmp(m_attrs[i].name(), DOMString(qName))) diff --git a/khtml/xml/dom_elementimpl.h b/khtml/xml/dom_elementimpl.h index 019920b76..ee1be3e4a 100644 --- a/khtml/xml/dom_elementimpl.h +++ b/khtml/xml/dom_elementimpl.h @@ -302,7 +302,7 @@ public: virtual bool isReadOnly() { return false; } AttributeImpl *attrAt(unsigned long index) const { return &m_attrs[index]; } - // ### tqreplace idAt and getValueAt with attrAt + // ### replace idAt and getValueAt with attrAt NodeImpl::Id idAt(unsigned long index) const; DOMStringImpl *valueAt(unsigned long index) const; DOMStringImpl *getValue(NodeImpl::Id id, bool nsAware = false, DOMStringImpl* qName = 0) const; @@ -333,7 +333,7 @@ inline bool checkQualifiedName(const DOMString &qualifiedName, const DOMString & return false; } - // INVALID_CHARACTER_ERR: Raised if the specified qualified name tqcontains an illegal character. + // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character. if (!qualifiedName.isNull() && !Element::khtmlValidQualifiedName(qualifiedName) && ( !qualifiedName.isEmpty() || !nameCanBeEmpty ) ) { if (pExceptioncode) diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp index e51d16523..137928c81 100644 --- a/khtml/xml/dom_nodeimpl.cpp +++ b/khtml/xml/dom_nodeimpl.cpp @@ -133,7 +133,7 @@ NodeImpl *NodeImpl::insertBefore( NodeImpl *, NodeImpl *, int &exceptioncode ) return 0; } -void NodeImpl::tqreplaceChild( NodeImpl *, NodeImpl *, int &exceptioncode ) +void NodeImpl::replaceChild( NodeImpl *, NodeImpl *, int &exceptioncode ) { exceptioncode = DOMException::HIERARCHY_REQUEST_ERR; } @@ -588,7 +588,7 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture) Event ev = evt; // removeEventListener (e.g. called from a JS event listener) might - // tqinvalidate the item after the current iterator (which "it" is pointing to). + // invalidate the item after the current iterator (which "it" is pointing to). // So we make a copy of the list. TQValueList<RegisteredEventListener> listeners = *m_regdListeners.listeners; TQValueList<RegisteredEventListener>::iterator it; @@ -605,7 +605,7 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture) if (current.useCapture == useCapture && evt->id() == EventImpl::CLICK_EVENT) { MouseEventImpl* me = static_cast<MouseEventImpl*>(evt); if (me->button() == 0) { - // To tqfind whether to call onclick or ondblclick, we can't + // To find whether to call onclick or ondblclick, we can't // * use me->detail(), it's 2 when clicking twice w/o moving, even very slowly // * use me->qEvent(), it's not available when using initMouseEvent/dispatchEvent // So we currently store a bool in MouseEventImpl. If anyone needs to trigger @@ -669,7 +669,7 @@ void NodeImpl::checkSetPrefix(const DOMString &_prefix, int &exceptioncode) // Perform error checking as required by spec for setting Node.prefix. Used by // ElementImpl::setPrefix() and AttrImpl::setPrefix() - // INVALID_CHARACTER_ERR: Raised if the specified prefix tqcontains an illegal character. + // INVALID_CHARACTER_ERR: Raised if the specified prefix contains an illegal character. if (!Element::khtmlValidPrefix(_prefix)) { exceptioncode = DOMException::INVALID_CHARACTER_ERR; return; @@ -698,7 +698,7 @@ void NodeImpl::checkSetPrefix(const DOMString &_prefix, int &exceptioncode) void NodeImpl::checkAddChild(NodeImpl *newChild, int &exceptioncode) { // Perform error checking as required by spec for adding a new child. Used by - // appendChild(), tqreplaceChild() and insertBefore() + // appendChild(), replaceChild() and insertBefore() // Not mentioned in spec: throw NOT_FOUND_ERR if newChild is null if (!newChild) { @@ -768,7 +768,7 @@ bool NodeImpl::childAllowed( NodeImpl *newChild ) NodeImpl::StyleChange NodeImpl::diff( khtml::RenderStyle *s1, khtml::RenderStyle *s2 ) { - // This method won't work when a style tqcontains noninherited properties with "inherit" value. + // This method won't work when a style contains noninherited properties with "inherit" value. StyleChange ch = NoInherit; EDisplay display1 = s1 ? s1->display() : NONE; @@ -989,7 +989,7 @@ DOMStringImpl* NodeImpl::textContent() const delete kidText; } } - return new DOMStringImpl(out.tqunicode(), out.length()); + return new DOMStringImpl(out.unicode(), out.length()); } //------------------------------------------------------------------------- @@ -1099,7 +1099,7 @@ NodeImpl *NodeBaseImpl::insertBefore ( NodeImpl *newChild, NodeImpl *refChild, i return newChild; } -void NodeBaseImpl::tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ) +void NodeBaseImpl::replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ) { exceptioncode = 0; @@ -1427,7 +1427,7 @@ void NodeBaseImpl::cloneChildNodes(NodeImpl *clone) } } -// I don't like this way of implementing the method, but I didn't tqfind any +// I don't like this way of implementing the method, but I didn't find any // other way. Lars bool NodeBaseImpl::getUpperLeftCorner(int &xPos, int &yPos) const { @@ -1440,7 +1440,7 @@ bool NodeBaseImpl::getUpperLeftCorner(int &xPos, int &yPos) const return true; } - // tqfind the next text/image child, to get a position + // find the next text/image child, to get a position while(o) { if(o->firstChild()) o = o->firstChild(); @@ -1484,7 +1484,7 @@ bool NodeBaseImpl::getLowerRightCorner(int &xPos, int &yPos) const yPos += o->height() + o->borderTopExtra() + o->borderBottomExtra(); return true; } - // tqfind the last text/image child, to get a position + // find the last text/image child, to get a position while(o) { if(o->lastChild()) o = o->lastChild(); @@ -2060,7 +2060,7 @@ bool RegisteredListenerList::stillContainsListener(const RegisteredEventListener { if (!listeners) return false; - return listeners->tqfind(listener) != listeners->end(); + return listeners->find(listener) != listeners->end(); } RegisteredListenerList::~RegisteredListenerList() { diff --git a/khtml/xml/dom_nodeimpl.h b/khtml/xml/dom_nodeimpl.h index 263df8fb6..1e53edf19 100644 --- a/khtml/xml/dom_nodeimpl.h +++ b/khtml/xml/dom_nodeimpl.h @@ -86,17 +86,17 @@ private: #define NodeImpl_IdNSMask 0xffff0000 #define NodeImpl_IdLocalMask 0x0000ffff -const TQ_UINT16 defaultNamespace = 0; -const TQ_UINT16 xhtmlNamespace = 1; -const TQ_UINT16 emptyNamespace = 2; -const TQ_UINT16 anyNamespace = 0xffff; -const TQ_UINT16 anyLocalName = 0xffff; +const Q_UINT16 defaultNamespace = 0; +const Q_UINT16 xhtmlNamespace = 1; +const Q_UINT16 emptyNamespace = 2; +const Q_UINT16 anyNamespace = 0xffff; +const Q_UINT16 anyLocalName = 0xffff; -inline TQ_UINT16 localNamePart(TQ_UINT32 id) { return id & NodeImpl_IdLocalMask; } -inline TQ_UINT16 namespacePart(TQ_UINT32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; } -inline TQ_UINT32 makeId(TQ_UINT16 n, TQ_UINT16 l) { return (n << 16) | l; } +inline Q_UINT16 localNamePart(Q_UINT32 id) { return id & NodeImpl_IdLocalMask; } +inline Q_UINT16 namespacePart(Q_UINT32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; } +inline Q_UINT32 makeId(Q_UINT16 n, Q_UINT16 l) { return (n << 16) | l; } -const TQ_UINT32 anyQName = makeId(anyNamespace, anyLocalName); +const Q_UINT32 anyQName = makeId(anyNamespace, anyLocalName); class NodeImpl : public khtml::TreeShared<NodeImpl> { @@ -116,12 +116,12 @@ public: virtual NodeListImpl *childNodes(); virtual NodeImpl *firstChild() const; virtual NodeImpl *lastChild() const; - // insertBefore, tqreplaceChild and appendChild also close newChild + // insertBefore, replaceChild and appendChild also close newChild // unlike the speed optimized addChild (which is used by the parser) virtual NodeImpl *insertBefore ( NodeImpl *newChild, NodeImpl *refChild, int &exceptioncode ); /* These two methods may delete the old node, so make sure to reference it if you need it */ - virtual void tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ); + virtual void replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ); virtual void removeChild ( NodeImpl *oldChild, int &exceptioncode ); virtual NodeImpl *appendChild ( NodeImpl *newChild, int &exceptioncode ); virtual bool hasChildNodes ( ) const; @@ -140,7 +140,7 @@ public: virtual bool isDocumentNode() const { return false; } virtual bool isXMLElementNode() const { return false; } virtual bool isGenericFormElement() const { return false; } - virtual bool tqcontainsOnlyWhitespace() const { return false; } + virtual bool containsOnlyWhitespace() const { return false; } virtual bool contentEditable() const; // helper functions not being part of the DOM @@ -155,7 +155,7 @@ public: // appendChild(), and returns the node into which will be parsed next. virtual NodeImpl *addChild(NodeImpl *newChild); - typedef TQ_UINT32 Id; + typedef Q_UINT32 Id; // id() is used to easily and exactly identify a node. It // is optimized for quick comparison and low memory consumption. // its value depends on the owner document of the node and is @@ -299,7 +299,7 @@ public: virtual NodeImpl *childNode(unsigned long index); /** - * Does a pre-order traversal of the tree to tqfind the node next node after this one. This uses the same order that + * Does a pre-order traversal of the tree to find the node next node after this one. This uses the same order that * the tags appear in the source file. * * @param stayWithin If not null, the traversal will stop once the specified node is reached. This can be used to @@ -312,7 +312,7 @@ public: NodeImpl *traverseNextNode(NodeImpl *stayWithin = 0) const; /** - * Does a reverse pre-order traversal to tqfind the node that comes before the current one in document order + * Does a reverse pre-order traversal to find the node that comes before the current one in document order * * see traverseNextNode() */ @@ -407,7 +407,7 @@ public: /** * Notifies the node that it has been inserted into the document. This is called during document parsing, and also - * when a node is added through the DOM methods insertBefore(), appendChild() or tqreplaceChild(). Note that this only + * when a node is added through the DOM methods insertBefore(), appendChild() or replaceChild(). Note that this only * happens when the node becomes part of the document tree, i.e. only when the document is actually an ancestor of * the node. The call happens _after_ the node has been added to the tree. * @@ -497,7 +497,7 @@ public: virtual NodeImpl *firstChild() const; virtual NodeImpl *lastChild() const; virtual NodeImpl *insertBefore ( NodeImpl *newChild, NodeImpl *refChild, int &exceptioncode ); - virtual void tqreplaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ); + virtual void replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode ); virtual void removeChild ( NodeImpl *oldChild, int &exceptioncode ); virtual NodeImpl *appendChild ( NodeImpl *newChild, int &exceptioncode ); virtual bool hasChildNodes ( ) const; @@ -537,7 +537,7 @@ protected: bool checkIsChild( NodeImpl *oldchild, int &exceptioncode ); // ### - // tqfind out if a node is allowed to be our child + // find out if a node is allowed to be our child void dispatchChildInsertedEvents( NodeImpl *child, int &exceptioncode ); void dispatchChildRemovalEvents( NodeImpl *child, int &exceptioncode ); }; diff --git a/khtml/xml/dom_restyler.cpp b/khtml/xml/dom_restyler.cpp index 699a5ab59..0050c4a03 100644 --- a/khtml/xml/dom_restyler.cpp +++ b/khtml/xml/dom_restyler.cpp @@ -45,7 +45,7 @@ void DynamicDomRestyler::removeDependency(ElementImpl* subject, ElementImpl* dep void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDependencyType type) { - KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject); + KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject); if (!my_dependencies) return; @@ -60,7 +60,7 @@ void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDepe void DynamicDomRestyler::resetDependencies(ElementImpl* subject) { - KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject); + KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject); if (!my_dependencies) return; @@ -78,7 +78,7 @@ void DynamicDomRestyler::resetDependencies(ElementImpl* subject) void DynamicDomRestyler::restyleDepedent(ElementImpl* dependency, StructuralDependencyType type) { assert(type < LastStructuralDependency); - KMultiMap<ElementImpl>::List* dep = dependency_map[type].tqfind(dependency); + KMultiMap<ElementImpl>::List* dep = dependency_map[type].find(dependency); if (!dep) return; diff --git a/khtml/xml/dom_stringimpl.cpp b/khtml/xml/dom_stringimpl.cpp index e50babf28..bb1a728e9 100644 --- a/khtml/xml/dom_stringimpl.cpp +++ b/khtml/xml/dom_stringimpl.cpp @@ -54,15 +54,15 @@ DOMStringImpl::DOMStringImpl(const char *str) } // FIXME: should be a cached flag maybe. -bool DOMStringImpl::tqcontainsOnlyWhitespace() const +bool DOMStringImpl::containsOnlyWhitespace() const { if (!s) return true; for (uint i = 0; i < l; i++) { TQChar c = s[i]; - if (c.tqunicode() <= 0x7F) { - if (c.tqunicode() > ' ') + if (c.unicode() <= 0x7F) { + if (c.unicode() > ' ') return false; } else { if (c.direction() != TQChar::DirWS) @@ -286,18 +286,18 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const } str = str.simplifyWhiteSpace(); - len = str.tqcontains(' ') + 1; + len = str.contains(' ') + 1; khtml::Length* r = new khtml::Length[len]; int i = 0; int pos = 0; int pos2; - while((pos2 = str.tqfind(' ', pos)) != -1) { - r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos); + while((pos2 = str.find(' ', pos)) != -1) { + r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos); pos = pos2+1; } - r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos); + r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos); return r; } @@ -307,7 +307,7 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const TQString str(s, l); str = str.simplifyWhiteSpace(); - len = str.tqcontains(',') + 1; + len = str.contains(',') + 1; // If we have no commas, we have no array. if( len == 1 ) @@ -319,14 +319,14 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const int pos = 0; int pos2; - while((pos2 = str.tqfind(',', pos)) != -1) { - r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos); + while((pos2 = str.find(',', pos)) != -1) { + r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos); pos = pos2+1; } /* IE Quirk: If the last comma is the last char skip it and reduce len by one */ if (str.length()-pos > 0) - r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos); + r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos); else len--; diff --git a/khtml/xml/dom_stringimpl.h b/khtml/xml/dom_stringimpl.h index 78d7dcb0c..cd7128967 100644 --- a/khtml/xml/dom_stringimpl.h +++ b/khtml/xml/dom_stringimpl.h @@ -79,7 +79,7 @@ public: DOMStringImpl *collapseWhiteSpace(bool preserveLF, bool preserveWS); const TQChar &operator [] (int pos) { return s[pos]; } - bool tqcontainsOnlyWhitespace() const; + bool containsOnlyWhitespace() const; // ignores trailing garbage, unlike QString int toInt(bool* ok = 0) const; @@ -92,7 +92,7 @@ public: DOMStringImpl *capitalize(bool noFirstCap=false) const; DOMStringImpl *escapeHTML(); - TQChar *tqunicode() const { return s; } + TQChar *unicode() const { return s; } uint length() const { return l; } TQString string() const; diff --git a/khtml/xml/dom_textimpl.cpp b/khtml/xml/dom_textimpl.cpp index 6c07b9c47..015135428 100644 --- a/khtml/xml/dom_textimpl.cpp +++ b/khtml/xml/dom_textimpl.cpp @@ -155,7 +155,7 @@ void CharacterDataImpl::deleteData( const unsigned long offset, const unsigned l oldStr->deref(); } -void CharacterDataImpl::tqreplaceData( const unsigned long offset, const unsigned long count, const DOMString &arg, int &exceptioncode ) +void CharacterDataImpl::replaceData( const unsigned long offset, const unsigned long count, const DOMString &arg, int &exceptioncode ) { exceptioncode = 0; if ((long)count < 0) @@ -189,9 +189,9 @@ DOMString CharacterDataImpl::nodeValue() const return str; } -bool CharacterDataImpl::tqcontainsOnlyWhitespace() const +bool CharacterDataImpl::containsOnlyWhitespace() const { - return str->tqcontainsOnlyWhitespace(); + return str->containsOnlyWhitespace(); } void CharacterDataImpl::setNodeValue( const DOMString &_nodeValue, int &exceptioncode ) @@ -372,7 +372,7 @@ bool TextImpl::rendererIsNeeded(RenderStyle *style) if (!CharacterDataImpl::rendererIsNeeded(style)) { return false; } - bool onlyWS = tqcontainsOnlyWhitespace(); + bool onlyWS = containsOnlyWhitespace(); if (!onlyWS) { return true; } diff --git a/khtml/xml/dom_textimpl.h b/khtml/xml/dom_textimpl.h index a966a23a4..07e4909f6 100644 --- a/khtml/xml/dom_textimpl.h +++ b/khtml/xml/dom_textimpl.h @@ -51,9 +51,9 @@ public: virtual void appendData ( const DOMString &arg, int &exceptioncode ); virtual void insertData ( const unsigned long offset, const DOMString &arg, int &exceptioncode ); virtual void deleteData ( const unsigned long offset, const unsigned long count, int &exceptioncode ); - virtual void tqreplaceData ( const unsigned long offset, const unsigned long count, const DOMString &arg, int &exceptioncode ); + virtual void replaceData ( const unsigned long offset, const unsigned long count, const DOMString &arg, int &exceptioncode ); - virtual bool tqcontainsOnlyWhitespace() const; + virtual bool containsOnlyWhitespace() const; // DOM methods overridden from parent classes @@ -135,7 +135,7 @@ public: DOMStringImpl *renderString() const; virtual DOMString toString() const; - /** Return the text for the node, with < tqreplaced with < and so on. + /** Return the text for the node, with < replaced with < and so on. * @param startOffset The number of characters counted from the left, zero indexed, counting "<" as one character, to start from. Use -1 to start from 0. * @param endOffset The number of characters counted from the left, zero indexed, counting "<" as one character, to end on. Use -1 to end at the end of the string. * @return An html escaped version of the substring. diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp index 37fc36f02..7c043815a 100644 --- a/khtml/xml/xml_tokenizer.cpp +++ b/khtml/xml/xml_tokenizer.cpp @@ -42,7 +42,7 @@ using namespace DOM; using namespace khtml; XMLIncrementalSource::XMLIncrementalSource() - : TQXmlInputSource(), m_pos( 0 ), m_tqunicode( 0 ), + : TQXmlInputSource(), m_pos( 0 ), m_unicode( 0 ), m_finished( false ) { } @@ -59,13 +59,13 @@ TQChar XMLIncrementalSource::next() else if ( m_data.length() <= m_pos ) return TQXmlInputSource::EndOfData; else - return m_tqunicode[m_pos++]; + return m_unicode[m_pos++]; } void XMLIncrementalSource::setData( const TQString& str ) { m_data = str; - m_tqunicode = m_data.tqunicode(); + m_unicode = m_data.unicode(); m_pos = 0; if ( !str.isEmpty() ) m_finished = false; @@ -78,7 +78,7 @@ void XMLIncrementalSource::setData( const TQByteArray& data ) void XMLIncrementalSource::appendXML( const TQString& str ) { m_data += str; - m_tqunicode = m_data.tqunicode(); + m_unicode = m_data.unicode(); } TQString XMLIncrementalSource::data() @@ -152,11 +152,11 @@ void XMLHandler::fixUpNSURI(TQString& uri, const TQString& qname) { /* QXml does not resolve the namespaces of attributes in the same tag that preceed the xmlns declaration. This fixes up that case */ - if (uri.isEmpty() && qname.tqfind(':') != -1) { + if (uri.isEmpty() && qname.find(':') != -1) { TQXmlNamespaceSupport ns; TQString localName, prefix; ns.splitName(qname, prefix, localName); - if (namespaceInfo.tqcontains(prefix)) { + if (namespaceInfo.contains(prefix)) { uri = namespaceInfo[prefix].top(); } } @@ -289,7 +289,7 @@ bool XMLHandler::comment(const TQString & ch) if (currentNode()->nodeType() == Node::TEXT_NODE) exitText(); // ### handle exceptions - currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.tqunicode(), ch.length()))); + currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.unicode(), ch.length()))); return true; } @@ -299,7 +299,7 @@ bool XMLHandler::processingInstruction(const TQString &target, const TQString &d exitText(); // ### handle exceptions ProcessingInstructionImpl *pi = - m_doc->createProcessingInstruction(target, new DOMStringImpl(data.tqunicode(), data.length())); + m_doc->createProcessingInstruction(target, new DOMStringImpl(data.unicode(), data.length())); currentNode()->addChild(pi); pi->checkStyleSheet(); return true; @@ -364,7 +364,7 @@ bool XMLHandler::internalEntityDecl(const TQString &name, const TQString &value) { EntityImpl *e = new EntityImpl(m_doc,name); // ### further parse entities inside the value and add them as separate nodes (or entityreferences)? - e->addChild(m_doc->createTextNode(new DOMStringImpl(value.tqunicode(), value.length()))); + e->addChild(m_doc->createTextNode(new DOMStringImpl(value.unicode(), value.length()))); if (m_doc->doctype()) static_cast<GenericRONamedNodeMapImpl*>(m_doc->doctype()->entities())->addNode(e); return true; diff --git a/khtml/xml/xml_tokenizer.h b/khtml/xml/xml_tokenizer.h index 0af3ec3a4..cbf5cd5dd 100644 --- a/khtml/xml/xml_tokenizer.h +++ b/khtml/xml/xml_tokenizer.h @@ -116,7 +116,7 @@ private: State state; }; -class Tokenizer : public TQObject +class Tokenizer : public QObject { Q_OBJECT public: @@ -155,7 +155,7 @@ public: private: TQString m_data; uint m_pos; - const TQChar *m_tqunicode; + const TQChar *m_unicode; bool m_finished; }; |