summaryrefslogtreecommitdiffstats
path: root/src/kernel/qtextengine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/qtextengine.cpp')
-rw-r--r--src/kernel/qtextengine.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp
index 421a709..5f00fb7 100644
--- a/src/kernel/qtextengine.cpp
+++ b/src/kernel/qtextengine.cpp
@@ -157,7 +157,7 @@ static void qAppendItems(QTextEngine *engine, int &start, int &stop, BidiControl
if ( start > stop ) {
// #### the algorithm is currently not really safe against this. Still needs fixing.
-// tqWarning( "Bidi: appendItems() internal error" );
+// qWarning( "Bidi: appendItems() internal error" );
return;
}
@@ -177,7 +177,7 @@ static void qAppendItems(QTextEngine *engine, int &start, int &stop, BidiControl
}
#if (BIDI_DEBUG >= 1)
- tqDebug("new run: dir=%s from %d, to %d level = %d\n", directions[dir], start, stop, level);
+ qDebug("new run: dir=%s from %d, to %d level = %d\n", directions[dir], start, stop, level);
#endif
QFont::Script script = QFont::NoScript;
QScriptItem item;
@@ -279,8 +279,8 @@ static void bidiItemize( QTextEngine *engine, bool rightToLeft, int mode )
status.last = status.lastStrong;
status.dir = sdir;
#if (BIDI_DEBUG >= 2)
- tqDebug("---- bidiReorder --- '%s'", engine->string.utf8().data());
- tqDebug("rightToLeft = %d", rightToLeft);
+ qDebug("---- bidiReorder --- '%s'", engine->string.utf8().data());
+ qDebug("rightToLeft = %d", rightToLeft);
#endif
@@ -861,7 +861,7 @@ static void calcLineBreaks(const QString &str, QCharAttributes *charAttributes)
softBreak = (cls == QUnicodeTables::LineBreak_SP);
else
softBreak = (brk == Dbk);
-// tqDebug("char = %c %04x, cls=%d, ncls=%d, brk=%d soft=%d", uc[i].cell(), uc[i].unicode(), cls, ncls, brk, charAttributes[i].softBreak);
+// qDebug("char = %c %04x, cls=%d, ncls=%d, brk=%d soft=%d", uc[i].cell(), uc[i].unicode(), cls, ncls, brk, charAttributes[i].softBreak);
charAttributes[i].softBreak = softBreak;
charAttributes[i].whiteSpace = FALSE;
charAttributes[i].charStop = TRUE;
@@ -1044,7 +1044,7 @@ void QTextEngine::splitItem( int item, int pos )
oldItem.width = w;
}
-// tqDebug("split at position %d itempos=%d", pos, item );
+// qDebug("split at position %d itempos=%d", pos, item );
}
@@ -1052,12 +1052,12 @@ int QTextEngine::width( int from, int len ) const
{
int w = 0;
-// tqDebug("QTextEngine::width( from = %d, len = %d ), numItems=%d, strleng=%d", from, len, items.size(), string.length() );
+// qDebug("QTextEngine::width( from = %d, len = %d ), numItems=%d, strleng=%d", from, len, items.size(), string.length() );
for ( int i = 0; i < items.size(); i++ ) {
QScriptItem *si = &items[i];
int pos = si->position;
int ilen = length( i );
-// tqDebug("item %d: from %d len %d", i, pos, ilen );
+// qDebug("item %d: from %d len %d", i, pos, ilen );
if ( pos >= from + len )
break;
if ( pos + ilen > from ) {
@@ -1089,13 +1089,13 @@ int QTextEngine::width( int from, int len ) const
charEnd++;
glyphEnd = (charEnd == ilen) ? si->num_glyphs : logClusters[charEnd];
-// tqDebug("char: start=%d end=%d / glyph: start = %d, end = %d", charFrom, charEnd, glyphStart, glyphEnd );
+// qDebug("char: start=%d end=%d / glyph: start = %d, end = %d", charFrom, charEnd, glyphStart, glyphEnd );
for ( int i = glyphStart; i < glyphEnd; i++ )
w += advances[i];
}
}
}
-// tqDebug(" --> w= %d ", w );
+// qDebug(" --> w= %d ", w );
return w;
}