summaryrefslogtreecommitdiffstats
path: root/khtml
diff options
context:
space:
mode:
Diffstat (limited to 'khtml')
-rw-r--r--khtml/css/cssparser.cpp26
-rw-r--r--khtml/css/cssstyleselector.cpp12
-rw-r--r--khtml/css/parser.cpp2
-rw-r--r--khtml/css/parser.y2
-rw-r--r--khtml/ecma/kjs_window.cpp2
-rw-r--r--khtml/html/html_elementimpl.cpp10
-rw-r--r--khtml/html/html_formimpl.cpp2
-rw-r--r--khtml/html/htmltokenizer.cpp20
-rw-r--r--khtml/html/htmltokenizer.h2
-rw-r--r--khtml/khtml_part.cpp6
-rw-r--r--khtml/khtmlview.cpp6
-rw-r--r--khtml/kmultipart/kmultipart.cpp4
-rw-r--r--khtml/misc/loader.cpp6
-rw-r--r--khtml/misc/loader_jpeg.cpp62
-rw-r--r--khtml/rendering/bidi.cpp2
-rw-r--r--khtml/rendering/font.cpp2
-rw-r--r--khtml/rendering/render_body.cpp2
-rw-r--r--khtml/rendering/render_image.cpp18
-rw-r--r--khtml/rendering/render_object.cpp2
-rw-r--r--khtml/rendering/render_object.h2
-rw-r--r--khtml/rendering/render_replaced.cpp6
-rw-r--r--khtml/rendering/render_table.cpp26
-rw-r--r--khtml/rendering/render_text.cpp2
-rw-r--r--khtml/rendering/table_layout.cpp90
-rw-r--r--khtml/test_regression_fontoverload.cpp8
-rw-r--r--khtml/xml/dom_docimpl.cpp4
-rw-r--r--khtml/xml/dom_elementimpl.cpp4
-rw-r--r--khtml/xml/dom_textimpl.cpp4
-rw-r--r--khtml/xml/xml_tokenizer.h2
29 files changed, 168 insertions, 168 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
diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index e0e81de73..8d96380ab 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -1705,7 +1705,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart);
if (newPart && ::tqqt_cast<KHTMLPart*>(newPart)) {
KHTMLPart *khtmlpart = static_cast<KHTMLPart*>(newPart);
- //qDebug("opener set to %p (this Window's part) in new Window %p (this Window=%p)",part,win,window);
+ //tqDebug("opener set to %p (this Window's part) in new Window %p (this Window=%p)",part,win,window);
khtmlpart->setOpener(p);
khtmlpart->setOpenedByJS(true);
if (khtmlpart->document().isNull()) {
diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp
index f635fcc3d..5c0e4ae0a 100644
--- a/khtml/html/html_elementimpl.cpp
+++ b/khtml/html/html_elementimpl.cpp
@@ -400,7 +400,7 @@ void HTMLElementImpl::addHTMLColor( int id, const DOMString &c )
int basicLength = (color.length() + 2) / 3;
if ( basicLength > 1 ) {
// IE ignores colors with three digits or less
-// qDebug("trying to fix up color '%s'. basicLength=%d, length=%d",
+// tqDebug("trying to fix up color '%s'. basicLength=%d, length=%d",
// color.latin1(), basicLength, color.length() );
int colors[3] = { 0, 0, 0 };
int component = 0;
@@ -424,18 +424,18 @@ void HTMLElementImpl::addHTMLColor( int id, const DOMString &c )
component++;
}
maxDigit = basicLength - maxDigit;
-// qDebug("color is %x %x %x, maxDigit=%d", colors[0], colors[1], colors[2], maxDigit );
+// tqDebug("color is %x %x %x, maxDigit=%d", colors[0], colors[1], colors[2], maxDigit );
// normalize to 00-ff. The highest filled digit counts, minimum is 2 digits
maxDigit -= 2;
colors[0] >>= 4*maxDigit;
colors[1] >>= 4*maxDigit;
colors[2] >>= 4*maxDigit;
-// qDebug("normalized color is %x %x %x", colors[0], colors[1], colors[2] );
+// tqDebug("normalized color is %x %x %x", colors[0], colors[1], colors[2] );
// assert( colors[0] < 0x100 && colors[1] < 0x100 && colors[2] < 0x100 );
color.sprintf("#%02x%02x%02x", colors[0], colors[1], colors[2] );
-// qDebug( "trying to add fixed color string '%s'", color.latin1() );
+// tqDebug( "trying to add fixed color string '%s'", color.latin1() );
if ( m_styleDecls->setProperty(id, DOMString(color), false, true) )
return;
}
@@ -622,7 +622,7 @@ void HTMLElementImpl::setInnerText( const DOMString &text, int& exceptioncode )
void HTMLElementImpl::addHTMLAlignment( DOMString alignment )
{
- //qDebug("alignment is %s", alignment.string().latin1() );
+ //tqDebug("alignment is %s", alignment.string().latin1() );
// vertical alignment with respect to the current baseline of the text
// right or left means floating images
int propfloat = -1;
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index 2d4428494..adf28d563 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -2199,7 +2199,7 @@ void HTMLSelectElementImpl::restoreState(const TQString &_state)
TQString state = _state;
if(!state.isEmpty() && !state.contains('X') && !m_multiple && m_size <= 1) {
- qWarning("should not happen in restoreState!");
+ tqWarning("should not happen in restoreState!");
state[0] = 'X';
}
diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp
index 5da6edd14..2329e2325 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/khtml/html/htmltokenizer.cpp
@@ -466,7 +466,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src)
scriptCode[ scriptCodeSize++ ] = *src;
#if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
- qDebug("comment is now: *%s*", src.toString().left(16).latin1());
+ tqDebug("comment is now: *%s*", src.toString().left(16).latin1());
#endif
if (strict)
@@ -765,7 +765,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
uint l = 0;
while(l < src.length() && (src.toString()[l]).latin1() != '>')
l++;
- qDebug("src is now: *%s*, tquote: %d",
+ tqDebug("src is now: *%s*, tquote: %d",
src.toString().left(l).latin1(), tquote);
#endif
switch(tag) {
@@ -774,7 +774,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
case TagName:
{
#if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
- qDebug("TagName");
+ tqDebug("TagName");
#endif
if (searchCount > 0)
{
@@ -870,7 +870,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
case SearchAttribute:
{
#if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
- qDebug("SearchAttribute");
+ tqDebug("SearchAttribute");
#endif
bool atespace = false;
ushort curchar;
@@ -899,7 +899,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
case AttributeName:
{
#if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
- qDebug("AttributeName");
+ tqDebug("AttributeName");
#endif
ushort curchar;
int ll = kMin(src.length(), CBUFLEN-cBufferPos);
@@ -951,7 +951,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
case SearchEqual:
{
#if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
- qDebug("SearchEqual");
+ tqDebug("SearchEqual");
#endif
ushort curchar;
bool atespace = false;
@@ -1006,7 +1006,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
case QuotedValue:
{
#if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
- qDebug("QuotedValue");
+ tqDebug("QuotedValue");
#endif
ushort curchar;
while(!src.isEmpty()) {
@@ -1045,7 +1045,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
case Value:
{
#if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
- qDebug("Value");
+ tqDebug("Value");
#endif
ushort curchar;
while(!src.isEmpty()) {
@@ -1079,7 +1079,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
case SearchEnd:
{
#if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 1
- qDebug("SearchEnd");
+ tqDebug("SearchEnd");
#endif
while(!src.isEmpty()) {
if(*src == '<' || *src == '>')
@@ -1647,7 +1647,7 @@ void HTMLTokenizer::processToken()
{
#if 0
if(currToken.tid) {
- qDebug( "unexpected token id: %d, str: *%s*", currToken.tid,TQConstString( buffer,dest-buffer ).string().latin1() );
+ tqDebug( "unexpected token id: %d, str: *%s*", currToken.tid,TQConstString( buffer,dest-buffer ).string().latin1() );
assert(0);
}
diff --git a/khtml/html/htmltokenizer.h b/khtml/html/htmltokenizer.h
index 8e36353b0..10ef76176 100644
--- a/khtml/html/htmltokenizer.h
+++ b/khtml/html/htmltokenizer.h
@@ -66,7 +66,7 @@ namespace khtml {
attrs = 0;
text = 0;
flat = false;
- //qDebug("new token, creating %08lx", attrs);
+ //tqDebug("new token, creating %08lx", attrs);
}
~Token() {
if(attrs) attrs->deref();
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index b0d539cef..be62001dd 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -1291,7 +1291,7 @@ static int s_DOMTreeIndentLevel = 0;
void KHTMLPart::slotDebugDOMTree()
{
if ( d->m_doc && d->m_doc->firstChild() )
- qDebug("%s", d->m_doc->firstChild()->toString().string().latin1());
+ tqDebug("%s", d->m_doc->firstChild()->toString().string().latin1());
// Now print the contents of the frames that contain HTML
@@ -6398,8 +6398,8 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
TQDragObject *drag = 0;
KURL u;
- // qDebug("****************** Event URL: %s", url.string().latin1());
- // qDebug("****************** Event Target: %s", target.string().latin1());
+ // tqDebug("****************** Event URL: %s", url.string().latin1());
+ // tqDebug("****************** Event Target: %s", target.string().latin1());
// Normal image...
if ( url.length() == 0 && innerNode.handle() && innerNode.handle()->id() == ID_IMG )
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 455ac432a..2db0500b8 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -650,7 +650,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
#ifdef DEBUG_PIXEL
if ( d->timer.elapsed() > 5000 ) {
- qDebug( "drawed %d pixels in %d repaints the last %d milliseconds",
+ tqDebug( "drawed %d pixels in %d repaints the last %d milliseconds",
d->pixelbooth, d->repaintbooth, d->timer.elapsed() );
d->timer.restart();
d->pixelbooth = 0;
@@ -2000,7 +2000,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
break;
}
if (block) {
- //qDebug("eating event");
+ //tqDebug("eating event");
return true;
}
}
@@ -3194,7 +3194,7 @@ bool KHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode,
if (oldUnder && oldUnder->isTextNode())
oldUnder = oldUnder->parentNode();
}
-// qDebug("oldunder=%p (%s), target=%p (%s) x/y=%d/%d", oldUnder, oldUnder ? oldUnder->renderer()->renderName() : 0, targetNode, targetNode ? targetNode->renderer()->renderName() : 0, _mouse->x(), _mouse->y());
+// tqDebug("oldunder=%p (%s), target=%p (%s) x/y=%d/%d", oldUnder, oldUnder ? oldUnder->renderer()->renderName() : 0, targetNode, targetNode ? targetNode->renderer()->renderName() : 0, _mouse->x(), _mouse->y());
if (oldUnder != targetNode) {
// send mouseout event to the old node
if (oldUnder){
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index 20768341f..55f37f397 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -232,7 +232,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
m_boundaryLength = m_boundary.length();
}
}
- else if ( !qstrnicmp( line.data(), "Content-Encoding:", 17 ) )
+ else if ( !tqstrnicmp( line.data(), "Content-Encoding:", 17 ) )
{
TQString encoding = TQString::fromLatin1(line.data()+17).stripWhiteSpace().lower();
if (encoding == "gzip" || encoding == "x-gzip") {
@@ -242,7 +242,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
}
}
// parse Content-Type
- else if ( !qstrnicmp( line.data(), "Content-Type:", 13 ) )
+ else if ( !tqstrnicmp( line.data(), "Content-Type:", 13 ) )
{
Q_ASSERT( m_nextMimeType.isNull() );
m_nextMimeType = TQString::fromLatin1( line.data() + 14 ).stripWhiteSpace();
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index c04f13e37..7b085aab9 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -685,7 +685,7 @@ void CachedImage::do_notify(const TQPixmap& p, const TQRect& r)
void CachedImage::movieUpdated( const TQRect& r )
{
#ifdef LOADER_DEBUG
- qDebug("movie updated %d/%d/%d/%d, pixmap size %d/%d", r.x(), r.y(), r.right(), r.bottom(),
+ tqDebug("movie updated %d/%d/%d/%d, pixmap size %d/%d", r.x(), r.y(), r.right(), r.bottom(),
m->framePixmap().size().width(), m->framePixmap().size().height());
#endif
@@ -695,7 +695,7 @@ void CachedImage::movieUpdated( const TQRect& r )
void CachedImage::movieStatus(int status)
{
#ifdef LOADER_DEBUG
- qDebug("movieStatus(%d)", status);
+ tqDebug("movieStatus(%d)", status);
#endif
// ### the html image objects are supposed to send the load event after every frame (according to
@@ -766,7 +766,7 @@ void CachedImage::movieStatus(int status)
{
#ifdef LOADER_DEBUG
TQRect r(valid_rect());
- qDebug("movie Status frame update %d/%d/%d/%d, pixmap size %d/%d", r.x(), r.y(), r.right(), r.bottom(),
+ tqDebug("movie Status frame update %d/%d/%d/%d, pixmap size %d/%d", r.x(), r.y(), r.right(), r.bottom(),
pixmap().size().width(), pixmap().size().height());
#endif
do_notify(pixmap(), valid_rect());
diff --git a/khtml/misc/loader_jpeg.cpp b/khtml/misc/loader_jpeg.cpp
index b1fa4aeed..15057e0be 100644
--- a/khtml/misc/loader_jpeg.cpp
+++ b/khtml/misc/loader_jpeg.cpp
@@ -67,7 +67,7 @@ extern "C" {
char buffer[JMSG_LENGTH_MAX];
(*cinfo->err->format_message)(cinfo, buffer);
#ifdef JPEG_DEBUG
- qWarning("%s", buffer);
+ tqWarning("%s", buffer);
#endif
longjmp(myerr->setjmp_buffer, 1);
}
@@ -105,7 +105,7 @@ extern "C" {
boolean khtml_fill_input_buffer(j_decompress_ptr cinfo)
{
#ifdef BUFFER_DEBUG
- qDebug("khtml_fill_input_buffer called!");
+ tqDebug("khtml_fill_input_buffer called!");
#endif
khtml_jpeg_source_mgr* src = (khtml_jpeg_source_mgr*)cinfo->src;
@@ -118,7 +118,7 @@ extern "C" {
src->bytes_in_buffer = 2;
src->next_input_byte = (JOCTET *) src->buffer;
#ifdef BUFFER_DEBUG
- qDebug("...returning true!");
+ tqDebug("...returning true!");
#endif
return true;
}
@@ -133,7 +133,7 @@ extern "C" {
return; /* required noop */
#ifdef BUFFER_DEBUG
- qDebug("khtml_skip_input_data (%d) called!", num_bytes);
+ tqDebug("khtml_skip_input_data (%d) called!", num_bytes);
#endif
khtml_jpeg_source_mgr* src = (khtml_jpeg_source_mgr*)cinfo->src;
@@ -142,10 +142,10 @@ extern "C" {
unsigned int skipbytes = kMin(src->bytes_in_buffer, src->skip_input_bytes);
#ifdef BUFFER_DEBUG
- qDebug("skip_input_bytes is now %d", src->skip_input_bytes);
- qDebug("skipbytes is now %d", skipbytes);
- qDebug("valid_buffer_len is before %d", src->valid_buffer_len);
- qDebug("bytes_in_buffer is %d", src->bytes_in_buffer);
+ tqDebug("skip_input_bytes is now %d", src->skip_input_bytes);
+ tqDebug("skipbytes is now %d", skipbytes);
+ tqDebug("valid_buffer_len is before %d", src->valid_buffer_len);
+ tqDebug("bytes_in_buffer is %d", src->bytes_in_buffer);
#endif
if(skipbytes < src->bytes_in_buffer)
@@ -159,8 +159,8 @@ extern "C" {
cinfo->src->next_input_byte = (JOCTET *) src->buffer;
cinfo->src->bytes_in_buffer = (size_t) src->valid_buffer_len;
#ifdef BUFFER_DEBUG
- qDebug("valid_buffer_len is afterwards %d", src->valid_buffer_len);
- qDebug("skip_input_bytes is now %d", src->skip_input_bytes);
+ tqDebug("valid_buffer_len is afterwards %d", src->valid_buffer_len);
+ tqDebug("skip_input_bytes is now %d", src->skip_input_bytes);
#endif
}
}
@@ -244,13 +244,13 @@ KJPEGFormat::~KJPEGFormat()
int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* buffer, int length)
{
#ifdef JPEG_DEBUG
- qDebug("KJPEGFormat::decode(%08lx, %08lx, %08lx, %d)",
+ tqDebug("KJPEGFormat::decode(%08lx, %08lx, %08lx, %d)",
&image, consumer, buffer, length);
#endif
if(jsrc.ateof) {
#ifdef JPEG_DEBUG
- qDebug("ateof, eating");
+ tqDebug("ateof, eating");
#endif
return length;
}
@@ -259,7 +259,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar*
if(setjmp(jerr.setjmp_buffer))
{
#ifdef JPEG_DEBUG
- qDebug("jump into state invalid");
+ tqDebug("jump into state invalid");
#endif
if(consumer)
consumer->end();
@@ -271,7 +271,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar*
int consumed = kMin(length, max_buf - jsrc.valid_buffer_len);
#ifdef BUFFER_DEBUG
- qDebug("consuming %d bytes", consumed);
+ tqDebug("consuming %d bytes", consumed);
#endif
// filling buffer with the new data
@@ -281,9 +281,9 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar*
if(jsrc.skip_input_bytes)
{
#ifdef BUFFER_DEBUG
- qDebug("doing skipping");
- qDebug("valid_buffer_len %d", jsrc.valid_buffer_len);
- qDebug("skip_input_bytes %d", jsrc.skip_input_bytes);
+ tqDebug("doing skipping");
+ tqDebug("valid_buffer_len %d", jsrc.valid_buffer_len);
+ tqDebug("skip_input_bytes %d", jsrc.skip_input_bytes);
#endif
int skipbytes = kMin((size_t) jsrc.valid_buffer_len, jsrc.skip_input_bytes);
@@ -295,7 +295,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar*
// still more bytes to skip
if(jsrc.skip_input_bytes) {
- if(consumed <= 0) qDebug("ERROR!!!");
+ if(consumed <= 0) tqDebug("ERROR!!!");
return consumed;
}
@@ -305,7 +305,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar*
cinfo.src->bytes_in_buffer = (size_t) jsrc.valid_buffer_len;
#ifdef BUFFER_DEBUG
- qDebug("buffer contains %d bytes", jsrc.valid_buffer_len);
+ tqDebug("buffer contains %d bytes", jsrc.valid_buffer_len);
#endif
if(state == Init)
@@ -334,7 +334,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar*
jsrc.do_progressive = jpeg_has_multiple_scans( &cinfo );
#ifdef JPEG_DEBUG
- qDebug( "**** DOPROGRESSIVE: %d", jsrc.do_progressive );
+ tqDebug( "**** DOPROGRESSIVE: %d", jsrc.do_progressive );
#endif
if ( jsrc.do_progressive )
cinfo.buffered_image = true;
@@ -362,11 +362,11 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar*
}
#ifdef JPEG_DEBUG
- qDebug("will create a picture %d/%d in size", cinfo.output_width, cinfo.output_height);
+ tqDebug("will create a picture %d/%d in size", cinfo.output_width, cinfo.output_height);
#endif
#ifdef JPEG_DEBUG
- qDebug("ok, going to decompressStarted");
+ tqDebug("ok, going to decompressStarted");
#endif
jsrc.decoder_timestamp.start();
@@ -407,7 +407,7 @@ again:
if(image.isNull() || jsrc.decoding_done)
{
#ifdef JPEG_DEBUG
- qDebug("complete in doOutputscan, eating..");
+ tqDebug("complete in doOutputscan, eating..");
#endif
return consumed;
}
@@ -420,7 +420,7 @@ again:
int completed_scanlines = cinfo.output_scanline - oldoutput_scanline;
#ifdef JPEG_DEBUG
- qDebug("completed now %d scanlines", completed_scanlines);
+ tqDebug("completed now %d scanlines", completed_scanlines);
#endif
if ( cinfo.output_components == 3 ) {
@@ -440,7 +440,7 @@ again:
{
TQRect r(0, oldoutput_scanline, cinfo.output_width, completed_scanlines);
#ifdef JPEG_DEBUG
- qDebug("changing %d/%d %d/%d", r.x(), r.y(), r.width(), r.height());
+ tqDebug("changing %d/%d %d/%d", r.x(), r.y(), r.width(), r.height());
#endif
jsrc.change_rect |= r;
@@ -470,13 +470,13 @@ again:
jsrc.decoding_done = true;
#ifdef JPEG_DEBUG
- qDebug("one pass is completed, final_pass = %d, dec_done: %d, complete: %d",
+ tqDebug("one pass is completed, final_pass = %d, dec_done: %d, complete: %d",
jsrc.final_pass, jsrc.decoding_done, jpeg_input_complete(&cinfo));
#endif
if(!jsrc.decoding_done)
{
#ifdef JPEG_DEBUG
- qDebug("starting another one, input_scan_number is %d/%d", cinfo.input_scan_number,
+ tqDebug("starting another one, input_scan_number is %d/%d", cinfo.input_scan_number,
cinfo.output_scan_number);
#endif
jsrc.decoder_timestamp.restart();
@@ -488,7 +488,7 @@ again:
if(state == doOutputScan && jsrc.decoding_done) {
#ifdef JPEG_DEBUG
- qDebug("input is complete, cleaning up, returning..");
+ tqDebug("input is complete, cleaning up, returning..");
#endif
if ( consumer && !jsrc.change_rect.isEmpty() )
consumer->changed( jsrc.change_rect );
@@ -508,9 +508,9 @@ again:
}
#ifdef BUFFER_DEBUG
- qDebug("valid_buffer_len is now %d", jsrc.valid_buffer_len);
- qDebug("bytes_in_buffer is now %d", jsrc.bytes_in_buffer);
- qDebug("consumed %d bytes", consumed);
+ tqDebug("valid_buffer_len is now %d", jsrc.valid_buffer_len);
+ tqDebug("bytes_in_buffer is now %d", jsrc.bytes_in_buffer);
+ tqDebug("consumed %d bytes", consumed);
#endif
if(jsrc.bytes_in_buffer && jsrc.buffer != jsrc.next_input_byte)
memmove(jsrc.buffer, jsrc.next_input_byte, jsrc.bytes_in_buffer);
diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp
index bd010047a..2dcfe48c9 100644
--- a/khtml/rendering/bidi.cpp
+++ b/khtml/rendering/bidi.cpp
@@ -548,7 +548,7 @@ static void appendRun( BidiState &bidi )
static void embed( TQChar::Direction d, BidiState &bidi )
{
#if BIDI_DEBUG > 1
- qDebug("*** embed dir=%d emptyrun=%d", d, emptyRun );
+ tqDebug("*** embed dir=%d emptyrun=%d", d, emptyRun );
#endif
bool b = adjustEmbedding ;
adjustEmbedding = false;
diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp
index a33f0e082..1a0591192 100644
--- a/khtml/rendering/font.cpp
+++ b/khtml/rendering/font.cpp
@@ -462,7 +462,7 @@ void Font::update( TQPaintDeviceMetrics* devMetrics ) const
// Also, Qt does not support sizing a TQFont to zero.
size = kMax(1, kMin(255, size));
-// qDebug("setting font to %s, italic=%d, weight=%d, size=%d", fontDef.family.latin1(), fontDef.italic,
+// tqDebug("setting font to %s, italic=%d, weight=%d, size=%d", fontDef.family.latin1(), fontDef.italic,
// fontDef.weight, size );
diff --git a/khtml/rendering/render_body.cpp b/khtml/rendering/render_body.cpp
index 930ec358c..541c9676d 100644
--- a/khtml/rendering/render_body.cpp
+++ b/khtml/rendering/render_body.cpp
@@ -43,7 +43,7 @@ RenderBody::~RenderBody()
void RenderBody::setStyle(RenderStyle* style)
{
-// qDebug("RenderBody::setStyle()");
+// tqDebug("RenderBody::setStyle()");
// ignore position: fixed on body
if (style->htmlHacks() && style->position() == FIXED)
style->setPosition(STATIC);
diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp
index 46104adb8..e387920d6 100644
--- a/khtml/rendering/render_image.cpp
+++ b/khtml/rendering/render_image.cpp
@@ -143,7 +143,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
if( o->pixmap_size().width() != intrinsicWidth() ||
o->pixmap_size().height() != intrinsicHeight() || iwchanged )
{
-// qDebug("image dimensions have been changed, old: %d/%d new: %d/%d",
+// tqDebug("image dimensions have been changed, old: %d/%d new: %d/%d",
// intrinsicWidth(), intrinsicHeight(),
// o->pixmap_size().width(), o->pixmap_size().height());
@@ -264,7 +264,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
if(cWidth > 2 && cHeight > 2)
{
if ( !berrorPic ) {
- //qDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight);
+ //tqDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight);
qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight,
KApplication::palette().inactive(), true, 1 );
}
@@ -299,7 +299,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
TQRect scaledrect(i->valid_rect());
// kdDebug(6040) << "time elapsed: " << dt->elapsed() << endl;
// kdDebug( 6040 ) << "have to scale: " << endl;
-// qDebug("cw=%d ch=%d pw=%d ph=%d rcw=%d, rch=%d",
+// tqDebug("cw=%d ch=%d pw=%d ph=%d rcw=%d, rch=%d",
// cWidth, cHeight, intrinsicWidth(), intrinsicHeight(), resizeCache.width(), resizeCache.height());
TQWMatrix matrix;
matrix.scale( (float)(cWidth)/intrinsicWidth(),
@@ -307,8 +307,8 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
resizeCache = pix.xForm( matrix );
scaledrect.setWidth( ( cWidth*scaledrect.width() ) / intrinsicWidth() );
scaledrect.setHeight( ( cHeight*scaledrect.height() ) / intrinsicHeight() );
-// qDebug("resizeCache size: %d/%d", resizeCache.width(), resizeCache.height());
-// qDebug("valid: %d/%d, scaled: %d/%d",
+// tqDebug("resizeCache size: %d/%d", resizeCache.width(), resizeCache.height());
+// tqDebug("valid: %d/%d, scaled: %d/%d",
// i->valid_rect().width(), i->valid_rect().height(),
// scaledrect.width(), scaledrect.height());
@@ -336,12 +336,12 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
: TQRect(0, 0, intrinsicWidth(), intrinsicHeight()));
TQPoint offs( _tx + leftBorder + leftPad, _ty + topBorder + topPad);
-// qDebug("normal paint rect %d/%d/%d/%d", rect.x(), rect.y(), rect.width(), rect.height());
+// tqDebug("normal paint rect %d/%d/%d/%d", rect.x(), rect.y(), rect.width(), rect.height());
// rect = rect & TQRect( 0 , y - offs.y() - 10, w, 10 + y + h - offs.y());
-// qDebug("normal paint rect after %d/%d/%d/%d", rect.x(), rect.y(), rect.width(), rect.height());
-// qDebug("normal paint: offs.y(): %d, y: %d, diff: %d", offs.y(), y, y - offs.y());
-// qDebug("");
+// tqDebug("normal paint rect after %d/%d/%d/%d", rect.x(), rect.y(), rect.width(), rect.height());
+// tqDebug("normal paint: offs.y(): %d, y: %d, diff: %d", offs.y(), y, y - offs.y());
+// tqDebug("");
// p->setClipRect(TQRect(x,y,w,h));
diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp
index 162ca4956..f03039759 100644
--- a/khtml/rendering/render_object.cpp
+++ b/khtml/rendering/render_object.cpp
@@ -1273,7 +1273,7 @@ void RenderObject::setStyle(RenderStyle *style)
return;
RenderStyle::Diff d = m_style ? m_style->diff( style ) : RenderStyle::Layout;
- //qDebug("m_style: %p new style, diff=%d", m_style, d);
+ //tqDebug("m_style: %p new style, diff=%d", m_style, d);
Priority pri = NormalPriority;
if (m_style) {
diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h
index f7f772387..e15dabbbc 100644
--- a/khtml/rendering/render_object.h
+++ b/khtml/rendering/render_object.h
@@ -49,7 +49,7 @@ class KHTMLView;
#define KHTMLAssert( x ) if( !(x) ) { \
const RenderObject *o = this; while( o->parent() ) o = o->parent(); \
o->printTree(); \
- qDebug(" this object = %p, %s", (void*) this, kdBacktrace().latin1() ); \
+ tqDebug(" this object = %p, %s", (void*) this, kdBacktrace().latin1() ); \
assert( x ); \
}
#else
diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
index 7653b746c..6d6823455 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -413,14 +413,14 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
int xNew = xPos;
int yNew = childy;
- // qDebug("cy=%d, ch=%d, childy=%d, childh=%d", cy, ch, childy, childh );
+ // tqDebug("cy=%d, ch=%d, childy=%d, childh=%d", cy, ch, childy, childh );
if ( childh == 3072 ) {
if ( cy + ch > childy + childh ) {
yNew = cy + ( ch - childh )/2;
} else if ( cy < childy ) {
yNew = cy + ( ch - childh )/2;
}
-// qDebug("calculated yNew=%d", yNew);
+// tqDebug("calculated yNew=%d", yNew);
}
yNew = kMin( yNew, yPos + m_height - childh );
yNew = kMax( yNew, yPos );
@@ -880,7 +880,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
void RenderWidget::deref()
{
if (_ref) _ref--;
-// qDebug( "deref(%p): width get count is %d", this, _ref);
+// tqDebug( "deref(%p): width get count is %d", this, _ref);
if (!_ref) {
khtml::SharedPtr<RenderArena> guard(m_arena); //Since delete on us gets called -first-,
//before the arena free
diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp
index 2cf1bf1f9..d98aa2072 100644
--- a/khtml/rendering/render_table.cpp
+++ b/khtml/rendering/render_table.cpp
@@ -566,7 +566,7 @@ void RenderTable::splitColumn( int pos, int firstSpan )
int oldSize = columns.size();
columns.resize( oldSize + 1 );
int oldSpan = columns[pos].span;
-// qDebug("splitColumn( %d,%d ), oldSize=%d, oldSpan=%d", pos, firstSpan, oldSize, oldSpan );
+// tqDebug("splitColumn( %d,%d ), oldSize=%d, oldSpan=%d", pos, firstSpan, oldSize, oldSpan );
KHTMLAssert( oldSpan > firstSpan );
columns[pos].span = firstSpan;
memmove( columns.data()+pos+1, columns.data()+pos, (oldSize-pos)*sizeof(ColumnStruct) );
@@ -585,7 +585,7 @@ void RenderTable::splitColumn( int pos, int firstSpan )
section->grid[row].row->resize( oldSize+1 );
RenderTableSection::Row &r = *section->grid[row].row;
memmove( r.data()+pos+1, r.data()+pos, (oldSize-pos)*sizeof( RenderTableCell * ) );
-// qDebug("moving from %d to %d, num=%d", pos, pos+1, (oldSize-pos-1) );
+// tqDebug("moving from %d to %d, num=%d", pos, pos+1, (oldSize-pos-1) );
r[pos+1] = r[pos] ? (RenderTableCell *)-1 : 0;
row++;
}
@@ -600,11 +600,11 @@ void RenderTable::appendColumn( int span )
{
// easy case.
int pos = columns.size();
-// qDebug("appendColumn( %d ), size=%d", span, pos );
+// tqDebug("appendColumn( %d ), size=%d", span, pos );
int newSize = pos + 1;
columns.resize( newSize );
columns[pos].span = span;
- //qDebug("appending column at %d, span %d", pos, span );
+ //tqDebug("appending column at %d, span %d", pos, span );
// change width of all rows.
RenderObject *child = firstChild();
@@ -1086,7 +1086,7 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )
while ( cCol < nCols && cellAt( cRow, cCol ) )
cCol++;
-// qDebug("adding cell at %d/%d span=(%d/%d)", cRow, cCol, rSpan, cSpan );
+// tqDebug("adding cell at %d/%d span=(%d/%d)", cRow, cCol, rSpan, cSpan );
if ( rSpan == 1 ) {
// we ignore height settings on rowspan cells
@@ -1139,7 +1139,7 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )
int r = 0;
while ( r < rSpan ) {
if ( !cellAt( cRow + r, cCol ) ) {
-// qDebug(" adding cell at %d, %d", cRow + r, cCol );
+// tqDebug(" adding cell at %d, %d", cRow + r, cCol );
cellAt( cRow + r, cCol ) = set;
}
r++;
@@ -1169,7 +1169,7 @@ void RenderTableSection::setCellWidths()
int cols = row.size();
for ( int j = 0; j < cols; j++ ) {
RenderTableCell *cell = row[j];
-// qDebug("cell[%d,%d] = %p", i, j, cell );
+// tqDebug("cell[%d,%d] = %p", i, j, cell );
if ( !cell || cell == (RenderTableCell *)-1 )
continue;
int endCol = j;
@@ -1213,7 +1213,7 @@ void RenderTableSection::calcRowHeight()
int baseline=0;
int bdesc = 0;
-// qDebug("height of row %d is %d/%d", r, grid[r].height.value, grid[r].height.type );
+// tqDebug("height of row %d is %d/%d", r, grid[r].height.value, grid[r].height.type );
int ch = grid[r].height.minWidth( 0 );
int pos = rowPos[r] + ch + (grid[r].rowRenderer ? vspacing : 0);
@@ -1290,7 +1290,7 @@ void RenderTableSection::calcRowHeight()
if ( rowPos[r+1] < rowPos[r] )
rowPos[r+1] = rowPos[r];
-// qDebug("rowpos(%d)=%d", r, rowPos[r] );
+// tqDebug("rowpos(%d)=%d", r, rowPos[r] );
}
}
@@ -1313,7 +1313,7 @@ int RenderTableSection::layoutRows( int toAdd )
if (toAdd && totalRows && (rowPos[totalRows] || !nextSibling())) {
int totalHeight = rowPos[totalRows] + toAdd;
-// qDebug("layoutRows: totalHeight = %d", totalHeight );
+// tqDebug("layoutRows: totalHeight = %d", totalHeight );
int dh = toAdd;
int totalPercent = 0;
@@ -1325,7 +1325,7 @@ int RenderTableSection::layoutRows( int toAdd )
totalPercent += grid[r].height.value();
}
if ( totalPercent ) {
-// qDebug("distributing %d over percent rows totalPercent=%d", dh, totalPercent );
+// tqDebug("distributing %d over percent rows totalPercent=%d", dh, totalPercent );
// try to satisfy percent
int add = 0;
if ( totalPercent > 100 )
@@ -1340,7 +1340,7 @@ int RenderTableSection::layoutRows( int toAdd )
add += toAdd;
dh -= toAdd;
totalPercent -= grid[r].height.value();
-// qDebug( "adding %d to row %d", toAdd, r );
+// tqDebug( "adding %d to row %d", toAdd, r );
}
if ( r < totalRows-1 )
rh = rowPos[r+2] - rowPos[r+1];
@@ -1349,7 +1349,7 @@ int RenderTableSection::layoutRows( int toAdd )
}
if ( numVariable ) {
// distribute over non-empty variable rows
-// qDebug("distributing %d over variable rows numVariable=%d", dh, numVariable );
+// tqDebug("distributing %d over variable rows numVariable=%d", dh, numVariable );
int add = 0;
int toAdd = dh/numVariable;
for ( int r = 0; r < totalRows; r++ ) {
diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp
index f5fa2e373..770e8cd4d 100644
--- a/khtml/rendering/render_text.cpp
+++ b/khtml/rendering/render_text.cpp
@@ -912,7 +912,7 @@ FindSelectionResult RenderText::checkSelectionPoint(int _x, int _y, int _tx, int
// set offset to max
offset = str->l;
- //qDebug("setting node to %p", element());
+ //tqDebug("setting node to %p", element());
node = element();
// kdDebug(6040) << "RenderText::checkSelectionPoint: node " << node << " offset " << offset << endl;
return SelectionPointAfter;
diff --git a/khtml/rendering/table_layout.cpp b/khtml/rendering/table_layout.cpp
index 7b5215d02..f745640e7 100644
--- a/khtml/rendering/table_layout.cpp
+++ b/khtml/rendering/table_layout.cpp
@@ -99,8 +99,8 @@ int FixedTableLayout::calcWidthArray()
width.fill( Length( Variable ) );
#ifdef DEBUG_LAYOUT
- qDebug("FixedTableLayout::calcWidthArray()" );
- qDebug(" col elements:");
+ tqDebug("FixedTableLayout::calcWidthArray()" );
+ tqDebug(" col elements:");
#endif
Length grpWidth;
@@ -120,7 +120,7 @@ int FixedTableLayout::calcWidthArray()
effWidth = KMIN( effWidth, 32760 );
}
#ifdef DEBUG_LAYOUT
- qDebug(" col element: effCol=%d, span=%d: %d w=%d type=%d",
+ tqDebug(" col element: effCol=%d, span=%d: %d w=%d type=%d",
cCol, span, effWidth, w.value(), w.type());
#endif
int usedSpan = 0;
@@ -137,7 +137,7 @@ int FixedTableLayout::calcWidthArray()
width[cCol+i] = Length( w.value() * eSpan, w.type() );
usedWidth += effWidth * eSpan;
#ifdef DEBUG_LAYOUT
- qDebug(" setting effCol %d (span=%d) to width %d(type=%d)",
+ tqDebug(" setting effCol %d (span=%d) to width %d(type=%d)",
cCol+i, eSpan, width[cCol+i].value(), width[cCol+i].type() );
#endif
}
@@ -161,7 +161,7 @@ int FixedTableLayout::calcWidthArray()
}
#ifdef DEBUG_LAYOUT
- qDebug(" first row:");
+ tqDebug(" first row:");
#endif
// iterate over the first row in case some are unspecified.
RenderTableSection *section = table->head;
@@ -184,7 +184,7 @@ int FixedTableLayout::calcWidthArray()
effWidth = kMin( effWidth, 32760 );
}
#ifdef DEBUG_LAYOUT
- qDebug(" table cell: effCol=%d, span=%d: %d", cCol, span, effWidth);
+ tqDebug(" table cell: effCol=%d, span=%d: %d", cCol, span, effWidth);
#endif
int usedSpan = 0;
int i = 0;
@@ -196,13 +196,13 @@ int FixedTableLayout::calcWidthArray()
width[cCol+i] = Length( w.value()*eSpan, w.type() );
usedWidth += effWidth*eSpan;
#ifdef DEBUG_LAYOUT
- qDebug(" setting effCol %d (span=%d) to width %d(type=%d)",
+ tqDebug(" setting effCol %d (span=%d) to width %d(type=%d)",
cCol+i, eSpan, width[cCol+i].value(), width[cCol+i].type() );
#endif
}
#ifdef DEBUG_LAYOUT
else {
- qDebug(" width of col %d already defined (span=%d)", cCol, table->spanOfEffCol( cCol ) );
+ tqDebug(" width of col %d already defined (span=%d)", cCol, table->spanOfEffCol( cCol ) );
}
#endif
usedSpan += eSpan;
@@ -254,7 +254,7 @@ void FixedTableLayout::calcMinMaxWidth()
table->m_maxWidth = 0x7fff;
}
#ifdef DEBUG_LAYOUT
- qDebug("FixedTableLayout::calcMinMaxWidth: minWidth=%d, maxWidth=%d", table->m_minWidth, table->m_maxWidth );
+ tqDebug("FixedTableLayout::calcMinMaxWidth: minWidth=%d, maxWidth=%d", table->m_minWidth, table->m_maxWidth );
#endif
}
@@ -264,7 +264,7 @@ void FixedTableLayout::layout()
int available = tableWidth;
int nEffCols = table->numEffCols();
#ifdef DEBUG_LAYOUT
- qDebug("FixedTableLayout::layout: tableWidth=%d, numEffCols=%d", tableWidth, nEffCols);
+ tqDebug("FixedTableLayout::layout: tableWidth=%d, numEffCols=%d", tableWidth, nEffCols);
#endif
@@ -293,7 +293,7 @@ void FixedTableLayout::layout()
base = available;
#ifdef DEBUG_LAYOUT
- qDebug("FixedTableLayout::layout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent);
+ tqDebug("FixedTableLayout::layout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent);
#endif
for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
if ( width[i].isPercent() ) {
@@ -344,7 +344,7 @@ void FixedTableLayout::layout()
int hspacing = table->borderHSpacing();
for ( int i = 0; i < nEffCols; i++ ) {
#ifdef DEBUG_LAYOUT
- qDebug("col %d: %d (width %d)", i, pos, calcWidth[i] );
+ tqDebug("col %d: %d (width %d)", i, pos, calcWidth[i] );
#endif
table->columnPos[i] = pos;
pos += calcWidth[i] + hspacing;
@@ -464,7 +464,7 @@ void AutoTableLayout::recalcColumn( int effCol )
l.maxWidth = kMax(l.maxWidth, int(l.minWidth));
#ifdef DEBUG_LAYOUT
- qDebug("col %d, final min=%d, max=%d, width=%d(%d)", effCol, l.minWidth, l.maxWidth, l.width.value(), l.width.type() );
+ tqDebug("col %d, final min=%d, max=%d, width=%d(%d)", effCol, l.minWidth, l.maxWidth, l.width.value(), l.width.type() );
#endif
// ### we need to add col elements aswell
@@ -500,7 +500,7 @@ void AutoTableLayout::fullRecalc()
w = Length();
int cEffCol = table->colToEffCol( cCol );
#ifdef DEBUG_LAYOUT
- qDebug(" col element %d (eff=%d): Length=%d(%d), span=%d, effColSpan=%d", cCol, cEffCol, w.value(), w.type(), span, table->spanOfEffCol(cEffCol ) );
+ tqDebug(" col element %d (eff=%d): Length=%d(%d), span=%d, effColSpan=%d", cCol, cEffCol, w.value(), w.type(), span, table->spanOfEffCol(cEffCol ) );
#endif
if ( !w.isVariable() && span == 1 && cEffCol < nEffCols ) {
if ( table->spanOfEffCol( cEffCol ) == 1 ) {
@@ -566,7 +566,7 @@ static bool shouldScaleColumns(RenderTable* table)
void AutoTableLayout::calcMinMaxWidth()
{
#ifdef DEBUG_LAYOUT
- qDebug("AutoTableLayout::calcMinMaxWidth");
+ tqDebug("AutoTableLayout::calcMinMaxWidth");
#endif
fullRecalc();
@@ -612,7 +612,7 @@ void AutoTableLayout::calcMinMaxWidth()
table->m_maxWidth = kMin(maxWidth, 0x7fff);
table->m_minWidth = kMin(minWidth, 0x7fff);
#ifdef DEBUG_LAYOUT
- qDebug(" minWidth=%d, maxWidth=%d", table->m_minWidth, table->m_maxWidth );
+ tqDebug(" minWidth=%d, maxWidth=%d", table->m_minWidth, table->m_maxWidth );
#endif
}
@@ -627,7 +627,7 @@ int AutoTableLayout::calcEffectiveWidth()
unsigned int nEffCols = layoutStruct.size();
int hspacing = table->borderHSpacing();
#ifdef DEBUG_LAYOUT
- qDebug("AutoTableLayout::calcEffectiveWidth for %d cols", nEffCols );
+ tqDebug("AutoTableLayout::calcEffectiveWidth for %d cols", nEffCols );
#endif
for ( unsigned int i = 0; i < nEffCols; i++ ) {
layoutStruct[i].effWidth = layoutStruct[i].width;
@@ -701,7 +701,7 @@ int AutoTableLayout::calcEffectiveWidth()
cMaxWidth -= hspacing;
}
#ifdef DEBUG_LAYOUT
- qDebug(" colspan cell %p at effCol %d, span %d, type %d, value %d cmin=%d min=%d fixedwidth=%d", cell, col, cSpan, w.type(), w.value(), cMinWidth, minWidth, fixedWidth );
+ tqDebug(" colspan cell %p at effCol %d, span %d, type %d, value %d cmin=%d min=%d fixedwidth=%d", cell, col, cSpan, w.type(), w.value(), cMinWidth, minWidth, fixedWidth );
#endif
// adjust table max width if needed
@@ -712,7 +712,7 @@ int AutoTableLayout::calcEffectiveWidth()
} else {
int spanMax = kMax( maxWidth, cMaxWidth );
#ifdef DEBUG_LAYOUT
- qDebug(" adjusting tMaxWidth (%d): spanMax=%d, value=%d, totalPercent=%d", tMaxWidth, spanMax, w.value(), totalPercent );
+ tqDebug(" adjusting tMaxWidth (%d): spanMax=%d, value=%d, totalPercent=%d", tMaxWidth, spanMax, w.value(), totalPercent );
#endif
tMaxWidth = kMax( tMaxWidth, spanMax * 100 / w.value() );
@@ -728,7 +728,7 @@ int AutoTableLayout::calcEffectiveWidth()
if ( !(layoutStruct[pos].width.isPercent() ) ) {
int percent = percentMissing * layoutStruct[pos].effMaxWidth / totalWidth;
#ifdef DEBUG_LAYOUT
- qDebug(" col %d: setting percent value %d effMaxWidth=%d totalWidth=%d", pos, percent, layoutStruct[pos].effMaxWidth, totalWidth );
+ tqDebug(" col %d: setting percent value %d effMaxWidth=%d totalWidth=%d", pos, percent, layoutStruct[pos].effMaxWidth, totalWidth );
#endif
totalWidth -= layoutStruct[pos].effMaxWidth;
percentMissing -= percent;
@@ -746,12 +746,12 @@ int AutoTableLayout::calcEffectiveWidth()
if ( cMinWidth > minWidth ) {
if ( allColsAreFixed ) {
#ifdef DEBUG_LAYOUT
- qDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d accroding to fixed sum %d", col, lastCol-1, cMinWidth, minWidth, fixedWidth );
+ tqDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d accroding to fixed sum %d", col, lastCol-1, cMinWidth, minWidth, fixedWidth );
#endif
for ( unsigned int pos = col; fixedWidth > 0 && pos < lastCol; pos++ ) {
int w = kMax( int( layoutStruct[pos].effMinWidth ), cMinWidth * layoutStruct[pos].width.value() / fixedWidth );
#ifdef DEBUG_LAYOUT
- qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
+ tqDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
#endif
fixedWidth -= layoutStruct[pos].width.value();
cMinWidth -= w;
@@ -769,7 +769,7 @@ int AutoTableLayout::calcEffectiveWidth()
w = kMax( w, cminw*layoutStruct[pos].effWidth.value()/totalPercent );
w = kMin(layoutStruct[pos].effMinWidth+(cMinWidth-minw), w);
#ifdef DEBUG_LAYOUT
- qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
+ tqDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
#endif
maxw -= layoutStruct[pos].effMaxWidth;
minw -= layoutStruct[pos].effMinWidth;
@@ -779,7 +779,7 @@ int AutoTableLayout::calcEffectiveWidth()
}
} else {
#ifdef DEBUG_LAYOUT
- qDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d", col, lastCol-1, cMinWidth, minWidth );
+ tqDebug("extending minWidth of cols %d-%d to %dpx currentMin=%d", col, lastCol-1, cMinWidth, minWidth );
#endif
int maxw = maxWidth;
int minw = minWidth;
@@ -791,7 +791,7 @@ int AutoTableLayout::calcEffectiveWidth()
fixedWidth -= layoutStruct[pos].width.value();
minw -= layoutStruct[pos].effMinWidth;
#ifdef DEBUG_LAYOUT
- qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
+ tqDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
#endif
maxw -= layoutStruct[pos].effMaxWidth;
cMinWidth -= w;
@@ -805,7 +805,7 @@ int AutoTableLayout::calcEffectiveWidth()
w = kMin(layoutStruct[pos].effMinWidth+(cMinWidth-minw), w);
#ifdef DEBUG_LAYOUT
- qDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
+ tqDebug(" col %d: min=%d, effMin=%d, new=%d", pos, layoutStruct[pos].effMinWidth, layoutStruct[pos].effMinWidth, w );
#endif
maxw -= layoutStruct[pos].effMaxWidth;
minw -= layoutStruct[pos].effMinWidth;
@@ -818,12 +818,12 @@ int AutoTableLayout::calcEffectiveWidth()
if ( !w.isPercent() ) {
if ( cMaxWidth > maxWidth ) {
#ifdef DEBUG_LAYOUT
- qDebug("extending maxWidth of cols %d-%d to %dpx", col, lastCol-1, cMaxWidth );
+ tqDebug("extending maxWidth of cols %d-%d to %dpx", col, lastCol-1, cMaxWidth );
#endif
for ( unsigned int pos = col; maxWidth > 0 && pos < lastCol; pos++ ) {
int w = kMax( int( layoutStruct[pos].effMaxWidth ), cMaxWidth * layoutStruct[pos].effMaxWidth / maxWidth );
#ifdef DEBUG_LAYOUT
- qDebug(" col %d: max=%d, effMax=%d, new=%d", pos, layoutStruct[pos].effMaxWidth, layoutStruct[pos].effMaxWidth, w );
+ tqDebug(" col %d: max=%d, effMax=%d, new=%d", pos, layoutStruct[pos].effMaxWidth, layoutStruct[pos].effMaxWidth, w );
#endif
maxWidth -= layoutStruct[pos].effMaxWidth;
cMaxWidth -= w;
@@ -837,7 +837,7 @@ int AutoTableLayout::calcEffectiveWidth()
}
effWidthDirty = false;
-// qDebug("calcEffectiveWidth: tMaxWidth=%d", tMaxWidth );
+// tqDebug("calcEffectiveWidth: tMaxWidth=%d", tMaxWidth );
return tMaxWidth;
}
@@ -849,7 +849,7 @@ void AutoTableLayout::insertSpanCell( RenderTableCell *cell )
if ( !cell || cell == (RenderTableCell *)-1 || cell->colSpan() == 1 )
return;
-// qDebug("inserting span cell %p with span %d", cell, cell->colSpan() );
+// tqDebug("inserting span cell %p with span %d", cell, cell->colSpan() );
int size = spanCells.size();
if ( !size || spanCells[size-1] != 0 ) {
spanCells.resize( size + 10 );
@@ -876,24 +876,24 @@ void AutoTableLayout::layout()
int nEffCols = table->numEffCols();
if ( nEffCols != (int)layoutStruct.size() ) {
- qWarning("WARNING: nEffCols is not equal to layoutstruct!" );
+ tqWarning("WARNING: nEffCols is not equal to layoutstruct!" );
fullRecalc();
nEffCols = table->numEffCols();
}
#ifdef DEBUG_LAYOUT
- qDebug("AutoTableLayout::layout()");
+ tqDebug("AutoTableLayout::layout()");
#endif
if ( effWidthDirty )
calcEffectiveWidth();
#ifdef DEBUG_LAYOUT
- qDebug(" tableWidth=%d, nEffCols=%d", tableWidth, nEffCols );
+ tqDebug(" tableWidth=%d, nEffCols=%d", tableWidth, nEffCols );
for ( int i = 0; i < nEffCols; i++ ) {
- qDebug(" effcol %d is of type %d value %d, minWidth=%d, maxWidth=%d",
+ tqDebug(" effcol %d is of type %d value %d, minWidth=%d, maxWidth=%d",
i, layoutStruct[i].width.type(), layoutStruct[i].width.value(),
layoutStruct[i].minWidth, layoutStruct[i].maxWidth );
- qDebug(" effective: type %d value %d, minWidth=%d, maxWidth=%d",
+ tqDebug(" effective: type %d value %d, minWidth=%d, maxWidth=%d",
layoutStruct[i].effWidth.type(), layoutStruct[i].effWidth.value(),
layoutStruct[i].effMinWidth, layoutStruct[i].effMaxWidth );
}
@@ -959,13 +959,13 @@ void AutoTableLayout::layout()
int newWidth = kMax( int (layoutStruct[i].effMinWidth), w - reduction );
available += w - newWidth;
layoutStruct[i].calcWidth = newWidth;
- //qDebug("col %d: reducing to %d px (reduction=%d)", i, newWidth, reduction );
+ //tqDebug("col %d: reducing to %d px (reduction=%d)", i, newWidth, reduction );
}
}
}
}
#ifdef DEBUG_LAYOUT
- qDebug("percent satisfied: available is %d", available);
+ tqDebug("percent satisfied: available is %d", available);
#endif
// then allocate width to fixed cols
@@ -979,7 +979,7 @@ void AutoTableLayout::layout()
}
}
#ifdef DEBUG_LAYOUT
- qDebug("fixed satisfied: available is %d", available);
+ tqDebug("fixed satisfied: available is %d", available);
#endif
// now satisfy relative
@@ -998,7 +998,7 @@ void AutoTableLayout::layout()
// now satisfy variable
if ( available > 0 && numVariable ) {
available += allocVariable; // this gets redistributed
- //qDebug("redistributing %dpx to %d variable columns. totalVariable=%d", available, numVariable, totalVariable );
+ //tqDebug("redistributing %dpx to %d variable columns. totalVariable=%d", available, numVariable, totalVariable );
for ( int i = 0; i < nEffCols; i++ ) {
const Length &width = layoutStruct[i].effWidth;
if ( width.isVariable() && totalVariable != 0 ) {
@@ -1011,7 +1011,7 @@ void AutoTableLayout::layout()
}
}
#ifdef DEBUG_LAYOUT
- qDebug("variable satisfied: available is %d", available );
+ tqDebug("variable satisfied: available is %d", available );
#endif
// spread over fixed colums
@@ -1029,7 +1029,7 @@ void AutoTableLayout::layout()
}
#ifdef DEBUG_LAYOUT
- qDebug("after fixed distribution: available=%d", available );
+ tqDebug("after fixed distribution: available=%d", available );
#endif
// spread over percent colums
@@ -1048,7 +1048,7 @@ void AutoTableLayout::layout()
}
#ifdef DEBUG_LAYOUT
- qDebug("after percent distribution: available=%d", available );
+ tqDebug("after percent distribution: available=%d", available );
#endif
// spread over the rest
@@ -1065,7 +1065,7 @@ void AutoTableLayout::layout()
}
#ifdef DEBUG_LAYOUT
- qDebug("after equal distribution: available=%d", available );
+ tqDebug("after equal distribution: available=%d", available );
#endif
// if we have overallocated, reduce every cell according to the difference between desired width and minwidth
// this seems to produce to the pixel exaxt results with IE. Wonder is some of this also holds for width distributing.
@@ -1165,12 +1165,12 @@ void AutoTableLayout::layout()
}
}
- //qDebug( " final available=%d", available );
+ //tqDebug( " final available=%d", available );
int pos = 0;
for ( int i = 0; i < nEffCols; i++ ) {
#ifdef DEBUG_LAYOUT
- qDebug("col %d: %d (width %d)", i, pos, layoutStruct[i].calcWidth );
+ tqDebug("col %d: %d (width %d)", i, pos, layoutStruct[i].calcWidth );
#endif
table->columnPos[i] = pos;
pos += layoutStruct[i].calcWidth + table->borderHSpacing();
diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp
index b42feefee..2cea9f5a4 100644
--- a/khtml/test_regression_fontoverload.cpp
+++ b/khtml/test_regression_fontoverload.cpp
@@ -227,7 +227,7 @@ TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp,
XFontStruct *xfs;
xfs = XLoadQueryFont(TQPaintDevice::x11AppDisplay(), xlfd.latin1() );
if (!xfs) // as long as you don't do screenshots, it's maybe fine
- qFatal("we need some fonts. So make sure you have %s installed.", xlfd.latin1());
+ tqFatal("we need some fonts. So make sure you have %s installed.", xlfd.latin1());
unsigned long value;
if ( !XGetFontProperty( xfs, XA_FONT, &value ) )
@@ -240,7 +240,7 @@ TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp,
fe = new QFakeFontEngine( xfs, xlfd.latin1(),request.pixelSize );
- // qDebug("fe %s ascent %d descent %d minLeftBearing %d leading %d maxCharWidth %d minRightBearing %d", xlfd.latin1(), fe->ascent(), fe->descent(), fe->minLeftBearing(), fe->leading(), fe->maxCharWidth(), fe->minRightBearing());
+ // tqDebug("fe %s ascent %d descent %d minLeftBearing %d leading %d maxCharWidth %d minRightBearing %d", xlfd.latin1(), fe->ascent(), fe->descent(), fe->minLeftBearing(), fe->leading(), fe->maxCharWidth(), fe->minRightBearing());
// fe->setScale( scale );
@@ -348,7 +348,7 @@ KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
XFontStruct *xfs;
xfs = XLoadQueryFont(TQPaintDevice::x11AppDisplay(), xlfd.latin1() );
if (!xfs) // as long as you don't do screenshots, it's maybe fine
- qFatal("We will need some fonts. So make sure you have %s installed.", xlfd.latin1());
+ tqFatal("We will need some fonts. So make sure you have %s installed.", xlfd.latin1());
XFreeFont(TQPaintDevice::x11AppDisplay(), xfs);
done = true;
}
@@ -356,7 +356,7 @@ KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
#include <kapplication.h>
void KApplication::dcopFailure( const TQString & )
{
- qDebug( "KApplication::dcopFailure" );
+ tqDebug( "KApplication::dcopFailure" );
}
#include <kparts/historyprovider.h>
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 922714a4e..197ceee13 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -1108,7 +1108,7 @@ void DocumentImpl::setDocumentChanged(bool b)
void DocumentImpl::recalcStyle( StyleChange change )
{
-// qDebug("recalcStyle(%p)", this);
+// tqDebug("recalcStyle(%p)", this);
// TQTime qt;
// qt.start();
if (m_inStyleRecalc)
@@ -1749,7 +1749,7 @@ bool DocumentImpl::prepareMouseEvent( bool readonly, int _x, int _y, MouseEvent
if (renderInfo.URLElement()) {
assert(renderInfo.URLElement()->isElementNode());
- //qDebug("urlnode: %s (%d)", getTagName(renderInfo.URLElement()->id()).string().latin1(), renderInfo.URLElement()->id());
+ //tqDebug("urlnode: %s (%d)", getTagName(renderInfo.URLElement()->id()).string().latin1(), renderInfo.URLElement()->id());
ElementImpl* e = static_cast<ElementImpl*>(renderInfo.URLElement());
DOMString href = khtml::parseURL(e->getAttribute(ATTR_HREF));
diff --git a/khtml/xml/dom_elementimpl.cpp b/khtml/xml/dom_elementimpl.cpp
index c41bef3dc..875c5f2e4 100644
--- a/khtml/xml/dom_elementimpl.cpp
+++ b/khtml/xml/dom_elementimpl.cpp
@@ -614,7 +614,7 @@ void ElementImpl::recalcStyle( StyleChange change )
case Force: debug = "Force";
break;
}
- qDebug("recalcStyle(%d: %s, changed: %d)[%p: %s]", change, debug, changed(), this, tagName().string().latin1());
+ tqDebug("recalcStyle(%d: %s, changed: %d)[%p: %s]", change, debug, changed(), this, tagName().string().latin1());
#endif
if ( hasParentRenderer && (change >= Inherit || changed()) ) {
RenderStyle *newStyle = getDocument()->styleSelector()->styleForElement(this);
@@ -650,7 +650,7 @@ void ElementImpl::recalcStyle( StyleChange change )
for (n = _first; n; n = n->nextSibling()) {
if ( change >= Inherit || n->isTextNode() ||
n->hasChangedChild() || n->changed() ) {
- //qDebug(" (%p) calling recalcStyle on child %p/%s, change=%d", this, n, n->isElementNode() ? ((ElementImpl *)n)->tagName().string().latin1() : n->isTextNode() ? "text" : "unknown", change );
+ //tqDebug(" (%p) calling recalcStyle on child %p/%s, change=%d", this, n, n->isElementNode() ? ((ElementImpl *)n)->tagName().string().latin1() : n->isTextNode() ? "text" : "unknown", change );
n->recalcStyle( change );
}
}
diff --git a/khtml/xml/dom_textimpl.cpp b/khtml/xml/dom_textimpl.cpp
index 015135428..86317293d 100644
--- a/khtml/xml/dom_textimpl.cpp
+++ b/khtml/xml/dom_textimpl.cpp
@@ -430,13 +430,13 @@ NodeImpl::Id TextImpl::id() const
void TextImpl::recalcStyle( StyleChange change )
{
-// qDebug("textImpl::recalcStyle");
+// tqDebug("textImpl::recalcStyle");
// Create renderer if now needed
if ( changed() && !m_render) {
createRendererIfNeeded();
}
if (change != NoChange && parentNode()) {
-// qDebug("DomText::recalcStyle");
+// tqDebug("DomText::recalcStyle");
if(m_render)
m_render->setStyle(parentNode()->renderer()->style());
}
diff --git a/khtml/xml/xml_tokenizer.h b/khtml/xml/xml_tokenizer.h
index 749c423ff..355c41b74 100644
--- a/khtml/xml/xml_tokenizer.h
+++ b/khtml/xml/xml_tokenizer.h
@@ -168,7 +168,7 @@ public:
virtual void write( const TokenizerString &str, bool );
virtual void end();
virtual void finish();
- virtual void setAutoClose(bool b=true) { qWarning("XMLTokenizer::setAutoClose: stub."); (void)b; }
+ virtual void setAutoClose(bool b=true) { tqWarning("XMLTokenizer::setAutoClose: stub."); (void)b; }
// from CachedObjectClient
void notifyFinished(khtml::CachedObject *finishedObj);