diff options
Diffstat (limited to 'khtml/css/css_valueimpl.cpp')
-rw-r--r-- | khtml/css/css_valueimpl.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
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; |