From 1180237ab336226ad932d767a6cb56208314988f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:22:15 -0600 Subject: Rename obsolete tq methods to standard names --- khtml/html/html_documentimpl.cpp | 2 +- khtml/html/html_elementimpl.cpp | 10 +++++----- khtml/html/html_formimpl.cpp | 4 ++-- khtml/html/html_imageimpl.cpp | 4 ++-- khtml/html/htmltokenizer.cpp | 26 +++++++++++++------------- khtml/html/htmltokenizer.h | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) (limited to 'khtml/html') diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp index c0bef4434..e2ee3ba57 100644 --- a/khtml/html/html_documentimpl.cpp +++ b/khtml/html/html_documentimpl.cpp @@ -235,7 +235,7 @@ HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url) TQString s; int pos = url.find('#'); //kdDebug(0) << "map pos of #:" << pos << endl; - s = TQString(_url.tqunicode() + pos + 1, _url.length() - pos - 1); + s = TQString(_url.unicode() + pos + 1, _url.length() - pos - 1); TQMapConstIterator it = mapMap.find(s); diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp index 89b3587cc..f635fcc3d 100644 --- a/khtml/html/html_elementimpl.cpp +++ b/khtml/html/html_elementimpl.cpp @@ -176,7 +176,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr) case ATTR_CLASS: if (attr->val()) { DOMString v = attr->value(); - const TQChar* s = v.tqunicode(); + const TQChar* s = v.unicode(); int l = v.length(); while( l && !s->isSpace() ) l--,s++; @@ -354,11 +354,11 @@ static inline bool isHexDigit( const TQChar &c ) { static inline int toHex( const TQChar &c ) { return ( (c >= TQChar('0') && c <= TQChar('9')) - ? (c.tqunicode() - '0') + ? (c.unicode() - '0') : ( ( c >= TQChar('a') && c <= TQChar('f') ) - ? (c.tqunicode() - 'a' + 10) + ? (c.unicode() - 'a' + 10) : ( ( c >= TQChar('A') && c <= TQChar('F') ) - ? (c.tqunicode() - 'A' + 10) + ? (c.unicode() - 'A' + 10) : -1 ) ) ); } @@ -457,7 +457,7 @@ DOMString HTMLElementImpl::innerHTML() const TQString result; //Use TQString to accumulate since DOMString is poor for appends for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) { DOMString kid = child->toString(); - result += TQConstString(kid.tqunicode(), kid.length()).string(); + result += TQConstString(kid.unicode(), kid.length()).string(); } return result; } diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index a45902cd9..2d4428494 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -193,7 +193,7 @@ inline static TQString escapeUnencodeable(const TQTextCodec* codec, const TQStri enc_string.append(c); else { TQString ampersandEscape; - ampersandEscape.sprintf("&#%u;", c.tqunicode()); + ampersandEscape.sprintf("&#%u;", c.unicode()); enc_string.append(ampersandEscape); } } @@ -2762,7 +2762,7 @@ static TQString expandLF(const TQString& s) for(unsigned pos = 0; pos < len; pos++) { TQChar c = s.at(pos); - switch(c.tqunicode()) + switch(c.unicode()) { case '\n': r[pos2++] = '\r'; diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp index c1f7ac987..be13e93c2 100644 --- a/khtml/html/html_imageimpl.cpp +++ b/khtml/html/html_imageimpl.cpp @@ -418,8 +418,8 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr) case ATTR_NAME: { DOMString s = attr->value(); - if(*s.tqunicode() == '#') - name = TQString(s.tqunicode()+1, s.length()-1).lower(); + if(*s.unicode() == '#') + name = TQString(s.unicode()+1, s.length()-1).lower(); else name = s.string().lower(); // ### make this work for XML documents, e.g. in case of diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp index 778b9fe3a..5da6edd14 100644 --- a/khtml/html/htmltokenizer.cpp +++ b/khtml/html/htmltokenizer.cpp @@ -89,7 +89,7 @@ static const char titleEnd [] = "tqunicode() == '-') { + if (src->unicode() == '-') { delimiterCount++; if (delimiterCount == 2) { delimiterCount = 0; @@ -482,7 +482,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src) delimiterCount = 0; } - if ((!strict || canClose) && src->tqunicode() == '>') + if ((!strict || canClose) && src->unicode() == '>') { bool handleBrokenComments = brokenComments && !( script || style ); bool scriptEnd=false; @@ -521,7 +521,7 @@ void HTMLTokenizer::parseServer(TokenizerString &src) checkScriptBuffer(src.length()); while ( !src.isEmpty() ) { scriptCode[ scriptCodeSize++ ] = *src; - if (src->tqunicode() == '>' && + if (src->unicode() == '>' && scriptCodeSize > 1 && scriptCode[scriptCodeSize-2] == '%') { ++src; server = false; @@ -607,7 +607,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) while( !src.isEmpty() ) { - ushort cc = src->tqunicode(); + ushort cc = src->unicode(); switch(Entity) { case NoEntity: return; @@ -639,7 +639,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) case Hexadecimal: { - int uc = EntityChar.tqunicode(); + int uc = EntityChar.unicode(); int ll = kMin(src.length(), 8); while(ll--) { TQChar csrc(src->lower()); @@ -658,7 +658,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) } case Decimal: { - int uc = EntityChar.tqunicode(); + int uc = EntityChar.unicode(); int ll = kMin(src.length(), 9-cBufferPos); while(ll--) { cc = src->cell(); @@ -718,7 +718,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) } case SearchSemicolon: #ifdef TOKEN_DEBUG - kdDebug( 6036 ) << "ENTITY " << EntityChar.tqunicode() << endl; + kdDebug( 6036 ) << "ENTITY " << EntityChar.unicode() << endl; #endif fixUpChar(EntityChar); @@ -956,7 +956,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) ushort curchar; bool atespace = false; while(!src.isEmpty()) { - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar > ' ') { if(curchar == '=') { #ifdef TOKEN_DEBUG @@ -988,7 +988,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) { ushort curchar; while(!src.isEmpty()) { - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar > ' ') { if(( curchar == '\'' || curchar == '\"' )) { tquote = curchar == '\"' ? DoubleQuote : SingleQuote; @@ -1012,7 +1012,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) while(!src.isEmpty()) { checkBuffer(); - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar <= '\'' && !src.escaped()) { // ### attributes like '&{blaa....};' are supposed to be treated as jscript. if ( curchar == '&' ) @@ -1050,7 +1050,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) ushort curchar; while(!src.isEmpty()) { checkBuffer(); - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar <= '>' && !src.escaped()) { // parse Entities if ( curchar == '&' ) @@ -1351,7 +1351,7 @@ void HTMLTokenizer::write( const TokenizerString &str, bool appendData ) // do we need to enlarge the buffer? checkBuffer(); - ushort cc = src->tqunicode(); + ushort cc = src->unicode(); if (skipLF && (cc != '\n')) skipLF = false; diff --git a/khtml/html/htmltokenizer.h b/khtml/html/htmltokenizer.h index 2197a5083..8e36353b0 100644 --- a/khtml/html/htmltokenizer.h +++ b/khtml/html/htmltokenizer.h @@ -76,8 +76,8 @@ namespace khtml { { DOMStringImpl *value = 0; NodeImpl::Id tid = 0; - if(buffer->tqunicode()) { - tid = buffer->tqunicode(); + if(buffer->unicode()) { + tid = buffer->unicode(); value = v.implementation(); } else if ( !attrName.isEmpty() && attrName != "/" ) { -- cgit v1.2.1