Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

11 files changed, 70 insertions, 70 deletions

diff --git a/khtml/css/css_base.cpp b/khtml/css/css_base.cpp
index 5af37b9b9..699ff6554 100644
--- a/khtml/css/css_base.cpp
+++ b/khtml/css/css_base.cpp
@@ -319,7 +319,7 @@ DOMString CSSSelector::selectorText() const
     // the original namespace prefix used. Ugh. -dwh
     DOMString str;
     const CSSSelector* cs = this;
-    Q_UINT16 tag = localNamePart(cs->tag);
+    TQ_UINT16 tag = localNamePart(cs->tag);
     if (tag == anyLocalName && cs->match == CSSSelector::None)
         str = "*";
     else if (tag != anyLocalName)
diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/khtml/css/css_renderstyledeclarationimpl.cpp
index daf607a9e..eef98f41e 100644
--- a/khtml/css/css_renderstyledeclarationimpl.cpp
+++ b/khtml/css/css_renderstyledeclarationimpl.cpp
@@ -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->unicodeBidi()) {
+        switch (style->tqunicodeBidi()) {
         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 bf85c0d59..8189a6846 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(Q_UINT32& id, const DOM::DOMString& prefix)
+void CSSStyleSheetImpl::determineNamespace(TQ_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(Q_UINT32& id, const DOM::DOMString& p
             Q_ASSERT(m_doc != 0);
 
             // Look up the id for this namespace URI.
-            Q_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode);
+            TQ_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode);
             id = makeId(nsid, localNamePart(id));
         }
     }
diff --git a/khtml/css/css_stylesheetimpl.h b/khtml/css/css_stylesheetimpl.h
index e7a551947..656b59ca9 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(Q_UINT32& id, const DOM::DOMString& prefix);
-    Q_UINT32 defaultNamespace() { return m_defaultNamespace; };
+    void determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix);
+    TQ_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;
-    Q_UINT32 m_defaultNamespace;
+    TQ_UINT32 m_defaultNamespace;
     CSSNamespace* m_namespaces;
     DOMString m_charset;
 };
diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp
index 52e962725..0fa8bc837 100644
--- a/khtml/css/css_valueimpl.cpp
+++ b/khtml/css/css_valueimpl.cpp
@@ -757,14 +757,14 @@ DOM::DOMString CSSPrimitiveValueImpl::cssText() const
             break;
         }
 	case CSSPrimitiveValue::CSS_RGBCOLOR:
-	    if (qAlpha(m_value.rgbcolor) != 0xFF) {
+	    if (tqAlpha(m_value.rgbcolor) != 0xFF) {
 		if (m_value.rgbcolor == khtml::transparentColor)
 		    text = "transparent";
 		else
-		    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) + ")";
+		    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) + ")";
 	    } else {
 		text = TQColor(m_value.rgbcolor).name();
 	    }
@@ -896,21 +896,21 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
     parsedFontName = parsedFontName.lower();
     // kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl;
 
-    int pos = available.find( ',' + parsedFontName + ',', 0, false );
+    int pos = available.tqfind( ',' + 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.find( ",ms " + parsedFontName + ',', 0, false );
+        pos = available.tqfind( ",ms " + parsedFontName + ',', 0, false );
         if ( pos == -1 )
-            pos = available.find( ',' + parsedFontName + " ms,", 0, false );
+            pos = available.tqfind( ',' + parsedFontName + " ms,", 0, false );
     }
 
     if ( pos != -1 ) {
        ++pos;
-       int p = available.find(',', pos);
+       int p = available.tqfind(',', 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 73eff588c..f1d681bd6 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].unicode() > '\r')
+        if(i->s[k].tqunicode() > '\r')
             j->s[nl++] = i->s[k];
 
     j->l = nl;
diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp
index d167af025..474067cf0 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.unicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data, string.tqunicode(), 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.unicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data + strlen( khtml_rule ), string.tqunicode(), 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.unicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data + strlen( khtml_value ), string.tqunicode(), 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.unicode(), string.length()*sizeof( unsigned short) );
+    memcpy( data + strlen( khtml_decls ), string.tqunicode(), 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:                 // <shape> | auto | inherit
+    case CSS_PROP_CLIP:                 // <tqshape> | auto | inherit
         if ( id == CSS_VAL_AUTO )
             valid_primitive = true;
         else if ( value->unit == Value::Function )
@@ -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 = qRgb(colorValues[0], colorValues[1], colorValues[2]);
+        c = tqRgb(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 = qRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+        c = tqRgba(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::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0);
+        c = khtml::tqRgbaFromHsla(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::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+        c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
     }
     else
         return 0;
diff --git a/khtml/css/cssproperties.c b/khtml/css/cssproperties.c
index c86f2d326..894ab787f 100644
--- a/khtml/css/cssproperties.c
+++ b/khtml/css/cssproperties.c
@@ -281,7 +281,7 @@ findProp (register const char *str, register unsigned int len)
 #line 102 "cssproperties.gperf"
       {"text-align", CSS_PROP_TEXT_ALIGN},
 #line 109 "cssproperties.gperf"
-      {"unicode-bidi", CSS_PROP_UNICODE_BIDI},
+      {"tqunicode-bidi", CSS_PROP_UNICODE_BIDI},
 #line 82 "cssproperties.gperf"
       {"outline-color", CSS_PROP_OUTLINE_COLOR},
 #line 60 "cssproperties.gperf"
@@ -632,7 +632,7 @@ static const char * const propertyList[] = {
 "text-shadow", 
 "text-transform", 
 "top", 
-"unicode-bidi", 
+"tqunicode-bidi", 
 "vertical-align", 
 "visibility", 
 "white-space", 
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index 15432dcd6..abe6a89ef 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -327,7 +327,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
 	if ( readbytes >= 0 )
 	    file[readbytes] = '\0';
 
-	TQString style = TQString::fromLatin1( file.data() );
+	TQString style = TQString::tqfromLatin1( 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::fromLatin1( file.data() );
+	TQString style = TQString::tqfromLatin1( 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.
-    Q_UINT16 cssTagId = localNamePart(element->id());
+    TQ_UINT16 cssTagId = localNamePart(element->id());
     int smatch = 0;
     int schecked = 0;
 
     for ( unsigned int i = 0; i < selectors_size; i++ ) {
-	Q_UINT16 tag = localNamePart(selectors[i]->tag);
+	TQ_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 repaints if we actually have a background image.
-    // FIXME: We only need to invalidate the fixed regions when scrolling.  It's total overkill to
+    // 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
     // prevent the entire view from blitting on a scroll.
     if (style->hasFixedBackgroundImage() && view)
         view->useSlowRepaints();
@@ -828,7 +828,7 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e,
 static void cleanpath(TQString &path)
 {
     int pos;
-    while ( (pos = path.find( "/../" )) != -1 ) {
+    while ( (pos = path.tqfind( "/../" )) != -1 ) {
         int prev = 0;
         if ( pos > 0 )
             prev = path.findRev( "/", pos -1 );
@@ -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.find( "//", pos )) != -1) {
+    while ( (pos = path.tqfind( "//", pos )) != -1) {
         if (refPos == -2)
-            refPos = path.find("#", 0);
+            refPos = path.tqfind("#", 0);
         if (refPos > 0 && pos >= refPos)
             break;
 
@@ -857,7 +857,7 @@ static void cleanpath(TQString &path)
         else
             pos += 2;
     }
-    while ( (pos = path.find( "/./" )) != -1)
+    while ( (pos = path.tqfind( "/./" )) != -1)
         path.remove( pos, 2 );
     //kdDebug() << "checkPseudoState " << path << endl;
 }
@@ -871,7 +871,7 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
     if( attr.isNull() ) {
         return PseudoNone;
     }
-    TQConstString cu(attr.unicode(), attr.length());
+    TQConstString cu(attr.tqunicode(), attr.length());
     TQString u = cu.string();
     if ( !u.contains("://") ) {
         if ( u[0] == '/' )
@@ -904,7 +904,7 @@ static bool matchNth(int count, const TQString& nth)
         b = 0;
     }
     else {
-        int n = nth.find('n');
+        int n = nth.tqfind('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.find('+');
+            int p = nth.tqfind('+');
             if (p != -1)
                 b = nth.mid(p+1).toInt();
             else {
-                p = nth.find('-');
+                p = nth.tqfind('-');
                 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();
-        Q_UINT16 localName = localNamePart(eltID);
-        Q_UINT16 ns = namespacePart(eltID);
-        Q_UINT16 selLocalName = localNamePart(sel->tag);
-        Q_UINT16 selNS = namespacePart(sel->tag);
+        TQ_UINT16 localName = localNamePart(eltID);
+        TQ_UINT16 ns = namespacePart(eltID);
+        TQ_UINT16 selLocalName = localNamePart(sel->tag);
+        TQ_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.find(' ') != -1) return false;
+            if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.tqfind(' ') != -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.unicode();
-            TQChar* val_uc = value->unicode();
+            TQChar* sel_uc = sel->value.tqunicode();
+            TQChar* val_uc = value->tqunicode();
 
             TQConstString sel_str(sel_uc, sel_len);
             TQConstString val_str(val_uc, val_len);
 
             int pos = 0;
             for ( ;; ) {
-                pos = val_str.string().find(sel_str.string(), pos, caseSensitive);
+                pos = val_str.string().tqfind(sel_str.string(), pos, caseSensitive);
                 if ( pos == -1 ) return false;
                 if ( pos == 0 || val_uc[pos-1].isSpace() ) {
                     int endpos = pos + sel_len;
@@ -1187,34 +1187,34 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
         case CSSSelector::Contain:
         {
             //kdDebug( 6080 ) << "checking for contains match" << endl;
-            TQConstString val_str(value->unicode(), value->length());
-            TQConstString sel_str(sel->value.unicode(), sel->value.length());
+            TQConstString val_str(value->tqunicode(), value->length());
+            TQConstString sel_str(sel->value.tqunicode(), 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->unicode(), value->length());
-            TQConstString sel_str(sel->value.unicode(), sel->value.length());
+            TQConstString val_str(value->tqunicode(), value->length());
+            TQConstString sel_str(sel->value.tqunicode(), 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->unicode(), value->length());
-            TQConstString sel_str(sel->value.unicode(), sel->value.length());
+            TQConstString val_str(value->tqunicode(), value->length());
+            TQConstString sel_str(sel->value.tqunicode(), 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->unicode(), value->length());
-            TQConstString sel_str(sel->value.unicode(), sel->value.length());
+            TQConstString val_str(value->tqunicode(), value->length());
+            TQConstString sel_str(sel->value.tqunicode(), 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.find(selStr, 0, caseSensitive) != 0) return false;
+            if(str.tqfind(selStr, 0, caseSensitive) != 0) return false;
             // It does. Check for exact match or following '-':
             if(str.length() != selStr.length()
                 && str[selStr.length()] != '-') return false;
@@ -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", &qApp->palette().disabled().background());
+	    return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
 	}
 	return TQColor();
     }
 #endif
 
-    const TQPalette &pal = qApp->palette();
+    const TQPalette &pal = tqApp->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(unicodeBidi, UnicodeBidi)
+        HANDLE_INHERIT_AND_INITIAL(tqunicodeBidi, 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(qAlpha(primitiveValue->getRGBColorValue()))
+		if(tqAlpha(primitiveValue->getRGBColorValue()))
 #endif
 		    col.setRgb(primitiveValue->getRGBColorValue());
 	    } else {
diff --git a/khtml/css/cssstyleselector.h b/khtml/css/cssstyleselector.h
index 23d854bc0..1b076337e 100644
--- a/khtml/css/cssstyleselector.h
+++ b/khtml/css/cssstyleselector.h
@@ -290,7 +290,7 @@ public:
 	unsigned int selector;
 	unsigned int position;
 
-	Q_UINT32 priority;
+	TQ_UINT32 priority;
     };
 
     /*
diff --git a/khtml/css/html4.css b/khtml/css/html4.css
index c3fd1a347..575945464 100644
--- a/khtml/css/html4.css
+++ b/khtml/css/html4.css
@@ -486,27 +486,27 @@ a:visited:active          { color: red; outline: 1px dotted invert; }
 
 bdo[dir="ltr"]  {
 	direction: ltr;
-	unicode-bidi: bidi-override;
+	tqunicode-bidi: bidi-override;
 }
 
 bdo[dir="rtl"]  {
 	direction: rtl;
-	unicode-bidi: bidi-override;
+	tqunicode-bidi: bidi-override;
 }
 
 /* ### this selector seems to be still broken ...
-      *[dir="ltr"]    { direction: ltr; unicode-bidi: embed }
-      *[dir="rtl"]    { direction: rtl; unicode-bidi: embed }
+      *[dir="ltr"]    { direction: ltr; tqunicode-bidi: embed }
+      *[dir="rtl"]    { direction: rtl; tqunicode-bidi: embed }
 */
 
 /* elements that are block-level in html4 */
-/* ### don't support unicode-bidi at the moment
+/* ### don't support tqunicode-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
-                      { unicode-bidi: embed }
+                      { tqunicode-bidi: embed }
 */
 
 /* end bidi settings */