diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:46:43 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:46:43 +0000 |
| commit | ffe8a83e053396df448e9413828527613ca3bd46 (patch) | |
| tree | a73d4169e02df4a50f9a12cb165fcd0ab5bac7c6 /khtml/css/css_renderstyledeclarationimpl.cpp | |
| parent | 682bf3bfdcbcbb1fca85e8a36ed03e062e0555d5 (diff) | |
| download | tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.tar.gz tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/css/css_renderstyledeclarationimpl.cpp')
| -rw-r--r-- | khtml/css/css_renderstyledeclarationimpl.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/khtml/css/css_renderstyledeclarationimpl.cpp index 25de55f4a..daf607a9e 100644 --- a/khtml/css/css_renderstyledeclarationimpl.cpp +++ b/khtml/css/css_renderstyledeclarationimpl.cpp @@ -267,7 +267,7 @@ DOMString khtml::stringForListStyleType(EListStyleType type) return ""; } -static CSSPrimitiveValueImpl* valueForColor(QColor color) +static CSSPrimitiveValueImpl* valueForColor(TQColor color) { if (color.isValid()) return new CSSPrimitiveValueImpl(color.rgb());//### KDE4: use rgba! @@ -412,15 +412,15 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) DOMString string; Length length(style->backgroundXPosition()); if (length.isPercent()) - string = QString::number(length.value()) + "%"; + string = TQString::number(length.value()) + "%"; else - string = QString::number(length.minWidth(renderer->contentWidth())); + string = TQString::number(length.minWidth(renderer->contentWidth())); string += " "; length = style->backgroundYPosition(); if (length.isPercent()) - string += QString::number(length.value()) + "%"; + string += TQString::number(length.value()) + "%"; else - string += QString::number(length.minWidth(renderer->contentWidth())); + string += TQString::number(length.minWidth(renderer->contentWidth())); return new CSSPrimitiveValueImpl(string, CSSPrimitiveValue::CSS_STRING); } case CSS_PROP_BACKGROUND_POSITION_X: @@ -434,9 +434,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) return new CSSPrimitiveValueImpl(CSS_VAL_SEPARATE); case CSS_PROP_BORDER_SPACING: { - QString string(QString::number(style->borderHorizontalSpacing()) + + TQString string(TQString::number(style->borderHorizontalSpacing()) + "px " + - QString::number(style->borderVerticalSpacing()) + + TQString::number(style->borderVerticalSpacing()) + "px"); return new CSSPrimitiveValueImpl(string, CSSPrimitiveValue::CSS_STRING); } @@ -651,7 +651,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) // FIXME: this does not reflect the full range of weights // that can be expressed with CSS FontDef def = style->htmlFont().getFontDef(); - if (def.weight == QFont::Bold) + if (def.weight == TQFont::Bold) return new CSSPrimitiveValueImpl(CSS_VAL_BOLD); else return new CSSPrimitiveValueImpl(CSS_VAL_NORMAL); @@ -888,7 +888,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) return valueForTextAlign(style->textAlign()); case CSS_PROP_TEXT_DECORATION: { - QString string; + TQString string; if (style->textDecoration() & khtml::UNDERLINE) string += "underline"; if (style->textDecoration() & khtml::OVERLINE) { |