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

1 files changed, 9 insertions, 9 deletions

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;