summaryrefslogtreecommitdiffstats
path: root/khtml/css/css_valueimpl.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml/css/css_valueimpl.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
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
Diffstat (limited to 'khtml/css/css_valueimpl.cpp')
-rw-r--r--khtml/css/css_valueimpl.cpp26
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;