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

21 files changed, 134 insertions, 134 deletions

diff --git a/khtml/css/css_base.cpp b/khtml/css/css_base.cpp
index 2ffbbb0a4..5af37b9b9 100644
--- a/khtml/css/css_base.cpp
+++ b/khtml/css/css_base.cpp
@@ -56,9 +56,9 @@ StyleSheetImpl* StyleBaseImpl::stylesheet()
 
 KURL StyleBaseImpl::baseURL()
 {
-    // try to tqfind the style sheet. If found look for its url.
+    // try to find the style sheet. If found look for its url.
     // If it has none, look for the parentsheet, or the parentNode and
-    // try to tqfind out about their url
+    // try to find out about their url
 
     StyleSheetImpl *sheet = stylesheet();
 
@@ -67,7 +67,7 @@ KURL StyleBaseImpl::baseURL()
     if(!sheet->href().isNull())
         return KURL( sheet->href().string() );
 
-    // tqfind parent
+    // find parent
     if(sheet->parent()) return sheet->parent()->baseURL();
 
     if(!sheet->ownerNode()) return KURL();
@@ -172,7 +172,7 @@ void CSSSelector::extractPseudoType() const
         value = value.lower();
         switch (value[0]) {
             case '-':
-                if (value == "-khtml-tqreplaced")
+                if (value == "-khtml-replaced")
                     _pseudoType = PseudoReplaced;
                 else
                 if (value == "-khtml-marker")
@@ -196,7 +196,7 @@ void CSSSelector::extractPseudoType() const
             case 'c':
                 if (value == "checked")
                     _pseudoType = PseudoChecked;
-                else if (value == "tqcontains(")
+                else if (value == "contains(")
                     _pseudoType = PseudoContains;
                 break;
             case 'd':
@@ -319,7 +319,7 @@ DOMString CSSSelector::selectorText() const
     // the original namespace prefix used. Ugh. -dwh
     DOMString str;
     const CSSSelector* cs = this;
-    TQ_UINT16 tag = localNamePart(cs->tag);
+    Q_UINT16 tag = localNamePart(cs->tag);
     if (tag == anyLocalName && cs->match == CSSSelector::None)
         str = "*";
     else if (tag != anyLocalName)
diff --git a/khtml/css/css_base.h b/khtml/css/css_base.h
index 75611f054..9a8774107 100644
--- a/khtml/css/css_base.h
+++ b/khtml/css/css_base.h
@@ -176,7 +176,7 @@ namespace DOM {
         mutable DOM::DOMString value;
 	CSSSelector *tagHistory;
         CSSSelector* simpleSelector; // Used by :not
-        DOM::DOMString string_arg; // Used by :tqcontains, :lang and :nth-*
+        DOM::DOMString string_arg; // Used by :contains, :lang and :nth-*
         DOM::NodeImpl::Id attr;
         DOM::NodeImpl::Id tag;
 
diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/khtml/css/css_renderstyledeclarationimpl.cpp
index ef60d5262..daf607a9e 100644
--- a/khtml/css/css_renderstyledeclarationimpl.cpp
+++ b/khtml/css/css_renderstyledeclarationimpl.cpp
@@ -367,7 +367,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
     if (!node)
         return 0;
 
-    // Make sure our tqlayout is up to date before we allow a query on these attributes.
+    // Make sure our layout is up to date before we allow a query on these attributes.
     DocumentImpl* docimpl = node->getDocument();
     if (docimpl) {
         docimpl->updateLayout();
@@ -930,7 +930,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
     case CSS_PROP_TOP:
         return getPositionOffsetValue(renderer, CSS_PROP_TOP);
     case CSS_PROP_UNICODE_BIDI:
-        switch (style->tqunicodeBidi()) {
+        switch (style->unicodeBidi()) {
         case UBNormal:
             return new CSSPrimitiveValueImpl(CSS_VAL_NORMAL);
         case Embed:
diff --git a/khtml/css/css_stylesheetimpl.cpp b/khtml/css/css_stylesheetimpl.cpp
index 855b1a6e8..bf85c0d59 100644
--- a/khtml/css/css_stylesheetimpl.cpp
+++ b/khtml/css/css_stylesheetimpl.cpp
@@ -235,7 +235,7 @@ void CSSStyleSheetImpl::addNamespace(CSSParser* p, const DOM::DOMString& prefix,
     }
 }
 
-void CSSStyleSheetImpl::determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix)
+void CSSStyleSheetImpl::determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix)
 {
     // If the stylesheet has no namespaces we can just return.  There won't be any need to ever check
     // namespace values in selectors.
@@ -253,7 +253,7 @@ void CSSStyleSheetImpl::determineNamespace(TQ_UINT32& id, const DOM::DOMString&
             Q_ASSERT(m_doc != 0);
 
             // Look up the id for this namespace URI.
-            TQ_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode);
+            Q_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode);
             id = makeId(nsid, localNamePart(id));
         }
     }
@@ -324,7 +324,7 @@ StyleSheetListImpl::~StyleSheetListImpl()
 
 void StyleSheetListImpl::add( StyleSheetImpl* s )
 {
-    if ( !styleSheets.tqcontainsRef( s ) ) {
+    if ( !styleSheets.containsRef( s ) ) {
         s->ref();
         styleSheets.append( s );
     }
@@ -377,10 +377,10 @@ MediaListImpl::MediaListImpl( CSSRuleImpl *parentRule, const DOMString &media )
     setMediaText( media );
 }
 
-bool MediaListImpl::tqcontains( const DOMString &medium ) const
+bool MediaListImpl::contains( const DOMString &medium ) const
 {
-    return m_lstMedia.empty() || m_lstMedia.tqcontains( medium ) ||
-            m_lstMedia.tqcontains( "all" );
+    return m_lstMedia.empty() || m_lstMedia.contains( medium ) ||
+            m_lstMedia.contains( "all" );
 }
 
 CSSStyleSheetImpl *MediaListImpl::parentStyleSheet() const
diff --git a/khtml/css/css_stylesheetimpl.h b/khtml/css/css_stylesheetimpl.h
index 80f2b4ed8..e7a551947 100644
--- a/khtml/css/css_stylesheetimpl.h
+++ b/khtml/css/css_stylesheetimpl.h
@@ -101,8 +101,8 @@ public:
     void deleteRule ( unsigned long index, int &exceptioncode );
 
     void addNamespace(CSSParser* p, const DOM::DOMString& prefix, const DOM::DOMString& uri);
-    void determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix);
-    TQ_UINT32 defaultNamespace() { return m_defaultNamespace; };
+    void determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix);
+    Q_UINT32 defaultNamespace() { return m_defaultNamespace; };
 
     void setCharset(const DOMString &charset) { m_charset = charset; }
     const DOMString& charset() const { return m_charset; }
@@ -123,7 +123,7 @@ public:
 protected:
     DocumentImpl *m_doc;
     bool m_implicit;
-    TQ_UINT32 m_defaultNamespace;
+    Q_UINT32 m_defaultNamespace;
     CSSNamespace* m_namespaces;
     DOMString m_charset;
 };
@@ -172,14 +172,14 @@ public:
     void setMediaText(const DOM::DOMString &value);
 
     /**
-     * Check if the list tqcontains either the requested medium, or the
+     * Check if the list contains either the requested medium, or the
      * catch-all "all" media type. Returns true when found, false otherwise.
      * Since not specifying media types should be treated as "all" according
      * to DOM specs, an empty list always returns true.
      *
      * _NOT_ part of the DOM!
      */
-    bool tqcontains( const DOM::DOMString &medium ) const;
+    bool contains( const DOM::DOMString &medium ) const;
 
 protected:
     TQValueList<DOM::DOMString> m_lstMedia;
diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp
index c5ab10a08..52e962725 100644
--- a/khtml/css/css_valueimpl.cpp
+++ b/khtml/css/css_valueimpl.cpp
@@ -57,8 +57,8 @@ static DOMString quoteStringIfNeeded(const DOMString &string)
 {
     // FIXME: Also need to transform control characters into \ sequences.
     TQString s = string.string();
-    s.tqreplace('\\', "\\\\");
-    s.tqreplace('\'', "\\'");
+    s.replace('\\', "\\\\");
+    s.replace('\'', "\\'");
     return '\'' + s + '\'';
 }
 
@@ -757,14 +757,14 @@ DOM::DOMString CSSPrimitiveValueImpl::cssText() const
             break;
         }
 	case CSSPrimitiveValue::CSS_RGBCOLOR:
-	    if (tqAlpha(m_value.rgbcolor) != 0xFF) {
+	    if (qAlpha(m_value.rgbcolor) != 0xFF) {
 		if (m_value.rgbcolor == khtml::transparentColor)
 		    text = "transparent";
 		else
-		    text = "rgba(" + TQString::number(tqRed  (m_value.rgbcolor)) + "," 
-				   + TQString::number(tqBlue (m_value.rgbcolor)) + "," 
-				   + TQString::number(tqGreen(m_value.rgbcolor)) + "," 
-				   + TQString::number(tqAlpha(m_value.rgbcolor)/255.0) + ")";
+		    text = "rgba(" + TQString::number(qRed  (m_value.rgbcolor)) + "," 
+				   + TQString::number(qBlue (m_value.rgbcolor)) + "," 
+				   + TQString::number(qGreen(m_value.rgbcolor)) + "," 
+				   + TQString::number(qAlpha(m_value.rgbcolor)/255.0) + ")";
 	    } else {
 		text = TQColor(m_value.rgbcolor).name();
 	    }
@@ -886,9 +886,9 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
 
     parsedFontName = string;
     // a language tag is often added in braces at the end. Remove it.
-    parsedFontName.tqreplace(parenReg, TQString::null);
+    parsedFontName.replace(parenReg, TQString::null);
     // remove [Xft] qualifiers
-    parsedFontName.tqreplace(braceReg, TQString::null);
+    parsedFontName.replace(braceReg, TQString::null);
 
 #ifndef APPLE_CHANGES
     const TQString &available = KHTMLSettings::availableFamilies();
@@ -896,21 +896,21 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
     parsedFontName = parsedFontName.lower();
     // kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl;
 
-    int pos = available.tqfind( ',' + parsedFontName + ',', 0, false );
+    int pos = available.find( ',' + parsedFontName + ',', 0, false );
     if ( pos == -1 ) {
         // many pages add extra MSs to make sure it's windows only ;(
         if ( parsedFontName.startsWith( "ms " ) )
             parsedFontName = parsedFontName.mid( 3 );
         if ( parsedFontName.endsWith( " ms" ) )
             parsedFontName.truncate( parsedFontName.length() - 3 );
-        pos = available.tqfind( ",ms " + parsedFontName + ',', 0, false );
+        pos = available.find( ",ms " + parsedFontName + ',', 0, false );
         if ( pos == -1 )
-            pos = available.tqfind( ',' + parsedFontName + " ms,", 0, false );
+            pos = available.find( ',' + parsedFontName + " ms,", 0, false );
     }
 
     if ( pos != -1 ) {
        ++pos;
-       int p = available.tqfind(',', pos);
+       int p = available.find(',', pos);
        assert( p != -1 ); // available is supposed to start and end with ,
        parsedFontName = available.mid( pos, p - pos);
        // kdDebug(0) << "going for '" << parsedFontName << "'" << endl;
diff --git a/khtml/css/csshelper.cpp b/khtml/css/csshelper.cpp
index f1d681bd6..73eff588c 100644
--- a/khtml/css/csshelper.cpp
+++ b/khtml/css/csshelper.cpp
@@ -78,7 +78,7 @@ DOMString khtml::parseURL(const DOMString &url)
 
     int nl = 0;
     for(int k = o; k < o+l; k++)
-        if(i->s[k].tqunicode() > '\r')
+        if(i->s[k].unicode() > '\r')
             j->s[nl++] = i->s[k];
 
     j->l = nl;
diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp
index 4dff70ba9..d167af025 100644
--- a/khtml/css/cssparser.cpp
+++ b/khtml/css/cssparser.cpp
@@ -166,7 +166,7 @@ void CSSParser::parseSheet( CSSStyleSheetImpl *sheet, const DOMString &string )
 
     int length = string.length() + 3;
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
-    memcpy( data, string.tqunicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data, string.unicode(), string.length()*sizeof( unsigned short) );
 
 #ifdef CSS_DEBUG
     kdDebug( 6080 ) << ">>>>>>> start parsing style sheet" << endl;
@@ -190,7 +190,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
     for ( unsigned int i = 0; i < strlen(khtml_rule); i++ )
         data[i] = khtml_rule[i];
-    memcpy( data + strlen( khtml_rule ), string.tqunicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
     // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
     data[length-4] = '}';
 
@@ -218,7 +218,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id,
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
     for ( unsigned int i = 0; i < strlen(khtml_value); i++ )
         data[i] = khtml_value[i];
-    memcpy( data + strlen( khtml_value ), string.tqunicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) );
     data[length-4] = '}';
     // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
 
@@ -260,7 +260,7 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
     for ( unsigned int i = 0; i < strlen(khtml_decls); i++ )
         data[i] = khtml_decls[i];
-    memcpy( data + strlen( khtml_decls ), string.tqunicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
     data[length-4] = '}';
 
     nonCSSHint = _nonCSSHint;
@@ -522,7 +522,7 @@ bool CSSParser::parseValue( int propId, bool important )
             valid_primitive = true;
         break;
 
-    case CSS_PROP_CLIP:                 // <tqshape> | auto | inherit
+    case CSS_PROP_CLIP:                 // <shape> | auto | inherit
         if ( id == CSS_VAL_AUTO )
             valid_primitive = true;
         else if ( value->unit == Value::Function )
@@ -1186,7 +1186,7 @@ bool CSSParser::parseBackgroundShorthand(bool important)
 	    }
 	}
 
-        // if we didn't tqfind at least one match, this is an
+        // if we didn't find at least one match, this is an
         // invalid shorthand and we have to ignore it
         if (!found)
             goto fail;
@@ -1243,7 +1243,7 @@ bool CSSParser::parseShortHand(int propId, const int *properties, int numPropert
             }
         }
 
-        // if we didn't tqfind at least one match, this is an
+        // if we didn't find at least one match, this is an
         // invalid shorthand and we have to ignore it
         if (!found)
             return false;
@@ -2125,7 +2125,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         colorValues[0] = kMax( 0, kMin( 255, colorValues[0] ) );
         colorValues[1] = kMax( 0, kMin( 255, colorValues[1] ) );
         colorValues[2] = kMax( 0, kMin( 255, colorValues[2] ) );
-        c = tqRgb(colorValues[0], colorValues[1], colorValues[2]);
+        c = qRgb(colorValues[0], colorValues[1], colorValues[2]);
     } else if (value->unit == Value::Function &&
                 value->function->args != 0 &&
                 value->function->args->size() == 7 /* rgba + three commas */ &&
@@ -2136,7 +2136,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         colorValues[0] = kMax( 0, kMin( 255, colorValues[0] ) );
         colorValues[1] = kMax( 0, kMin( 255, colorValues[1] ) );
         colorValues[2] = kMax( 0, kMin( 255, colorValues[2] ) );
-        c = tqRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+        c = qRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
     } else if (value->unit == Value::Function &&
                 value->function->args != 0 &&
                 value->function->args->size() == 5 /* hsl + two commas */ &&
@@ -2144,7 +2144,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         double colorValues[3];
         if (!parseHSLParameters(value, colorValues, false))
             return 0;
-        c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0);
+        c = khtml::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0);
     } else if (value->unit == Value::Function &&
                 value->function->args != 0 &&
                 value->function->args->size() == 7 /* hsla + three commas */ &&
@@ -2152,7 +2152,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
         double colorValues[4];
         if (!parseHSLParameters(value, colorValues, true))
             return 0;
-        c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+        c = khtml::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
     }
     else
         return 0;
diff --git a/khtml/css/cssproperties.c b/khtml/css/cssproperties.c
index f8205a5b9..c86f2d326 100644
--- a/khtml/css/cssproperties.c
+++ b/khtml/css/cssproperties.c
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.2 */
-/* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -NtqfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf  */
+/* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -39,7 +39,7 @@ struct props {
     int id;
 };
 
-static const struct props * tqfindProp (register const char *str, register unsigned int len);
+static const struct props * findProp (register const char *str, register unsigned int len);
 /* maximum key range = 469, duplicates = 0 */
 
 #ifdef __GNUC__
@@ -189,7 +189,7 @@ hash_prop (register const char *str, register unsigned int len)
 __inline
 #endif
 const struct props *
-tqfindProp (register const char *str, register unsigned int len)
+findProp (register const char *str, register unsigned int len)
 {
   enum
     {
@@ -281,7 +281,7 @@ tqfindProp (register const char *str, register unsigned int len)
 #line 102 "cssproperties.gperf"
       {"text-align", CSS_PROP_TEXT_ALIGN},
 #line 109 "cssproperties.gperf"
-      {"tqunicode-bidi", CSS_PROP_UNICODE_BIDI},
+      {"unicode-bidi", CSS_PROP_UNICODE_BIDI},
 #line 82 "cssproperties.gperf"
       {"outline-color", CSS_PROP_OUTLINE_COLOR},
 #line 60 "cssproperties.gperf"
@@ -417,7 +417,7 @@ tqfindProp (register const char *str, register unsigned int len)
 #line 129 "cssproperties.gperf"
       {"list-style", CSS_PROP_LIST_STYLE},
 #line 101 "cssproperties.gperf"
-      {"table-tqlayout", CSS_PROP_TABLE_LAYOUT},
+      {"table-layout", CSS_PROP_TABLE_LAYOUT},
 #line 54 "cssproperties.gperf"
       {"font-size", CSS_PROP_FONT_SIZE},
 #line 86 "cssproperties.gperf"
@@ -624,7 +624,7 @@ static const char * const propertyList[] = {
 "quotes", 
 "right", 
 "size", 
-"table-tqlayout", 
+"table-layout", 
 "text-align", 
 "text-decoration", 
 "text-indent", 
@@ -632,7 +632,7 @@ static const char * const propertyList[] = {
 "text-shadow", 
 "text-transform", 
 "top", 
-"tqunicode-bidi", 
+"unicode-bidi", 
 "vertical-align", 
 "visibility", 
 "white-space", 
diff --git a/khtml/css/cssproperties.in b/khtml/css/cssproperties.in
index 6c2a8b254..251eb5e3d 100644
--- a/khtml/css/cssproperties.in
+++ b/khtml/css/cssproperties.in
@@ -102,7 +102,7 @@ position
 quotes
 right
 size
-table-tqlayout
+table-layout
 text-align
 text-decoration
 text-indent
@@ -110,7 +110,7 @@ text-overflow
 text-shadow
 text-transform
 top
-tqunicode-bidi
+unicode-bidi
 vertical-align
 visibility
 white-space
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index db978d5b9..15432dcd6 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -257,7 +257,7 @@ CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet,
     u.setQuery( TQString::null );
     u.setRef( TQString::null );
     encodedurl.file = u.url();
-    int pos = encodedurl.file.tqfindRev('/');
+    int pos = encodedurl.file.findRev('/');
     encodedurl.path = encodedurl.file;
     if ( pos > 0 ) {
 	encodedurl.path.truncate( pos );
@@ -327,7 +327,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
 	if ( readbytes >= 0 )
 	    file[readbytes] = '\0';
 
-	TQString style = TQString::tqfromLatin1( file.data() );
+	TQString style = TQString::fromLatin1( file.data() );
 	if(s)
 	    style += s->settingsToCSS();
 	DOMString str(style);
@@ -352,7 +352,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
 	if ( readbytes >= 0 )
 	    file[readbytes] = '\0';
 
-	TQString style = TQString::tqfromLatin1( file.data() );
+	TQString style = TQString::fromLatin1( file.data() );
 	DOMString str(style);
 
 	s_quirksSheet = new DOM::CSSStyleSheetImpl(doc);
@@ -496,12 +496,12 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e)
     unsigned int numPseudoProps = 0;
 
     // try to sort out most style rules as early as possible.
-    TQ_UINT16 cssTagId = localNamePart(element->id());
+    Q_UINT16 cssTagId = localNamePart(element->id());
     int smatch = 0;
     int schecked = 0;
 
     for ( unsigned int i = 0; i < selectors_size; i++ ) {
-	TQ_UINT16 tag = localNamePart(selectors[i]->tag);
+	Q_UINT16 tag = localNamePart(selectors[i]->tag);
 	if ( cssTagId == tag || tag == anyLocalName ) {
 	    ++schecked;
 
@@ -741,8 +741,8 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e
     // Cull out any useless layers and also repeat patterns into additional layers.
     style->adjustBackgroundLayers();
 
-    // Only use slow tqrepaints if we actually have a background image.
-    // FIXME: We only need to tqinvalidate the fixed regions when scrolling.  It's total overkill to
+    // Only use slow repaints if we actually have a background image.
+    // FIXME: We only need to invalidate the fixed regions when scrolling.  It's total overkill to
     // prevent the entire view from blitting on a scroll.
     if (style->hasFixedBackgroundImage() && view)
         view->useSlowRepaints();
@@ -828,12 +828,12 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e,
 static void cleanpath(TQString &path)
 {
     int pos;
-    while ( (pos = path.tqfind( "/../" )) != -1 ) {
+    while ( (pos = path.find( "/../" )) != -1 ) {
         int prev = 0;
         if ( pos > 0 )
-            prev = path.tqfindRev( "/", pos -1 );
+            prev = path.findRev( "/", pos -1 );
         // don't remove the host, i.e. http://foo.org/../foo.html
-        if (prev < 0 || (prev > 3 && path.tqfindRev("://", prev-1) == prev-2))
+        if (prev < 0 || (prev > 3 && path.findRev("://", prev-1) == prev-2))
             path.remove( pos, 3);
         else
             // matching directory found ?
@@ -846,9 +846,9 @@ static void cleanpath(TQString &path)
     // We don't want to waste a function call on the search for the anchor
     // in the vast majority of cases where there is no "//" in the path.
     int refPos = -2;
-    while ( (pos = path.tqfind( "//", pos )) != -1) {
+    while ( (pos = path.find( "//", pos )) != -1) {
         if (refPos == -2)
-            refPos = path.tqfind("#", 0);
+            refPos = path.find("#", 0);
         if (refPos > 0 && pos >= refPos)
             break;
 
@@ -857,7 +857,7 @@ static void cleanpath(TQString &path)
         else
             pos += 2;
     }
-    while ( (pos = path.tqfind( "/./" )) != -1)
+    while ( (pos = path.find( "/./" )) != -1)
         path.remove( pos, 2 );
     //kdDebug() << "checkPseudoState " << path << endl;
 }
@@ -871,9 +871,9 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
     if( attr.isNull() ) {
         return PseudoNone;
     }
-    TQConstString cu(attr.tqunicode(), attr.length());
+    TQConstString cu(attr.unicode(), attr.length());
     TQString u = cu.string();
-    if ( !u.tqcontains("://") ) {
+    if ( !u.contains("://") ) {
         if ( u[0] == '/' )
             u = encodedurl.host + u;
         else if ( u[0] == '#' )
@@ -883,10 +883,10 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
         cleanpath( u );
     }
     //completeURL( attr.string() );
-    bool tqcontains = KHTMLFactory::vLinks()->tqcontains( u );
-    if ( !tqcontains && u.tqcontains('/')==2 )
-      tqcontains = KHTMLFactory::vLinks()->tqcontains( u+'/' );
-    return tqcontains ? PseudoVisited : PseudoLink;
+    bool contains = KHTMLFactory::vLinks()->contains( u );
+    if ( !contains && u.contains('/')==2 )
+      contains = KHTMLFactory::vLinks()->contains( u+'/' );
+    return contains ? PseudoVisited : PseudoLink;
 }
 
 // a helper function for parsing nth-arguments
@@ -904,7 +904,7 @@ static bool matchNth(int count, const TQString& nth)
         b = 0;
     }
     else {
-        int n = nth.tqfind('n');
+        int n = nth.find('n');
         if (n != -1) {
             if (nth[0] == '-')
                 if (n==1)
@@ -917,11 +917,11 @@ static bool matchNth(int count, const TQString& nth)
                 else
                     a = nth.left(n).toInt();
 
-            int p = nth.tqfind('+');
+            int p = nth.find('+');
             if (p != -1)
                 b = nth.mid(p+1).toInt();
             else {
-                p = nth.tqfind('-');
+                p = nth.find('-');
                 b = -nth.mid(p+1).toInt();
             }
         }
@@ -1107,10 +1107,10 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
 
     if (sel->tag != anyQName) {
         int eltID = e->id();
-        TQ_UINT16 localName = localNamePart(eltID);
-        TQ_UINT16 ns = namespacePart(eltID);
-        TQ_UINT16 selLocalName = localNamePart(sel->tag);
-        TQ_UINT16 selNS = namespacePart(sel->tag);
+        Q_UINT16 localName = localNamePart(eltID);
+        Q_UINT16 ns = namespacePart(eltID);
+        Q_UINT16 selLocalName = localNamePart(sel->tag);
+        Q_UINT16 selNS = namespacePart(sel->tag);
 
         if (localName <= ID_LAST_TAG && ns == defaultNamespace) {
             assert(e->isHTMLElement());
@@ -1158,22 +1158,22 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
             // Be smart compare on length first
             if (sel_len > val_len) return false;
             // Selector string may not contain spaces
-            if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.tqfind(' ') != -1) return false;
+            if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.find(' ') != -1) return false;
             if (sel_len == val_len)
                 return (caseSensitive && !strcmp(sel->value, value)) ||
 		       (!caseSensitive && !strcasecmp(sel->value, value));
             // else the value is longer and can be a list
             if ( sel->match == CSSSelector::Class && !e->hasClassList() ) return false;
 
-            TQChar* sel_uc = sel->value.tqunicode();
-            TQChar* val_uc = value->tqunicode();
+            TQChar* sel_uc = sel->value.unicode();
+            TQChar* val_uc = value->unicode();
 
             TQConstString sel_str(sel_uc, sel_len);
             TQConstString val_str(val_uc, val_len);
 
             int pos = 0;
             for ( ;; ) {
-                pos = val_str.string().tqfind(sel_str.string(), pos, caseSensitive);
+                pos = val_str.string().find(sel_str.string(), pos, caseSensitive);
                 if ( pos == -1 ) return false;
                 if ( pos == 0 || val_uc[pos-1].isSpace() ) {
                     int endpos = pos + sel_len;
@@ -1186,35 +1186,35 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
         }
         case CSSSelector::Contain:
         {
-            //kdDebug( 6080 ) << "checking for tqcontains match" << endl;
-            TQConstString val_str(value->tqunicode(), value->length());
-            TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
-            return val_str.string().tqcontains(sel_str.string(), caseSensitive);
+            //kdDebug( 6080 ) << "checking for contains match" << endl;
+            TQConstString val_str(value->unicode(), value->length());
+            TQConstString sel_str(sel->value.unicode(), sel->value.length());
+            return val_str.string().contains(sel_str.string(), caseSensitive);
         }
         case CSSSelector::Begin:
         {
             //kdDebug( 6080 ) << "checking for beginswith match" << endl;
-            TQConstString val_str(value->tqunicode(), value->length());
-            TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
+            TQConstString val_str(value->unicode(), value->length());
+            TQConstString sel_str(sel->value.unicode(), sel->value.length());
             return val_str.string().startsWith(sel_str.string(), caseSensitive);
         }
         case CSSSelector::End:
         {
             //kdDebug( 6080 ) << "checking for endswith match" << endl;
-            TQConstString val_str(value->tqunicode(), value->length());
-            TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
+            TQConstString val_str(value->unicode(), value->length());
+            TQConstString sel_str(sel->value.unicode(), sel->value.length());
             return val_str.string().endsWith(sel_str.string(), caseSensitive);
         }
         case CSSSelector::Hyphen:
         {
             //kdDebug( 6080 ) << "checking for hyphen match" << endl;
-            TQConstString val_str(value->tqunicode(), value->length());
-            TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
+            TQConstString val_str(value->unicode(), value->length());
+            TQConstString sel_str(sel->value.unicode(), sel->value.length());
             const TQString& str = val_str.string();
             const TQString& selStr = sel_str.string();
             if(str.length() < selStr.length()) return false;
             // Check if str begins with selStr:
-            if(str.tqfind(selStr, 0, caseSensitive) != 0) return false;
+            if(str.find(selStr, 0, caseSensitive) != 0) return false;
             // It does. Check for exact match or following '-':
             if(str.length() != selStr.length()
                 && str[selStr.length()] != '-') return false;
@@ -1557,8 +1557,8 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
                 elem = static_cast<HTMLElementImpl*>(e);
                 DOMString s = elem->innerText();
                 TQString selStr = sel->string_arg.string();
-//                kdDebug(6080) << ":tqcontains(\"" << selStr << "\")" << " on \"" << s << "\"" << endl;
-                return s.string().tqcontains(selStr);
+//                kdDebug(6080) << ":contains(\"" << selStr << "\")" << " on \"" << s << "\"" << endl;
+                return s.string().contains(selStr);
             }
             break;
         }
@@ -1768,7 +1768,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
 
     // No media implies "all", but if a medialist exists it must
     // contain our current medium
-    if( sheet->media() && !sheet->media()->tqcontains( medium ) )
+    if( sheet->media() && !sheet->media()->contains( medium ) )
         return; // style sheet not applicable for this medium
 
     int len = sheet->length();
@@ -1794,7 +1794,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
             //kdDebug( 6080 ) << "@import: Media: "
             //                << import->media()->mediaText().string() << endl;
 
-            if( !import->media() || import->media()->tqcontains( medium ) )
+            if( !import->media() || import->media()->contains( medium ) )
             {
                 CSSStyleSheetImpl *importedSheet = import->styleSheet();
                 append( importedSheet, medium );
@@ -1809,7 +1809,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
             //kdDebug( 6080 ) << "@media: Media: "
             //                << r->media()->mediaText().string() << endl;
 
-            if( ( !r->media() || r->media()->tqcontains( medium ) ) && rules)
+            if( ( !r->media() || r->media()->contains( medium ) ) && rules)
             {
                 // Traverse child elements of the @import rule. Since
                 // many elements are not allowed as child we do not use
@@ -2079,13 +2079,13 @@ static TQColor colorForCSSValue( int css_value )
 	    KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
 	    bckgrConfig.setGroup("Desktop0");
 	    // Desktop background.
-	    return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
+	    return bckgrConfig.readColorEntry("Color1", &qApp->palette().disabled().background());
 	}
 	return TQColor();
     }
 #endif
 
-    const TQPalette &pal = tqApp->palette();
+    const TQPalette &pal = qApp->palette();
     TQColor c = pal.color( uicol->group, uicol->role );
 #ifndef APPLE_CHANGES
     if ( uicol->configEntry ) {
@@ -2597,7 +2597,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
     }
 
     case CSS_PROP_UNICODE_BIDI: {
-        HANDLE_INHERIT_AND_INITIAL(tqunicodeBidi, UnicodeBidi)
+        HANDLE_INHERIT_AND_INITIAL(unicodeBidi, UnicodeBidi)
         if(!primitiveValue) break;
         switch (primitiveValue->getIdent()) {
             case CSS_VAL_NORMAL:
@@ -2772,7 +2772,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
 		    col = colorForCSSValue( ident );
 	    } else if ( primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_RGBCOLOR ) {
 #ifndef APPLE_CHANGES
-		if(tqAlpha(primitiveValue->getRGBColorValue()))
+		if(qAlpha(primitiveValue->getRGBColorValue()))
 #endif
 		    col.setRgb(primitiveValue->getRGBColorValue());
 	    } else {
@@ -3241,7 +3241,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         if (size < 0) return;
 
         // we never want to get smaller than the minimum font size to keep fonts readable
-        // do not however maximize zero as that is commonly used for fancy tqlayouting purposes
+        // do not however maximize zero as that is commonly used for fancy layouting purposes
         if (size && size < minFontSize) size = minFontSize;
 
         //kdDebug( 6080 ) << "computed raw font size: " << size << endl;
diff --git a/khtml/css/cssstyleselector.h b/khtml/css/cssstyleselector.h
index 5b9946342..23d854bc0 100644
--- a/khtml/css/cssstyleselector.h
+++ b/khtml/css/cssstyleselector.h
@@ -76,7 +76,7 @@ namespace khtml
 
     /**
      * this class selects a RenderStyle for a given Element based on the
-     * collection of stylesheets it tqcontains. This is just a virtual base class
+     * collection of stylesheets it contains. This is just a virtual base class
      * for specific implementations of the Selector. At the moment only CSSStyleSelector
      * exists, but someone may wish to implement XSL...
      */
@@ -136,7 +136,7 @@ namespace khtml
 
 	bool strictParsing;
 	struct Encodedurl {
-	    TQString host; //also tqcontains protocol
+	    TQString host; //also contains protocol
 	    TQString path;
 	    TQString file;
 	} encodedurl;
@@ -290,7 +290,7 @@ public:
 	unsigned int selector;
 	unsigned int position;
 
-	TQ_UINT32 priority;
+	Q_UINT32 priority;
     };
 
     /*
diff --git a/khtml/css/cssvalues.c b/khtml/css/cssvalues.c
index f841c05b0..7368d1869 100644
--- a/khtml/css/cssvalues.c
+++ b/khtml/css/cssvalues.c
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.2 */
-/* Command-line: gperf -L ANSI-C -E -c -C -n -o -t -k '*' -NtqfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf  */
+/* Command-line: gperf -L ANSI-C -E -c -C -n -o -t -k '*' -NfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -39,7 +39,7 @@ struct css_value {
     int id;
 };
 
-static const css_value* tqfindValue (register const char *str, register unsigned int len);
+static const css_value* findValue (register const char *str, register unsigned int len);
 /* maximum key range = 2876, duplicates = 0 */
 
 #ifdef __GNUC__
@@ -177,7 +177,7 @@ hash_val (register const char *str, register unsigned int len)
 __inline
 #endif
 const struct css_value *
-tqfindValue (register const char *str, register unsigned int len)
+findValue (register const char *str, register unsigned int len)
 {
   enum
     {
diff --git a/khtml/css/cssvalues.in b/khtml/css/cssvalues.in
index ac5f4f276..1ad99c38d 100644
--- a/khtml/css/cssvalues.in
+++ b/khtml/css/cssvalues.in
@@ -175,7 +175,7 @@ text-top
 text-bottom
 top
 bottom
-# HTML tqalignment MIDDLE has no corresponding CSS tqalignment
+# HTML alignment MIDDLE has no corresponding CSS alignment
 -khtml-baseline-middle
 #
 # CSS_PROP_TEXT_ALIGN:
diff --git a/khtml/css/html4.css b/khtml/css/html4.css
index 0829ccab4..c3fd1a347 100644
--- a/khtml/css/html4.css
+++ b/khtml/css/html4.css
@@ -477,7 +477,7 @@ a:visited:active          { color: red; outline: 1px dotted invert; }
 :before,:after  { white-space: pre-line }
 */
 
-/* ### use this to tqreplace renderbr
+/* ### use this to replace renderbr
       br:before       { content: "\n" }
 */
 
@@ -486,27 +486,27 @@ a:visited:active          { color: red; outline: 1px dotted invert; }
 
 bdo[dir="ltr"]  {
 	direction: ltr;
-	tqunicode-bidi: bidi-override;
+	unicode-bidi: bidi-override;
 }
 
 bdo[dir="rtl"]  {
 	direction: rtl;
-	tqunicode-bidi: bidi-override;
+	unicode-bidi: bidi-override;
 }
 
 /* ### this selector seems to be still broken ...
-      *[dir="ltr"]    { direction: ltr; tqunicode-bidi: embed }
-      *[dir="rtl"]    { direction: rtl; tqunicode-bidi: embed }
+      *[dir="ltr"]    { direction: ltr; unicode-bidi: embed }
+      *[dir="rtl"]    { direction: rtl; unicode-bidi: embed }
 */
 
 /* elements that are block-level in html4 */
-/* ### don't support tqunicode-bidi at the moment
+/* ### don't support unicode-bidi at the moment
       address, blockquote, body, dd, div, dl, dt, fieldset,
       form, frame, frameset, h1, h2, h3, h4, h5, h6, iframe,
       noscript, noframes, object, ol, p, ul, applet, center,
       dir, hr, menu, pre, li, table, tr, thead, tbody, tfoot,
       col, colgroup, td, th, caption
-                      { tqunicode-bidi: embed }
+                      { unicode-bidi: embed }
 */
 
 /* end bidi settings */
diff --git a/khtml/css/makeprop b/khtml/css/makeprop
index df0f42764..a1a30ac97 100644
--- a/khtml/css/makeprop
+++ b/khtml/css/makeprop
@@ -23,7 +23,7 @@
 #
 grep "^[^\#]" cssproperties.in > cssproperties.strip
 
-echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n    const char *name;\n    int id;\n};\n\nstatic const struct props * tqfindProp (register const char *str, register unsigned int len);\n\n%%' > cssproperties.gperf
+echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n    const char *name;\n    int id;\n};\n\nstatic const struct props * findProp (register const char *str, register unsigned int len);\n\n%%' > cssproperties.gperf
 cat cssproperties.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_PROP_" toupper($0) } while (getline) }' >> cssproperties.gperf
 echo '%%' >> cssproperties.gperf
 echo -e '/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSPROPERTIES_H\n#define CSSPROPERTIES_H\n\nDOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;\n' > cssproperties.h
@@ -36,7 +36,7 @@ print ""; \
 print "#define CSS_PROP_MAX CSS_PROP_Z_INDEX"; \
 print "#define CSS_PROP_TOTAL " i \
 }' >> cssproperties.h
-gperf -a -L 'ANSI-C' -E -C -c -o -t -k '*' -NtqfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf > cssproperties.c || exit 1
+gperf -a -L 'ANSI-C' -E -C -c -o -t -k '*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 cssproperties.gperf > cssproperties.c || exit 1
 echo -e '#endif\n' >> cssproperties.h
 
 cat cssproperties.strip | awk '{ \
diff --git a/khtml/css/makevalues b/khtml/css/makevalues
index 2feedf15c..0f81f1612 100755
--- a/khtml/css/makevalues
+++ b/khtml/css/makevalues
@@ -24,7 +24,7 @@
 #
 grep "^[^\#]" cssvalues.in > cssvalues.strip
 
-echo -e '%{\n/* This file is automatically generated from cssvalues.in by makevalues, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssvalues.h"\n%}\nstruct css_value {\n    const char *name;\n    int id;\n};\n\nstatic const css_value* tqfindValue (register const char *str, register unsigned int len);\n\n%%' > cssvalues.gperf
+echo -e '%{\n/* This file is automatically generated from cssvalues.in by makevalues, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssvalues.h"\n%}\nstruct css_value {\n    const char *name;\n    int id;\n};\n\nstatic const css_value* findValue (register const char *str, register unsigned int len);\n\n%%' > cssvalues.gperf
 cat cssvalues.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_VAL_" toupper($0) } while (getline) }' >> cssvalues.gperf
 echo '%%' >> cssvalues.gperf
 echo -e '/* This file is automatically generated from cssvalues.in by
@@ -37,7 +37,7 @@ do { gsub("-", "_"); print "#define CSS_VAL_" toupper($0) " " i; i = i + 1 } whi
 print ""; \
 print "#define CSS_VAL_TOTAL " i \
 }' >> cssvalues.h
-gperf -L 'ANSI-C' -E -c -C -n -o -t -k '*' -NtqfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf > cssvalues.c || exit 1
+gperf -L 'ANSI-C' -E -c -C -n -o -t -k '*' -NfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf > cssvalues.c || exit 1
 echo -e '#endif\n' >> cssvalues.h
 
 cat cssvalues.strip | awk '{ \
diff --git a/khtml/css/parser.cpp b/khtml/css/parser.cpp
index 6cda882ea..c0e6f5869 100644
--- a/khtml/css/parser.cpp
+++ b/khtml/css/parser.cpp
@@ -210,7 +210,7 @@ using namespace DOM;
 
 //
 // The following file defines the function
-//     const struct props *tqfindProp(const char *word, int len)
+//     const struct props *findProp(const char *word, int len)
 //
 // with 'props->id' a CSS property in the range from CSS_PROP_MIN to
 // (and including) CSS_PROP_TOTAL-1
@@ -224,7 +224,7 @@ using namespace DOM;
 
 int DOM::getPropertyID(const char *tagStr, int len)
 {
-    const struct props *propsPtr = tqfindProp(tagStr, len);
+    const struct props *propsPtr = findProp(tagStr, len);
     if (!propsPtr)
         return 0;
 
@@ -233,7 +233,7 @@ int DOM::getPropertyID(const char *tagStr, int len)
 
 static inline int getValueID(const char *tagStr, int len)
 {
-    const struct css_value *val = tqfindValue(tagStr, len);
+    const struct css_value *val = findValue(tagStr, len);
     if (!val)
         return 0;
 
diff --git a/khtml/css/parser.y b/khtml/css/parser.y
index 88df3cceb..50e558db9 100644
--- a/khtml/css/parser.y
+++ b/khtml/css/parser.y
@@ -45,7 +45,7 @@ using namespace DOM;
 
 //
 // The following file defines the function
-//     const struct props *tqfindProp(const char *word, int len)
+//     const struct props *findProp(const char *word, int len)
 //
 // with 'props->id' a CSS property in the range from CSS_PROP_MIN to
 // (and including) CSS_PROP_TOTAL-1
@@ -59,7 +59,7 @@ using namespace DOM;
 
 int DOM::getPropertyID(const char *tagStr, int len)
 {
-    const struct props *propsPtr = tqfindProp(tagStr, len);
+    const struct props *propsPtr = findProp(tagStr, len);
     if (!propsPtr)
         return 0;
 
@@ -68,7 +68,7 @@ int DOM::getPropertyID(const char *tagStr, int len)
 
 static inline int getValueID(const char *tagStr, int len)
 {
-    const struct css_value *val = tqfindValue(tagStr, len);
+    const struct css_value *val = findValue(tagStr, len);
     if (!val)
         return 0;
 
@@ -808,7 +808,7 @@ pseudo:
         $$->string_arg = domString($3);
         $$->value = domString($2);
     }
-    // used by :tqcontains
+    // used by :contains
     | ':' FUNCTION STRING ')' {
         $$ = new CSSSelector();
         $$->match = CSSSelector::PseudoClass;
diff --git a/khtml/css/tokenizer.cpp b/khtml/css/tokenizer.cpp
index 34a586d49..493a98032 100644
--- a/khtml/css/tokenizer.cpp
+++ b/khtml/css/tokenizer.cpp
@@ -634,7 +634,7 @@ yy_match:
 			}
 		while ( yy_base[yy_current_state] != 1638 );
 
-yy_tqfind_action:
+yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
@@ -656,7 +656,7 @@ do_action:	/* This label is used only to access EOF actions. */
 			*yy_cp = yy_hold_char;
 			yy_cp = yy_last_accepting_cpos;
 			yy_current_state = yy_last_accepting_state;
-			goto yy_tqfind_action;
+			goto yy_find_action;
 
 case 1:
 YY_RULE_SETUP
diff --git a/khtml/css/tokenizer.flex b/khtml/css/tokenizer.flex
index 074862a23..3c24d8e07 100644
--- a/khtml/css/tokenizer.flex
+++ b/khtml/css/tokenizer.flex
@@ -4,8 +4,8 @@
 
 h               [0-9a-fA-F]
 nonascii        [\200-\377]
-tqunicode         \\{h}{1,6}[ \t\r\n\f]?
-escape          {tqunicode}|\\[ -~\200-\377]
+unicode         \\{h}{1,6}[ \t\r\n\f]?
+escape          {unicode}|\\[ -~\200-\377]
 nmstart         [_a-zA-Z]|{nonascii}|{escape}
 nmchar          [_a-zA-Z0-9-]|{nonascii}|{escape}
 string1         \"([\t !#$%&(-~]|\\{nl}|\'|{nonascii}|{escape})*\"