From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: 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 --- khtml/dom/css_extensions.cpp | 6 +++--- khtml/dom/css_extensions.h | 32 ++++++++++++++++---------------- khtml/dom/css_rule.h | 4 ++-- khtml/dom/css_stylesheet.h | 4 ++-- khtml/dom/css_value.cpp | 8 ++++---- khtml/dom/css_value.h | 4 ++-- khtml/dom/dom2_events.h | 4 ++-- khtml/dom/dom2_traversal.h | 2 +- khtml/dom/dom2_views.h | 2 +- khtml/dom/dom_doc.cpp | 4 ++-- khtml/dom/dom_doc.h | 16 ++++++++-------- khtml/dom/dom_element.h | 30 +++++++++++++++--------------- khtml/dom/dom_node.cpp | 4 ++-- khtml/dom/dom_node.h | 32 ++++++++++++++++---------------- khtml/dom/dom_string.cpp | 20 ++++++++++---------- khtml/dom/dom_string.h | 4 ++-- khtml/dom/dom_text.cpp | 4 ++-- khtml/dom/dom_text.h | 12 ++++++------ khtml/dom/dom_xml.h | 14 +++++++------- khtml/dom/html_base.h | 4 ++-- khtml/dom/html_block.h | 6 +++--- khtml/dom/html_document.h | 6 +++--- khtml/dom/html_element.cpp | 2 +- khtml/dom/html_form.h | 4 ++-- khtml/dom/html_head.h | 2 +- khtml/dom/html_image.cpp | 2 +- khtml/dom/html_image.h | 12 ++++++------ khtml/dom/html_inline.cpp | 2 +- khtml/dom/html_inline.h | 12 ++++++------ khtml/dom/html_misc.h | 2 +- khtml/dom/html_object.h | 2 +- khtml/dom/html_table.h | 26 +++++++++++++------------- 32 files changed, 144 insertions(+), 144 deletions(-) (limited to 'khtml/dom') 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 - * table-tqlayout property definition in CSS2. + * href="http://www.w3.org/TR/REC-CSS2/tables.html#propdef-table-layout"> + * table-layout property definition in CSS2. * */ DOM::DOMString tableLayout() const; @@ -2515,14 +2515,14 @@ public: /** * See the - * tqunicode-bidi property definition in CSS2. + * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-unicode-bidi"> + * unicode-bidi property definition 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(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 + * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-shape"> * rect 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("") + title.string() + - TQString::tqfromLatin1("")); + r->write(TQString::fromLatin1("") + title.string() + + TQString::fromLatin1("")); 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 * align attribute definition in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -231,7 +231,7 @@ public: ~HTMLHeadingElement(); /** - * Horizontal text tqalignment. See the * align attribute definition in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -272,7 +272,7 @@ public: ~HTMLParagraphElement(); /** - * Horizontal text tqalignment. See the * align attribute definition 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(elementId)) { + if (other.elementId() != static_cast(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 * INPUT element definition in HTML 4.0. * @@ -798,7 +798,7 @@ public: void setAccessKey( const DOMString & ); /** - * Text tqalignment relative to \c FIELDSET . See the * align attribute definition 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 * * META element definition 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 * coords attribute definition 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 - * tqshape attribute definition in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape"> + * shape attribute definition 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 * coords attribute definition 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 - * tqshape attribute definition in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape"> + * shape attribute definition 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 * align attribute definition 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 * align attribute definition in HTML 4.0. * @@ -187,7 +187,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the * charoff attribute definition in HTML 4.0. * @@ -281,7 +281,7 @@ public: void setScope( const DOMString & ); /** - * Vertical tqalignment of data in cell. See the * valign attribute definition in HTML 4.0. * @@ -338,7 +338,7 @@ public: ~HTMLTableColElement(); /** - * Horizontal tqalignment of cell data in column. See the * align attribute definition in HTML 4.0. * @@ -364,7 +364,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the * charoff attribute definition in HTML 4.0. * @@ -391,7 +391,7 @@ public: void setSpan( long ); /** - * Vertical tqalignment of cell data in column. See the * valign attribute definition 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 * * align attribute definition in HTML 4.0. @@ -831,7 +831,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the * charoff attribute definition in HTML 4.0. * @@ -844,7 +844,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical tqalignment of data within cells of this row. See the * valign attribute definition 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 * charoff attribute definition 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. * */ -- cgit v1.2.1