diff options
Diffstat (limited to 'tdehtml/css')
| -rw-r--r-- | tdehtml/css/css_valueimpl.cpp | 2 | ||||
| -rw-r--r-- | tdehtml/css/css_valueimpl.h | 6 | ||||
| -rw-r--r-- | tdehtml/css/cssparser.cpp | 4 | ||||
| -rw-r--r-- | tdehtml/css/cssparser.h | 2 | ||||
| -rw-r--r-- | tdehtml/css/cssstyleselector.cpp | 2 | ||||
| -rw-r--r-- | tdehtml/css/parser.y | 10 |
6 files changed, 13 insertions, 13 deletions
diff --git a/tdehtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp index 94cca8840..31f0d6be2 100644 --- a/tdehtml/css/css_valueimpl.cpp +++ b/tdehtml/css/css_valueimpl.cpp @@ -505,7 +505,7 @@ CSSPrimitiveValueImpl::CSSPrimitiveValueImpl( RectImpl *r) m_type = CSSPrimitiveValue::CSS_RECT; } -CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(QRgb color) +CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(TQRgb color) { m_value.rgbcolor = color; m_type = CSSPrimitiveValue::CSS_RGBCOLOR; diff --git a/tdehtml/css/css_valueimpl.h b/tdehtml/css/css_valueimpl.h index 9a6203c86..952c81f8c 100644 --- a/tdehtml/css/css_valueimpl.h +++ b/tdehtml/css/css_valueimpl.h @@ -163,7 +163,7 @@ public: CSSPrimitiveValueImpl(const DOMString &str, CSSPrimitiveValue::UnitTypes type); CSSPrimitiveValueImpl(CounterImpl *c); CSSPrimitiveValueImpl( RectImpl *r); - CSSPrimitiveValueImpl(QRgb color); + CSSPrimitiveValueImpl(TQRgb color); CSSPrimitiveValueImpl(PairImpl *p); virtual ~CSSPrimitiveValueImpl(); @@ -206,7 +206,7 @@ public: return ( m_type != CSSPrimitiveValue::CSS_RECT ? 0 : m_value.rect ); } - QRgb getRGBColorValue () const { + TQRgb getRGBColorValue () const { return ( m_type != CSSPrimitiveValue::CSS_RGBCOLOR ? 0 : m_value.rgbcolor ); } @@ -232,7 +232,7 @@ protected: DOM::DOMStringImpl *string; CounterImpl *counter; RectImpl *rect; - QRgb rgbcolor; + TQRgb rgbcolor; PairImpl* pair; } m_value; }; diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp index 130fa8b61..b4b531df0 100644 --- a/tdehtml/css/cssparser.cpp +++ b/tdehtml/css/cssparser.cpp @@ -2053,7 +2053,7 @@ bool CSSParser::parseHSLParameters(Value* value, double* colorArray, bool parseA return true; } -static bool parseColor(int unit, const TQString &name, QRgb& rgb) +static bool parseColor(int unit, const TQString &name, TQRgb& rgb) { int len = name.length(); @@ -2101,7 +2101,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColor() CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) { - QRgb c = tdehtml::transparentColor; + TQRgb c = tdehtml::transparentColor; if ( !strict && value->unit == CSSPrimitiveValue::CSS_NUMBER && value->fValue >= 0. && value->fValue < 1000000. ) { TQString str; diff --git a/tdehtml/css/cssparser.h b/tdehtml/css/cssparser.h index 0e00ebc16..de735fe3e 100644 --- a/tdehtml/css/cssparser.h +++ b/tdehtml/css/cssparser.h @@ -148,7 +148,7 @@ namespace DOM { CSSPrimitiveValueImpl *parseColorFromValue(Value* val); CSSValueImpl* parseCounterContent(ValueList *args, bool counters); - static bool parseColor(const TQString &name, QRgb& rgb); + static bool parseColor(const TQString &name, TQRgb& rgb); // CSS3 Parsing Routines (for properties specific to CSS3) bool parseShadow(int propId, bool important); diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp index 40dbcb2ec..e9517584e 100644 --- a/tdehtml/css/cssstyleselector.cpp +++ b/tdehtml/css/cssstyleselector.cpp @@ -1953,7 +1953,7 @@ static Length convertToLength( CSSPrimitiveValueImpl *primitiveValue, RenderStyl // color mapping code struct colorMap { int css_value; - QRgb color; + TQRgb color; }; static const colorMap cmap[] = { diff --git a/tdehtml/css/parser.y b/tdehtml/css/parser.y index 6d8b18e9a..236b467dd 100644 --- a/tdehtml/css/parser.y +++ b/tdehtml/css/parser.y @@ -634,7 +634,7 @@ element_name: IDENT { CSSParser *p = static_cast<CSSParser *>(parser); DOM::DocumentImpl *doc = p->document(); - QString tag = qString($1); + TQString tag = qString($1); if ( doc ) { if (doc->isHTMLDocument()) tag = tag.lower(); @@ -699,7 +699,7 @@ attrib_id: CSSParser *p = static_cast<CSSParser *>(parser); DOM::DocumentImpl *doc = p->document(); - QString attr = qString($1); + TQString attr = qString($1); if ( doc ) { if (doc->isHTMLDocument()) attr = attr.lower(); @@ -798,7 +798,7 @@ pseudo: | ':' FUNCTION INTEGER ')' { $$ = new CSSSelector(); $$->match = CSSSelector::PseudoClass; - $$->string_arg = QString::number($3); + $$->string_arg = TQString::number($3); $$->value = domString($2); } // used by :nth-* and :lang @@ -892,7 +892,7 @@ declaration: property: IDENT maybe_space { - QString str = qString($1); + TQString str = qString($1); $$ = getPropertyID( str.lower().latin1(), str.length() ); } ; @@ -941,7 +941,7 @@ term: | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; } | STRING maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_STRING; } | IDENT maybe_space { - QString str = qString( $1 ); + TQString str = qString( $1 ); $$.id = getValueID( str.lower().latin1(), str.length() ); $$.unit = CSSPrimitiveValue::CSS_IDENT; $$.string = $1; |