diff options
Diffstat (limited to 'khtml/css')
-rw-r--r-- | khtml/css/cssparser.cpp | 26 | ||||
-rw-r--r-- | khtml/css/cssstyleselector.cpp | 12 | ||||
-rw-r--r-- | khtml/css/parser.cpp | 2 | ||||
-rw-r--r-- | khtml/css/parser.y | 2 |
4 files changed, 21 insertions, 21 deletions
diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp index 6ca1a069b..b4480ab7d 100644 --- a/khtml/css/cssparser.cpp +++ b/khtml/css/cssparser.cpp @@ -191,7 +191,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM for ( unsigned int i = 0; i < strlen(khtml_rule); i++ ) data[i] = khtml_rule[i]; memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) ); - // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() ); + // tqDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() ); data[length-4] = '}'; runParser(length); @@ -220,7 +220,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id, data[i] = khtml_value[i]; memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) ); data[length-4] = '}'; - // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() ); + // tqDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() ); id = _id; important = _important; @@ -838,7 +838,7 @@ bool CSSParser::parseValue( int propId, bool important ) break; case CSS_PROP_Z_INDEX: // auto | <integer> | inherit - // qDebug("parsing z-index: id=%d, fValue=%f", id, value->fValue ); + // tqDebug("parsing z-index: id=%d, fValue=%f", id, value->fValue ); if ( id == CSS_VAL_AUTO ) { valid_primitive = true; break; @@ -1271,7 +1271,7 @@ bool CSSParser::parse4Values(int propId, const int *properties, bool important */ int num = inShorthand() ? 1 : valueList->size(); - //qDebug("parse4Values: num=%d %d", num, valueList->numValues ); + //tqDebug("parse4Values: num=%d %d", num, valueList->numValues ); ShorthandScope scope(this, propId); @@ -1710,7 +1710,7 @@ bool CSSParser::parseShape( int propId, bool important ) Value *value = valueList->current(); ValueList *args = value->function->args; TQString fname = qString( value->function->name ).lower(); - //qDebug( "parseShape: fname: %d", fname.latin1() ); + //tqDebug( "parseShape: fname: %d", fname.latin1() ); if ( fname != "rect(" || !args ) return false; @@ -2373,7 +2373,7 @@ int DOM::CSSParser::lex( void *_yylval ) unsigned short *t = text( &length ); #ifdef TOKEN_DEBUG - qDebug("CSSTokenizer: got token %d: '%s'", token, token == END ? "" : TQString( (TQChar *)t, length ).latin1() ); + tqDebug("CSSTokenizer: got token %d: '%s'", token, token == END ? "" : TQString( (TQChar *)t, length ).latin1() ); #endif switch( token ) { case '{': @@ -2443,7 +2443,7 @@ int DOM::CSSParser::lex( void *_yylval ) case FLOAT: case INTEGER: yylval->val = TQString( (TQChar *)t, length ).toDouble(); - //qDebug("value = %s, converted=%.2f", TQString( (TQChar *)t, length ).latin1(), yylval->val ); + //tqDebug("value = %s, converted=%.2f", TQString( (TQChar *)t, length ).latin1(), yylval->val ); break; default: @@ -2542,12 +2542,12 @@ unsigned short *DOM::CSSParser::text(int *length) int uc = 0; escape++; while ( escape < current ) { -// qDebug("toHex( %c = %x", (char)*escape, toHex( *escape ) ); +// tqDebug("toHex( %c = %x", (char)*escape, toHex( *escape ) ); uc *= 16; uc += toHex( *escape ); escape++; } -// qDebug(" converting escape: string='%s', value=0x%x", TQString( (TQChar *)e, current-e ).latin1(), uc ); +// tqDebug(" converting escape: string='%s', value=0x%x", TQString( (TQChar *)e, current-e ).latin1(), uc ); // can't handle chars outside ucs2 if ( uc > 0xffff ) uc = 0xfffd; @@ -2571,12 +2571,12 @@ unsigned short *DOM::CSSParser::text(int *length) int uc = 0; escape++; while ( escape < start+l ) { - // qDebug("toHex( %c = %x", (char)*escape, toHex( *escape ) ); + // tqDebug("toHex( %c = %x", (char)*escape, toHex( *escape ) ); uc *= 16; uc += toHex( *escape ); escape++; } - // qDebug(" converting escape: string='%s', value=0x%x", TQString( (TQChar *)e, current-e ).latin1(), uc ); + // tqDebug(" converting escape: string='%s', value=0x%x", TQString( (TQChar *)e, current-e ).latin1(), uc ); // can't handle chars outside ucs2 if ( uc > 0xffff ) uc = 0xfffd; @@ -2601,13 +2601,13 @@ typedef unsigned int YY_CHAR; *yy_cp = 0; \ yy_c_buf_p = yy_cp; #define YY_BREAK break; -#define ECHO qDebug( "%s", TQString( (TQChar *)yytext, yyleng ).latin1() ) +#define ECHO tqDebug( "%s", TQString( (TQChar *)yytext, yyleng ).latin1() ) #define YY_RULE_SETUP #define INITIAL 0 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) #define YY_START ((yy_start - 1) / 2) #define yyterminate() yyTok = END; return yyTok -#define YY_FATAL_ERROR(a) qFatal(a) +#define YY_FATAL_ERROR(a) tqFatal(a) #define BEGIN yy_start = 1 + 2 * #define COMMENT 1 diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index 35a5ff704..fc125b5e2 100644 --- a/khtml/css/cssstyleselector.cpp +++ b/khtml/css/cssstyleselector.cpp @@ -510,7 +510,7 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e) if ( selectorCache[i].state == Applies ) { ++smatch; -// qDebug("adding property" ); +// tqDebug("adding property" ); for ( unsigned int p = 0; p < selectorCache[i].props_size; p += 2 ) for ( unsigned int j = 0; j < (unsigned int )selectorCache[i].props[p+1]; ++j ) { if (numPropsToApply >= propsToApplySize ) { @@ -540,8 +540,8 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e) // count as author rules, and come before all other style sheets, see hack in append() numPropsToApply = addInlineDeclarations( e, e->m_styleDecls, numPropsToApply ); -// qDebug( "styleForElement( %s )", e->tagName().string().latin1() ); -// qDebug( "%d selectors, %d checked, %d match, %d properties ( of %d )", +// tqDebug( "styleForElement( %s )", e->tagName().string().latin1() ); +// tqDebug( "%d selectors, %d checked, %d match, %d properties ( of %d )", // selectors_size, schecked, smatch, numPropsToApply, properties_size ); bubbleSort( propsToApply, propsToApply+numPropsToApply-1 ); @@ -582,7 +582,7 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e) if ( numPseudoProps ) { fontDirty = false; - //qDebug("%d applying %d pseudo props", e->cssTagId(), pseudoProps->count() ); + //tqDebug("%d applying %d pseudo props", e->cssTagId(), pseudoProps->count() ); for (unsigned int i = 0; i < numPseudoProps; ++i) { if ( fontDirty && pseudoProps[i]->priority >= (1 << 30) ) { // we are past the font properties, time to update to the @@ -1090,7 +1090,7 @@ void CSSStyleSelector::checkSelector(int selIndex, DOM::ElementImpl * e) selectors[ selIndex ]->pseudoId = dynamicPseudo; } else selectorCache[ selIndex ].state = Applies; - //qDebug( "selector %d applies", selIndex ); + //tqDebug( "selector %d applies", selIndex ); //selectors[ selIndex ]->print(); return; } @@ -1867,7 +1867,7 @@ void CSSStyleSelectorList::collect( TQPtrList<CSSSelector> *selectorList, CSSOrd if ( !sel ) selectorList->append( r->selector ); // else -// qDebug("merged one selector"); +// tqDebug("merged one selector"); propList->append(r->rule->declaration(), selectorNum, r->selector->specificity(), regular, important ); r = next(); } diff --git a/khtml/css/parser.cpp b/khtml/css/parser.cpp index c0e6f5869..8b2e008d8 100644 --- a/khtml/css/parser.cpp +++ b/khtml/css/parser.cpp @@ -298,7 +298,7 @@ typedef union YYSTYPE { static inline int cssyyerror(const char *x ) { #ifdef CSS_DEBUG - qDebug( "%s", x ); + tqDebug( "%s", x ); #else Q_UNUSED( x ); #endif diff --git a/khtml/css/parser.y b/khtml/css/parser.y index 50e558db9..33e6fd730 100644 --- a/khtml/css/parser.y +++ b/khtml/css/parser.y @@ -110,7 +110,7 @@ static inline int getValueID(const char *tagStr, int len) static inline int cssyyerror(const char *x ) { #ifdef CSS_DEBUG - qDebug( "%s", x ); + tqDebug( "%s", x ); #else Q_UNUSED( x ); #endif |