summaryrefslogtreecommitdiffstats
path: root/khtml
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:57:02 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-02 19:04:59 +0200
commit41b1d53a0144afe4c31425c18af25c2d6ade881b (patch)
tree4bf4a434c5db64325f317e56cc9d8d2a729df3e4 /khtml
parente2867c1f1eec514d56386f2fc5350eaaf760532a (diff)
downloadtdelibs-41b1d53a0144afe4c31425c18af25c2d6ade881b.tar.gz
tdelibs-41b1d53a0144afe4c31425c18af25c2d6ade881b.zip
Remove additional unneeded tq method conversions
(cherry picked from commit a51cd9949c4e6c726a84a61de3cfadd30cefb5c7)
Diffstat (limited to 'khtml')
-rw-r--r--khtml/css/css_base.h2
-rw-r--r--khtml/css/css_ruleimpl.h2
-rw-r--r--khtml/css/css_valueimpl.cpp6
-rw-r--r--khtml/css/css_valueimpl.h2
-rw-r--r--khtml/css/cssparser.cpp2
-rw-r--r--khtml/css/cssstyleselector.cpp10
-rw-r--r--khtml/dom/css_value.h2
-rw-r--r--khtml/dom/html_block.h6
-rw-r--r--khtml/dom/html_form.h2
-rw-r--r--khtml/dom/html_image.cpp2
-rw-r--r--khtml/dom/html_image.h12
-rw-r--r--khtml/dom/html_inline.cpp2
-rw-r--r--khtml/dom/html_inline.h12
-rw-r--r--khtml/dom/html_table.h26
-rw-r--r--khtml/ecma/kjs_debugwin.cpp14
-rw-r--r--khtml/ecma/kjs_html.cpp8
-rw-r--r--khtml/ecma/kjs_navigator.cpp14
-rw-r--r--khtml/ecma/kjs_window.cpp4
-rw-r--r--khtml/html/html_documentimpl.cpp2
-rw-r--r--khtml/html/html_elementimpl.cpp24
-rw-r--r--khtml/html/html_elementimpl.h2
-rw-r--r--khtml/html/html_formimpl.cpp2
-rw-r--r--khtml/html/html_imageimpl.cpp18
-rw-r--r--khtml/html/html_imageimpl.h4
-rw-r--r--khtml/html/html_miscimpl.cpp10
-rw-r--r--khtml/java/kjavaappletviewer.cpp2
-rw-r--r--khtml/java/kjavaprocess.cpp10
-rw-r--r--khtml/khtml_caret.cpp8
-rw-r--r--khtml/khtml_pagecache.cpp4
-rw-r--r--khtml/khtml_part.cpp6
-rw-r--r--khtml/khtml_settings.cc2
-rw-r--r--khtml/khtmlview.cpp20
-rw-r--r--khtml/khtmlview.h4
-rw-r--r--khtml/kmultipart/kmultipart.cpp4
-rw-r--r--khtml/misc/arena.cpp4
-rw-r--r--khtml/misc/htmlattrs.c4
-rw-r--r--khtml/misc/khtmllayout.h2
-rw-r--r--khtml/misc/loader.cpp6
-rw-r--r--khtml/misc/multimap.h2
-rw-r--r--khtml/rendering/bidi.cpp2
-rw-r--r--khtml/rendering/render_arena.cpp4
-rw-r--r--khtml/rendering/render_body.cpp4
-rw-r--r--khtml/rendering/render_body.h2
-rw-r--r--khtml/rendering/render_box.cpp4
-rw-r--r--khtml/rendering/render_box.h2
-rw-r--r--khtml/rendering/render_canvas.cpp14
-rw-r--r--khtml/rendering/render_canvas.h2
-rw-r--r--khtml/rendering/render_container.cpp4
-rw-r--r--khtml/rendering/render_flow.cpp6
-rw-r--r--khtml/rendering/render_flow.h2
-rw-r--r--khtml/rendering/render_image.cpp2
-rw-r--r--khtml/rendering/render_layer.cpp50
-rw-r--r--khtml/rendering/render_layer.h4
-rw-r--r--khtml/rendering/render_object.cpp22
-rw-r--r--khtml/rendering/render_object.h8
-rw-r--r--khtml/rendering/render_replaced.cpp6
-rw-r--r--khtml/rendering/render_style.cpp4
-rw-r--r--khtml/rendering/render_table.cpp2
-rw-r--r--khtml/rendering/render_text.cpp8
-rw-r--r--khtml/rendering/render_text.h2
-rw-r--r--khtml/test/align2.html10
-rw-r--r--khtml/test/image_map.html10
-rw-r--r--khtml/test_regression.cpp2
-rw-r--r--khtml/xml/dom_nodeimpl.cpp4
64 files changed, 224 insertions, 224 deletions
diff --git a/khtml/css/css_base.h b/khtml/css/css_base.h
index b38024bee..9a8774107 100644
--- a/khtml/css/css_base.h
+++ b/khtml/css/css_base.h
@@ -256,7 +256,7 @@ namespace DOM {
virtual ~StyleListImpl();
unsigned long length() const { return m_lstChildren->count(); }
- StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->tqat(num); }
+ StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->at(num); }
void append(StyleBaseImpl *item) { m_lstChildren->append(item); }
diff --git a/khtml/css/css_ruleimpl.h b/khtml/css/css_ruleimpl.h
index d9928994d..2753fcf83 100644
--- a/khtml/css/css_ruleimpl.h
+++ b/khtml/css/css_ruleimpl.h
@@ -137,7 +137,7 @@ public:
~CSSRuleListImpl();
unsigned long length() const { return m_lstCSSRules.count(); }
- CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.tqat( index ); }
+ CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.at( index ); }
/* not part of the DOM */
diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp
index 3fa38efe9..a6150c78b 100644
--- a/khtml/css/css_valueimpl.cpp
+++ b/khtml/css/css_valueimpl.cpp
@@ -281,7 +281,7 @@ void CSSStyleDeclarationImpl::removeCSSHints()
return;
for (int i = (int)m_lstValues->count()-1; i >= 0; i--) {
- if (!m_lstValues->tqat(i)->nonCSSHint)
+ if (!m_lstValues->at(i)->nonCSSHint)
m_lstValues->remove(i);
}
}
@@ -358,8 +358,8 @@ unsigned long CSSStyleDeclarationImpl::length() const
DOMString CSSStyleDeclarationImpl::item( unsigned long index ) const
{
- if(m_lstValues && index < m_lstValues->count() && m_lstValues->tqat(index))
- return getPropertyName(m_lstValues->tqat(index)->m_id);
+ if(m_lstValues && index < m_lstValues->count() && m_lstValues->at(index))
+ return getPropertyName(m_lstValues->at(index)->m_id);
return DOMString();
}
diff --git a/khtml/css/css_valueimpl.h b/khtml/css/css_valueimpl.h
index 668c53d93..3566c00cb 100644
--- a/khtml/css/css_valueimpl.h
+++ b/khtml/css/css_valueimpl.h
@@ -136,7 +136,7 @@ public:
virtual ~CSSValueListImpl();
unsigned long length() const { return m_values.count(); }
- CSSValueImpl *item ( unsigned long index ) { return m_values.tqat(index); }
+ CSSValueImpl *item ( unsigned long index ) { return m_values.at(index); }
virtual bool isValueList() const { return true; }
diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp
index 474067cf0..7d59c27d9 100644
--- a/khtml/css/cssparser.cpp
+++ b/khtml/css/cssparser.cpp
@@ -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 )
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index 03fbd1c02..e8af85459 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -742,7 +742,7 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e
style->adjustBackgroundLayers();
// Only use slow repaints if we actually have a background image.
- // FIXME: We only need to tqinvalidate the fixed regions when scrolling. It's total overkill to
+ // 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();
@@ -786,7 +786,7 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e,
if (i == firstLen)
values = addValues;
- CSSProperty *prop = values->tqat(i >= firstLen ? i - firstLen : i);
+ CSSProperty *prop = values->at(i >= firstLen ? i - firstLen : i);
Source source = Inline;
if( prop->m_important ) source = InlineImportant;
@@ -1782,7 +1782,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
TQPtrList<CSSSelector> *s = r->selector();
for(int j = 0; j < (int)s->count(); j++)
{
- CSSOrderedRule *rule = new CSSOrderedRule(r, s->tqat(j), count());
+ CSSOrderedRule *rule = new CSSOrderedRule(r, s->at(j), count());
TQPtrList<CSSOrderedRule>::append(rule);
//kdDebug( 6080 ) << "appending StyleRule!" << endl;
}
@@ -1829,7 +1829,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
for( int j = 0; j < ( int ) s->count(); j++ )
{
CSSOrderedRule *orderedRule = new CSSOrderedRule(
- styleRule, s->tqat( j ), count() );
+ styleRule, s->at( j ), count() );
TQPtrList<CSSOrderedRule>::append( orderedRule );
}
}
@@ -1891,7 +1891,7 @@ void CSSOrderedPropertyList::append(DOM::CSSStyleDeclarationImpl *decl, uint sel
int len = values->count();
for(int i = 0; i < len; i++)
{
- CSSProperty *prop = values->tqat(i);
+ CSSProperty *prop = values->at(i);
Source source = regular;
if( prop->m_important ) source = important;
diff --git a/khtml/dom/css_value.h b/khtml/dom/css_value.h
index 7523a2797..5d4a043c7 100644
--- a/khtml/dom/css_value.h
+++ b/khtml/dom/css_value.h
@@ -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/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_form.h b/khtml/dom/html_form.h
index ef318ba06..0623e421b 100644
--- a/khtml/dom/html_form.h
+++ b/khtml/dom/html_form.h
@@ -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_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 9b1334c83..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
- * geometry. 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 d5c11d515..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
- * geometry. 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_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/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index 87d1b8a6c..7a083c28e 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -548,7 +548,7 @@ void KJSDebugWin::slotToggleBreakpoint(int lineno)
if (m_sourceSel->currentItem() < 0)
return;
- SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem());
+ SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem());
// Find the source fragment containing the selected line (if any)
int sourceId = -1;
@@ -592,14 +592,14 @@ void KJSDebugWin::slotSourceSelected(int sourceSelIndex)
// A source file has been selected from the drop-down list - display the file
if (sourceSelIndex < 0 || sourceSelIndex >= (int)m_sourceSel->count())
return;
- SourceFile *sourceFile = m_sourceSelFiles.tqat(sourceSelIndex);
+ SourceFile *sourceFile = m_sourceSelFiles.at(sourceSelIndex);
displaySourceFile(sourceFile,true);
// If the currently selected context is in the current source file, then hilight
// the line it's on.
if (m_contextList->currentItem() >= 0) {
Context ctx = m_execs[m_contextList->currentItem()]->context();
- if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.tqat(sourceSelIndex))
+ if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.at(sourceSelIndex))
setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine());
}
}
@@ -614,7 +614,7 @@ void KJSDebugWin::slotEval()
if (m_execStates.isEmpty()) {
if (m_sourceSel->currentItem() < 0)
return;
- SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem());
+ SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem());
if (!sourceFile->interpreter)
return;
exec = sourceFile->interpreter->globalExec();
@@ -744,7 +744,7 @@ bool KJSDebugWin::sourceParsed(KJS::ExecState *exec, int sourceId,
if (!sourceFile->interpreter)
sourceFile->interpreter = exec->interpreter();
for (index = 0; index < m_sourceSel->count(); index++) {
- if (m_sourceSelFiles.tqat(index) == sourceFile)
+ if (m_sourceSelFiles.at(index) == sourceFile)
break;
}
assert(index < m_sourceSel->count());
@@ -782,7 +782,7 @@ bool KJSDebugWin::sourceUnused(KJS::ExecState *exec, int sourceId)
SourceFile *sourceFile = fragment->sourceFile;
if (sourceFile->hasOneRef()) {
for (int i = 0; i < m_sourceSel->count(); i++) {
- if (m_sourceSelFiles.tqat(i) == sourceFile) {
+ if (m_sourceSelFiles.at(i) == sourceFile) {
m_sourceSel->removeItem(i);
m_sourceSelFiles.remove(i);
break;
@@ -930,7 +930,7 @@ void KJSDebugWin::setSourceLine(int sourceId, int lineno)
SourceFile *sourceFile = source->sourceFile;
if (m_curSourceFile != source->sourceFile) {
for (int i = 0; i < m_sourceSel->count(); i++)
- if (m_sourceSelFiles.tqat(i) == sourceFile)
+ if (m_sourceSelFiles.at(i) == sourceFile)
m_sourceSel->setCurrentItem(i);
displaySourceFile(sourceFile,false);
}
diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp
index 3fdc35bb2..57762ffd3 100644
--- a/khtml/ecma/kjs_html.cpp
+++ b/khtml/ecma/kjs_html.cpp
@@ -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());
}
diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp
index a14877be2..183c99078 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/khtml/ecma/kjs_navigator.cpp
@@ -394,7 +394,7 @@ Value Plugins::get(ExecState *exec, const Identifier &propertyName) const
bool ok;
unsigned int i = propertyName.toULong(&ok);
if( ok && i<plugins->count() )
- return Value( new Plugin( exec, plugins->tqat(i) ) );
+ return Value( new Plugin( exec, plugins->at(i) ) );
// plugin[name]
Value val = pluginByName( exec, propertyName.qstring() );
@@ -439,7 +439,7 @@ Value PluginsFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
bool ok;
unsigned int i = args[0].toString(exec).toArrayIndex(&ok);
if( ok && i<base->plugins->count() )
- return Value( new Plugin( exec, base->plugins->tqat(i) ) );
+ return Value( new Plugin( exec, base->plugins->at(i) ) );
return Undefined();
}
case Plugins_NamedItem:
@@ -479,7 +479,7 @@ Value MimeTypes::get(ExecState *exec, const Identifier &propertyName) const
bool ok;
unsigned int i = propertyName.toULong(&ok);
if( ok && i<mimes->count() )
- return Value( new MimeType( exec, mimes->tqat(i) ) );
+ return Value( new MimeType( exec, mimes->at(i) ) );
// mimeTypes[name]
Value val = mimeTypeByName( exec, propertyName.qstring() );
@@ -522,7 +522,7 @@ Value MimeTypesFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
bool ok;
unsigned int i = args[0].toString(exec).toArrayIndex(&ok);
if( ok && i<base->mimes->count() )
- return Value( new MimeType( exec, base->mimes->tqat(i) ) );
+ return Value( new MimeType( exec, base->mimes->at(i) ) );
return Undefined();
}
case MimeTypes_NamedItem:
@@ -562,8 +562,8 @@ Value Plugin::get(ExecState *exec, const Identifier &propertyName) const
//kdDebug(6070) << "Plugin::get plugin[" << i << "]" << endl;
if( ok && i<m_info->mimes.count() )
{
- //kdDebug(6070) << "returning mimetype " << m_info->mimes.tqat(i)->type << endl;
- return Value(new MimeType(exec, m_info->mimes.tqat(i)));
+ //kdDebug(6070) << "returning mimetype " << m_info->mimes.at(i)->type << endl;
+ return Value(new MimeType(exec, m_info->mimes.at(i)));
}
// plugin["name"]
@@ -609,7 +609,7 @@ Value PluginFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
bool ok;
unsigned int i = args[0].toString(exec).toArrayIndex(&ok);
if( ok && i< plugin->pluginInfo()->mimes.count() )
- return Value( new MimeType( exec, plugin->pluginInfo()->mimes.tqat(i) ) );
+ return Value( new MimeType( exec, plugin->pluginInfo()->mimes.at(i) ) );
return Undefined();
}
case Plugin_NamedItem:
diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index cee624913..1f26fe7b8 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -1013,7 +1013,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
TQPtrList<KParts::ReadOnlyPart> frames = part->frames();
unsigned int len = frames.count();
if (i < len) {
- KParts::ReadOnlyPart* frame = frames.tqat(i);
+ KParts::ReadOnlyPart* frame = frames.at(i);
if (frame)
return Window::retrieve(frame);
}
@@ -2412,7 +2412,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const
bool ok;
unsigned int i = p.toArrayIndex(&ok);
if (ok && i < len)
- frame = frames.tqat(i);
+ frame = frames.at(i);
}
// we are potentially fetching a reference to a another Window object here.
diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp
index bbfbc86f5..c0bef4434 100644
--- a/khtml/html/html_documentimpl.cpp
+++ b/khtml/html/html_documentimpl.cpp
@@ -226,7 +226,7 @@ void HTMLDocumentImpl::slotHistoryChanged()
return;
recalcStyle( Force );
- m_render->tqrepaint();
+ m_render->repaint();
}
HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url)
diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp
index 736b5a3b9..89b3587cc 100644
--- a/khtml/html/html_elementimpl.cpp
+++ b/khtml/html/html_elementimpl.cpp
@@ -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 b77dff16c..a45902cd9 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -2761,7 +2761,7 @@ static TQString expandLF(const TQString& s)
unsigned pos2 = 0;
for(unsigned pos = 0; pos < len; pos++)
{
- TQChar c = s.tqat(pos);
+ TQChar c = s.at(pos);
switch(c.tqunicode())
{
case '\n':
diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp
index 9ced3bf1b..c1f7ac987 100644
--- a/khtml/html/html_imageimpl.cpp
+++ b/khtml/html/html_imageimpl.cpp
@@ -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;
@@ -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 d5e812029..58804bff5 100644
--- a/khtml/html/html_miscimpl.cpp
+++ b/khtml/html/html_miscimpl.cpp
@@ -328,14 +328,14 @@ NodeImpl *HTMLFormCollectionImpl::item( unsigned long index ) const
TQPtrList<HTMLGenericFormElementImpl>& l = static_cast<HTMLFormElementImpl*>( m_refNode )->formElements;
for (unsigned i = strt; i < l.count(); i++)
{
- if (l.tqat( i )->isEnumeratable())
+ if (l.at( i )->isEnumeratable())
{
if (dist == 0)
{
//Found it!
m_cache->position = index;
m_cache->current.index = i;
- return l.tqat( i );
+ return l.at( i );
}
else
--dist;
@@ -349,7 +349,7 @@ unsigned long HTMLFormCollectionImpl::calcLength(NodeImpl *start) const
unsigned length = 0;
TQPtrList<HTMLGenericFormElementImpl> l = static_cast<HTMLFormElementImpl*>( start )->formElements;
for ( unsigned i = 0; i < l.count(); i++ )
- if ( l.tqat( i )->isEnumeratable() )
+ if ( l.at( i )->isEnumeratable() )
++length;
return length;
}
@@ -369,7 +369,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const
//Go through the list, trying to find the appropriate named form element.
for ( ; currentNamePos < l.count(); ++currentNamePos )
{
- HTMLGenericFormElementImpl* el = l.tqat(currentNamePos);
+ HTMLGenericFormElementImpl* el = l.at(currentNamePos);
if (el->isEnumeratable() &&
((el->getAttribute(ATTR_ID) == name) ||
(el->getAttribute(ATTR_NAME) == name)))
@@ -387,7 +387,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const
TQPtrList<HTMLImageElementImpl>& il = static_cast<HTMLFormElementImpl*>( m_refNode )->imgElements;
for ( ; currentNameImgPos < il.count(); ++currentNameImgPos )
{
- HTMLImageElementImpl* el = il.tqat(currentNameImgPos);
+ HTMLImageElementImpl* el = il.at(currentNameImgPos);
if ((el->getAttribute(ATTR_ID) == name) ||
(el->getAttribute(ATTR_NAME) == name))
{
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index e55a915f2..e17e70110 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -234,7 +234,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
if (equalPos > 0) {
const TQString name = (*it).left (equalPos).upper ();
TQString value = (*it).right ((*it).length () - equalPos - 1);
- if (value.tqat(0)=='\"')
+ if (value.at(0)=='\"')
value = value.right (value.length () - 1);
if (value.at (value.length () - 1) == '\"')
value.truncate (value.length () - 1);
diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp
index c86b922dd..48eb7b764 100644
--- a/khtml/java/kjavaprocess.cpp
+++ b/khtml/java/kjavaprocess.cpp
@@ -168,7 +168,7 @@ void KJavaProcess::storeSize( TQByteArray* buff )
const char* size_ptr = size_str.latin1();
for( int i = 0; i < 8; ++i )
- buff->tqat(i) = size_ptr[i];
+ buff->at(i) = size_ptr[i];
}
void KJavaProcess::sendBuffer( TQByteArray* buff )
@@ -218,12 +218,12 @@ void KJavaProcess::popBuffer()
// kdDebug(6100) << "Sending buffer to java, buffer = >>";
// for( unsigned int i = 0; i < buf->size(); i++ )
// {
-// if( buf->tqat(i) == (char)0 )
+// if( buf->at(i) == (char)0 )
// kdDebug(6100) << "<SEP>";
-// else if( buf->tqat(i) > 0 && buf->tqat(i) < 10 )
-// kdDebug(6100) << "<CMD " << (int) buf->tqat(i) << ">";
+// else if( buf->at(i) > 0 && buf->at(i) < 10 )
+// kdDebug(6100) << "<CMD " << (int) buf->at(i) << ">";
// else
-// kdDebug(6100) << buf->tqat(i);
+// kdDebug(6100) << buf->at(i);
// }
// kdDebug(6100) << "<<" << endl;
diff --git a/khtml/khtml_caret.cpp b/khtml/khtml_caret.cpp
index 0946685cb..80df392aa 100644
--- a/khtml/khtml_caret.cpp
+++ b/khtml/khtml_caret.cpp
@@ -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();
@@ -2103,7 +2103,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
int n = (int)row->row->size();
int i;
for (i = 0; i < n; i++) {
- RenderTableCell *cell = row->row->tqat(i);
+ RenderTableCell *cell = row->row->at(i);
if (!cell || (long)cell == -1) continue;
int absx, absy;
@@ -2127,7 +2127,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
int index = i - ((cnt >> 1) + 1)*(cnt & 1) + (cnt >> 1)*!(cnt & 1);
if (index < 0 || index >= n) continue;
- RenderTableCell *cell = row->row->tqat(index);
+ RenderTableCell *cell = row->row->at(index);
if (!cell || (long)cell == -1) continue;
#if DEBUG_CARETMODE > 1
@@ -2227,7 +2227,7 @@ static int findRowInSection(RenderTableSection *section, RenderTableCell *cell,
// check for cell
int m = row->row->size();
for (int j = 0; j < m; j++) {
- RenderTableCell *c = row->row->tqat(j);
+ RenderTableCell *c = row->row->at(j);
if (c == directCell) return i;
}/*next j*/
diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp
index e736df5c2..935f31cc0 100644
--- a/khtml/khtml_pagecache.cpp
+++ b/khtml/khtml_pagecache.cpp
@@ -95,8 +95,8 @@ KHTMLPageCacheEntry::endData()
{
m_complete = true;
if ( m_file->status() == 0) {
- m_file->dataStream()->tqdevice()->flush();
- m_file->dataStream()->tqdevice()->tqat(0);
+ m_file->dataStream()->device()->flush();
+ m_file->dataStream()->device()->at(0);
}
}
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index 8108d856b..fff59c9bd 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -2286,7 +2286,7 @@ 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 );
@@ -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;
}
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc
index 3a9a4e297..431aec0ca 100644
--- a/khtml/khtml_settings.cc
+++ b/khtml/khtml_settings.cc
@@ -878,7 +878,7 @@ const TQString &KHTMLSettings::availableFamilies()
if ( !avFamilies ) {
avFamilies = new TQString;
TQFontDatabase db;
- TQStringList families = db.tqfamilies();
+ TQStringList families = db.families();
TQStringList s;
TQRegExp foundryExp(" \\[.+\\]");
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 2751d4177..d013d610e 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -867,7 +867,7 @@ void KHTMLView::layout()
}
#if 0
ElementImpl *listitem = m_part->xmlDocImpl()->getElementById("__test_element__");
- if (listitem) kdDebug(6000) << "after layout, 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
@@ -2284,7 +2284,7 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal
TQRect rec=en->getRect();
TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose);
connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) );
- connect( this, TQT_SIGNAL(repaintAccessKeys()), 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);
@@ -2937,7 +2937,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;
@@ -2983,7 +2983,7 @@ void KHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
if(!root) return;
- m_part->xmlDocImpl()->setPaintDevice(p->tqdevice());
+ m_part->xmlDocImpl()->setPaintDevice(p->device());
root->setPagedMode(true);
root->setStaticMode(true);
root->setWidth(rc.width());
@@ -3510,12 +3510,12 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
setStaticBackground(d->useSlowRepaints);
-// kdDebug() << "scheduled tqrepaint "<< d->repaintTimerId << endl;
+// kdDebug() << "scheduled repaint "<< d->repaintTimerId << endl;
killTimer(d->repaintTimerId);
d->repaintTimerId = 0;
TQRect updateRegion;
- TQMemArray<TQRect> rects = d->updateRegion.tqrects();
+ TQMemArray<TQRect> rects = d->updateRegion.rects();
d->updateRegion = TQRegion();
@@ -3645,10 +3645,10 @@ void KHTMLView::complete( bool pendingAction )
KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull;
}
- // is there a tqrepaint pending?
+ // is there a repaint pending?
if (d->repaintTimerId)
{
-// kdDebug() << "requesting tqrepaint now" << endl;
+// kdDebug() << "requesting repaint now" << endl;
// do it now
killTimer(d->repaintTimerId);
d->repaintTimerId = startTimer( 20 );
@@ -3702,7 +3702,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;
@@ -3877,7 +3877,7 @@ 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
repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
d->m_caretViewContext->width,
diff --git a/khtml/khtmlview.h b/khtml/khtmlview.h
index 6c9dc8808..67844bc3a 100644
--- a/khtml/khtmlview.h
+++ b/khtml/khtmlview.h
@@ -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/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index f688f10f7..8295b08a7 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -51,7 +51,7 @@ public:
Q_ASSERT( !m_lineComplete );
if ( storeNewline || c != '\n' ) {
int sz = m_currentLine.size();
- m_currentLine.tqresize( sz+1, TQGArray::SpeedOptim );
+ m_currentLine.resize( sz+1, TQGArray::SpeedOptim );
m_currentLine[sz] = c;
}
if ( c == '\n' )
@@ -68,7 +68,7 @@ public:
reset();
}
void reset() {
- m_currentLine.tqresize( 0, TQGArray::SpeedOptim );
+ m_currentLine.resize( 0, TQGArray::SpeedOptim );
m_lineComplete = false;
}
private:
diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp
index 58d531384..5efcaf98d 100644
--- a/khtml/misc/arena.cpp
+++ b/khtml/misc/arena.cpp
@@ -143,7 +143,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb)
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->mask; /* 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/htmlattrs.c b/khtml/misc/htmlattrs.c
index 6f420e3b3..779792e71 100644
--- a/khtml/misc/htmlattrs.c
+++ b/khtml/misc/htmlattrs.c
@@ -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",
diff --git a/khtml/misc/khtmllayout.h b/khtml/misc/khtmllayout.h
index b0c8dc613..1049d10c4 100644
--- a/khtml/misc/khtmllayout.h
+++ b/khtml/misc/khtmllayout.h
@@ -33,7 +33,7 @@ namespace khtml
const int UNDEFINED = -1;
- // tqalignment
+ // alignment
enum VAlign { VNone=0, Bottom, VCenter, Top, Baseline };
enum HAlign { HDefault, Left, HCenter, Right, HNone = 0 };
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index 8320a51c3..c04f13e37 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -397,7 +397,7 @@ public:
void sendTo(TQDataSink* sink, int n)
{
- sink->receive((const uchar*)&buffer.tqat(pos), n);
+ sink->receive((const uchar*)&buffer.at(pos), n);
pos += n;
@@ -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->disconnecStatus( this, TQT_SLOT( movieStatus( 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;
@@ -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->connecStatus( this, TQT_SLOT( movieStatus(int)));
+ m->connectStatus( this, TQT_SLOT( movieStatus(int)));
m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
}
}
diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h
index 8f60dcf02..125e8e07d 100644
--- a/khtml/misc/multimap.h
+++ b/khtml/misc/multimap.h
@@ -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;
}
diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp
index 30beadd7c..e866f8838 100644
--- a/khtml/rendering/bidi.cpp
+++ b/khtml/rendering/bidi.cpp
@@ -484,7 +484,7 @@ static void appendRunsForObject(int start, int end, RenderObject* obj, BidiState
bool haveNextMidpoint = (smidpoints && sCurrMidpoint < sNumMidpoints);
BidiIterator nextMidpoint;
if (haveNextMidpoint)
- nextMidpoint = smidpoints->tqat(sCurrMidpoint);
+ nextMidpoint = smidpoints->at(sCurrMidpoint);
if (betweenMidpoints) {
if (!(haveNextMidpoint && nextMidpoint.obj == obj))
return;
diff --git a/khtml/rendering/render_arena.cpp b/khtml/rendering/render_arena.cpp
index 023b98e36..99fbf4f4d 100644
--- a/khtml/rendering/render_arena.cpp
+++ b/khtml/rendering/render_arena.cpp
@@ -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
@@ -130,7 +130,7 @@ void RenderArena::free(size_t size, void* 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_body.cpp b/khtml/rendering/render_body.cpp
index 2ed114a53..930ec358c 100644
--- a/khtml/rendering/render_body.cpp
+++ b/khtml/rendering/render_body.cpp
@@ -81,11 +81,11 @@ 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::layout()
diff --git a/khtml/rendering/render_body.h b/khtml/rendering/render_body.h
index 17c237e91..7951f73e1 100644
--- a/khtml/rendering/render_body.h
+++ b/khtml/rendering/render_body.h
@@ -40,7 +40,7 @@ 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 layout();
virtual void setStyle(RenderStyle* style);
diff --git a/khtml/rendering/render_box.cpp b/khtml/rendering/render_box.cpp
index e63115361..1dda168c2 100644
--- a/khtml/rendering/render_box.cpp
+++ b/khtml/rendering/render_box.cpp
@@ -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() )
diff --git a/khtml/rendering/render_box.h b/khtml/rendering/render_box.h
index 78b85b5f4..c0c618d5c 100644
--- a/khtml/rendering/render_box.h
+++ b/khtml/rendering/render_box.h
@@ -87,7 +87,7 @@ 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 repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp
index e5947369d..6fdf45849 100644
--- a/khtml/rendering/render_canvas.cpp
+++ b/khtml/rendering/render_canvas.cpp
@@ -372,13 +372,13 @@ 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 repaints: " << 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) {
@@ -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.
@@ -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 cd4ef30ca..17f279d7b 100644
--- a/khtml/rendering/render_canvas.h
+++ b/khtml/rendering/render_canvas.h
@@ -61,7 +61,7 @@ public:
KHTMLView *view() const { return m_view; }
- virtual void tqrepaint(Priority p=NormalPriority);
+ 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;
diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp
index 13f17c08d..69f987477 100644
--- a/khtml/rendering/render_container.cpp
+++ b/khtml/rendering/render_container.cpp
@@ -170,11 +170,11 @@ 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
+ // 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());
diff --git a/khtml/rendering/render_flow.cpp b/khtml/rendering/render_flow.cpp
index 97dd40468..ae579bd46 100644
--- a/khtml/rendering/render_flow.cpp
+++ b/khtml/rendering/render_flow.cpp
@@ -267,7 +267,7 @@ 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.
@@ -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
@@ -306,7 +306,7 @@ void RenderFlow::tqrepaint(Priority prior)
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 3267a92f1..1e23822bb 100644
--- a/khtml/rendering/render_flow.h
+++ b/khtml/rendering/render_flow.h
@@ -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_image.cpp b/khtml/rendering/render_image.cpp
index b5357bba1..8626580d6 100644
--- a/khtml/rendering/render_image.cpp
+++ b/khtml/rendering/render_image.cpp
@@ -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_layer.cpp b/khtml/rendering/render_layer.cpp
index e82e0d831..96b0236cb 100644
--- a/khtml/rendering/render_layer.cpp
+++ b/khtml/rendering/render_layer.cpp
@@ -168,7 +168,7 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer)
if (m_negZOrderList) {
uint count = m_negZOrderList->count();
for (uint i = 0; i < count; i++) {
- RenderLayer* child = m_negZOrderList->tqat(i);
+ RenderLayer* child = m_negZOrderList->at(i);
r += child->paintedRegion(rootLayer);
}
}
@@ -188,19 +188,19 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer)
if (m_posZOrderList) {
uint count = m_posZOrderList->count();
for (uint i = 0; i < count; i++) {
- RenderLayer* child = m_posZOrderList->tqat(i);
+ RenderLayer* child = m_posZOrderList->at(i);
r += child->paintedRegion(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 );
@@ -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;
}
@@ -266,7 +266,7 @@ void RenderLayer::updateWidgetMasks(RenderLayer* rootLayer)
m_region = TQRect(0,0,sv->contentsWidth(),sv->contentsHeight());
for (uint i = 0; i < count; i++) {
- RenderLayer* child = m_posZOrderList->tqat(i);
+ RenderLayer* child = m_posZOrderList->at(i);
if (child->zIndex() == 0 && child->renderer()->style()->position() == STATIC)
continue; // we don't know the widget's exact stacking position within flow
m_region -= child->paintedRegion(rootLayer);
@@ -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;
@@ -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)
@@ -898,7 +898,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p,
if (m_negZOrderList) {
uint count = m_negZOrderList->count();
for (uint i = 0; i < count; i++) {
- RenderLayer* child = m_negZOrderList->tqat(i);
+ RenderLayer* child = m_negZOrderList->at(i);
child->paintLayer(rootLayer, p, paintDirtyRect, selectionOnly);
}
}
@@ -946,7 +946,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p,
if (m_posZOrderList) {
uint count = m_posZOrderList->count();
for (uint i = 0; i < count; i++) {
- RenderLayer* child = m_posZOrderList->tqat(i);
+ RenderLayer* child = m_posZOrderList->at(i);
child->paintLayer(rootLayer, p, paintDirtyRect, selectionOnly);
}
}
@@ -1026,7 +1026,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje
if (m_posZOrderList) {
uint count = m_posZOrderList->count();
for (int i = count-1; i >= 0; i--) {
- RenderLayer* child = m_posZOrderList->tqat(i);
+ RenderLayer* child = m_posZOrderList->at(i);
insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect);
if (insideLayer)
return insideLayer;
@@ -1057,7 +1057,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje
if (m_negZOrderList) {
uint count = m_negZOrderList->count();
for (int i = count-1; i >= 0; i--) {
- RenderLayer* child = m_negZOrderList->tqat(i);
+ RenderLayer* child = m_negZOrderList->at(i);
insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect);
if (insideLayer)
return insideLayer;
@@ -1261,8 +1261,8 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer,
for (uint i = end-1; i > start; i--) {
bool sorted = true;
for (uint j = start; j < i; j++) {
- RenderLayer* elt = buffer->tqat(j);
- RenderLayer* elt2 = buffer->tqat(j+1);
+ RenderLayer* elt = buffer->at(j);
+ RenderLayer* elt2 = buffer->at(j+1);
if (elt->zIndex() > elt2->zIndex()) {
sorted = false;
buffer->insert(j, elt2);
@@ -1279,8 +1279,8 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer,
sortByZOrder(buffer, mergeBuffer, start, mid);
sortByZOrder(buffer, mergeBuffer, mid, end);
- RenderLayer* elt = buffer->tqat(mid-1);
- RenderLayer* elt2 = buffer->tqat(mid);
+ RenderLayer* elt = buffer->at(mid-1);
+ RenderLayer* elt2 = buffer->at(mid);
// Handle the fast common case (of equal z-indices). The list may already
// be completely sorted.
@@ -1293,26 +1293,26 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer,
uint i1 = start;
uint i2 = mid;
- elt = buffer->tqat(i1);
- elt2 = buffer->tqat(i2);
+ elt = buffer->at(i1);
+ elt2 = buffer->at(i2);
while (i1 < mid || i2 < end) {
if (i1 < mid && (i2 == end || elt->zIndex() <= elt2->zIndex())) {
mergeBuffer->insert(mergeBuffer->count(), elt);
i1++;
if (i1 < mid)
- elt = buffer->tqat(i1);
+ elt = buffer->at(i1);
}
else {
mergeBuffer->insert(mergeBuffer->count(), elt2);
i2++;
if (i2 < end)
- elt2 = buffer->tqat(i2);
+ elt2 = buffer->at(i2);
}
}
for (uint i = start; i < end; i++)
- buffer->insert(i, mergeBuffer->tqat(i-start));
+ buffer->insert(i, mergeBuffer->at(i-start));
mergeBuffer->clear();
}
@@ -1471,7 +1471,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa
if (negList) {
for (unsigned i = 0; i != negList->count(); ++i)
- writeLayers(ts, rootLayer, negList->tqat(i), paintDirtyRect, indent );
+ writeLayers(ts, rootLayer, negList->at(i), paintDirtyRect, indent );
}
if (shouldPaint)
@@ -1485,7 +1485,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa
TQPtrVector<RenderLayer>* posList = l->posZOrderList();
if (posList) {
for (unsigned i = 0; i != posList->count(); ++i)
- writeLayers(ts, rootLayer, posList->tqat(i), paintDirtyRect, indent);
+ writeLayers(ts, rootLayer, posList->at(i), paintDirtyRect, indent);
}
}
diff --git a/khtml/rendering/render_layer.h b/khtml/rendering/render_layer.h
index 1176a63a3..a8f1e5adc 100644
--- a/khtml/rendering/render_layer.h
+++ b/khtml/rendering/render_layer.h
@@ -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();
diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp
index e69991930..162ca4956 100644
--- a/khtml/rendering/render_object.cpp
+++ b/khtml/rendering/render_object.cpp
@@ -535,9 +535,9 @@ bool RenderObject::hasStaticY() const
void RenderObject::setPixmap(const TQPixmap&, const TQRect& /*r*/, CachedImage* image)
{
- //tqrepaint bg when it finished loading
+ //repaint bg when it finished loading
if(image && parent() && style() && style()->backgroundLayers()->containsImage(image)) {
- isBody() ? canvas()->tqrepaint() : tqrepaint();
+ isBody() ? canvas()->repaint() : repaint();
}
}
@@ -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() ) ||
@@ -1345,7 +1345,7 @@ void RenderObject::setStyle(RenderStyle *style)
}
setNeedsLayoutAndMinMaxRecalc();
} else if (!isText() && d >= RenderStyle::Visible) {
- // a tqrepaint is enough
+ // a repaint is enough
if (layer()) {
if (canvas() && canvas()->needsWidgetMasks()) {
// update our widget masks
@@ -1357,9 +1357,9 @@ void RenderObject::setStyle(RenderStyle *style)
}
}
if (layer() && !isInlineFlow())
- layer()->tqrepaint(pri);
+ layer()->repaint(pri);
else
- tqrepaint(pri);
+ repaint(pri);
}
}
}
@@ -1428,9 +1428,9 @@ 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 );
}
}
@@ -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 )
diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h
index e403601d3..f7f772387 100644
--- a/khtml/rendering/render_object.h
+++ b/khtml/rendering/render_object.h
@@ -441,7 +441,7 @@ public:
void layoutIfNeeded() { if (needsLayout()) layout(); }
// used for element state updates that can not be fixed with a
- // tqrepaint and do not need a relayout
+ // repaint and do not need a relayout
virtual void updateFromElement() {}
// Called immediately after render-object is inserted
@@ -681,8 +681,8 @@ 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); }
+ // 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; }
@@ -747,7 +747,7 @@ 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 layout
+ // recursively invalidate current layout
// unused: void invalidateLayout();
virtual void calcVerticalMargins() {}
diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
index f0a6f94a9..7653b746c 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -183,7 +183,7 @@ bool RenderWidget::event( TQEvent *e )
return true;
TQWidgetResizeEvent *re = static_cast<TQWidgetResizeEvent *>(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 ( ::tqqt_cast<KHTMLView *>( m_widget ) )
@@ -543,10 +543,10 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
}
}
}
- TQMemArray<TQRect> br = blit.tqrects();
+ TQMemArray<TQRect> br = blit.rects();
const int cnt = br.size();
- const bool external = p->tqdevice()->isExtDev();
+ const bool external = p->device()->isExtDev();
TQPixmap* const pm = PaintBuffer::grab( widget->size() );
if (!pm)
{
diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp
index 81d0b62ed..ecbbf6de2 100644
--- a/khtml/rendering/render_style.cpp
+++ b/khtml/rendering/render_style.cpp
@@ -726,7 +726,7 @@ bool RenderStyle::inheritedNotEqual( RenderStyle *other ) const
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 tqrepaint nor relayout after
+ NonVisible: The object does need neither repaint nor relayout after
the change.
### TODO:
@@ -744,7 +744,7 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const
// EUserInput _user_input : 2; as long as :enabled is not impl'd
// ### this needs work to know more exactly if we need a relayout
-// or just a tqrepaint
+// or just a repaint
// non-inherited attributes
// DataRef<StyleBoxData> box;
diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp
index 26e9c26d5..2cf1bf1f9 100644
--- a/khtml/rendering/render_table.cpp
+++ b/khtml/rendering/render_table.cpp
@@ -482,7 +482,7 @@ void RenderTable::paint( PaintInfo& pI, int _tx, int _ty)
#if 0
TQString m;
for (uint i = 0; i < borderStyles.count(); i++)
- m += TQString("%1 ").arg((*borderStyles.tqat(i)).width());
+ m += TQString("%1 ").arg((*borderStyles.at(i)).width());
kdDebug(6040) << m << endl;
#endif
TQValueListIterator<CollapsedBorderValue> it = borderStyles.begin();
diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp
index cc41a1688..58c9c33df 100644
--- a/khtml/rendering/render_text.cpp
+++ b/khtml/rendering/render_text.cpp
@@ -738,7 +738,7 @@ void RenderText::deleteInlineBoxes(RenderArena* arena)
if (!arena)
arena = renderArena();
for(unsigned int i=0; i < len; i++) {
- InlineTextBox* s = m_lines.tqat(i);
+ InlineTextBox* s = m_lines.at(i);
if (s)
s->detach(arena);
m_lines.remove(i);
@@ -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
@@ -1464,7 +1464,7 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s)
TQString result;
result += '"';
for (uint i = 0; i != s.length(); ++i) {
- TQChar c = s.tqat(i);
+ TQChar c = s.at(i);
if (c == '\\') {
result += "\\\\";
} else if (c == '"') {
diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h
index 0923837b3..fabf5e051 100644
--- a/khtml/rendering/render_text.h
+++ b/khtml/rendering/render_text.h
@@ -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;
diff --git a/khtml/test/align2.html b/khtml/test/align2.html
index 789fa3203..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 contains 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/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_regression.cpp b/khtml/test_regression.cpp
index c4b5593a1..95e8afbd8 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -1051,7 +1051,7 @@ void RegressionTest::doJavascriptReport( const TQString &test )
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.tqat( 0 ) == '\n' )
+ if ( text.at( 0 ) == '\n' )
text = text.mid( 1, text.length() );
text.replace( '\n', "<br>\n" );
cl += text;
diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp
index 834f4b674..0af9c75a2 100644
--- a/khtml/xml/dom_nodeimpl.cpp
+++ b/khtml/xml/dom_nodeimpl.cpp
@@ -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;
@@ -1925,7 +1925,7 @@ NodeImpl *GenericRONamedNodeMapImpl::item ( unsigned long index ) const
if (index >= m_contents->count())
return 0;
- return m_contents->tqat(index);
+ return m_contents->at(index);
}
unsigned long GenericRONamedNodeMapImpl::length( ) const