Undo prior accidental commit

1 files changed, 17 insertions, 17 deletions

diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp
index 4bee84a..66aa07b 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/qscriptengine.cpp
@@ -120,7 +120,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom,  int glast)
 {
     int nmarks = glast - gfrom;
     if (nmarks <= 0) {
-        tqWarning("positionCluster: no marks to position!");
+        qWarning("positionCluster: no marks to position!");
         return;
     }
 
@@ -134,12 +134,12 @@ static inline void positionCluster(QShaperItem *item, int gfrom,  int glast)
 
     QRect baseRect(baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height);
 
-//      tqDebug("---> positionCluster: cluster from %d to %d", gfrom, glast);
-//     tqDebug("baseInfo: %f/%f (%f/%f) off=%f/%f", baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height, baseInfo.xoff, baseInfo.yoff);
+//      qDebug("---> positionCluster: cluster from %d to %d", gfrom, glast);
+//     qDebug("baseInfo: %f/%f (%f/%f) off=%f/%f", baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height, baseInfo.xoff, baseInfo.yoff);
 
     int size = (f->ascent()/10);
     int offsetBase = (size - 4) / 4 + QMIN(size, 4) + 1;
-//     tqDebug("offset = %f", offsetBase);
+//     qDebug("offset = %f", offsetBase);
 
     bool rightToLeft = item->flags & QTextEngine::RightToLeft;
 
@@ -152,7 +152,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom,  int glast)
         QPoint p;
         glyph_metrics_t markInfo = f->boundingBox(mark);
         QRect markRect(markInfo.x, markInfo.y, markInfo.width, markInfo.height);
-//          tqDebug("markInfo: %f/%f (%f/%f) off=%f/%f", markInfo.x, markInfo.y, markInfo.width, markInfo.height, markInfo.xoff, markInfo.yoff);
+//          qDebug("markInfo: %f/%f (%f/%f) off=%f/%f", markInfo.x, markInfo.y, markInfo.width, markInfo.height, markInfo.xoff, markInfo.yoff);
 
         int offset = offsetBase;
         unsigned char cmb = item->attributes[gfrom+i].combiningClass;
@@ -192,7 +192,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom,  int glast)
 
         // combining marks of different class don't interact. Reset the rectangle.
         if (cmb != lastCmb) {
-            //tqDebug("resetting rect");
+            //qDebug("resetting rect");
             attachmentRect = baseRect;
         }
 
@@ -246,7 +246,7 @@ static inline void positionCluster(QShaperItem *item, int gfrom,  int glast)
             default:
                 break;
         }
-//         tqDebug("char=%x combiningClass = %d offset=%d/%d", mark, cmb, p.x(), p.y());
+//         qDebug("char=%x combiningClass = %d offset=%d/%d", mark, cmb, p.x(), p.y());
         markRect.moveBy(p.x(), p.y());
         attachmentRect |= markRect;
         lastCmb = cmb;
@@ -287,7 +287,7 @@ static void heuristicSetGlyphAttributes(QShaperItem *item, const QChar *uc, int
     // justification is missing here!!!!!
 
     if ( item->num_glyphs != length )
-       tqWarning("QScriptEngine::heuristicSetGlyphAttributes: char length and num glyphs disagree" );
+       qWarning("QScriptEngine::heuristicSetGlyphAttributes: char length and num glyphs disagree" );
 
     unsigned short *logClusters = item->log_clusters;
 
@@ -899,7 +899,7 @@ struct QArabicProperties {
 
 static void getArabicProperties(const unsigned short *chars, int len, QArabicProperties *properties)
 {
-//     tqDebug("arabicSyriacOpenTypeShape: properties:");
+//     qDebug("arabicSyriacOpenTypeShape: properties:");
     int lastPos = 0;
     int lastGroup = ArabicNone;
 
@@ -1005,7 +1005,7 @@ static void getArabicProperties(const unsigned short *chars, int len, QArabicPro
 
 
 //     for (int i = 0; i < len; ++i)
-//         tqDebug("arabic properties(%d): uc=%x shape=%d, justification=%d", i, chars[i], properties[i].shape, properties[i].justification);
+//         qDebug("arabic properties(%d): uc=%x shape=%d, justification=%d", i, chars[i], properties[i].shape, properties[i].justification);
 }
 
 
@@ -1326,7 +1326,7 @@ static inline int getShape(uchar cell, int shape)
 */
 static inline const QChar prevChar(const QString *str, int pos)
 {
-    //tqDebug("leftChar: pos=%d", pos);
+    //qDebug("leftChar: pos=%d", pos);
     pos--;
     const QChar *ch = str->unicode() + pos;
     while(pos > -1) {
@@ -1344,7 +1344,7 @@ static inline const QChar nextChar(const QString *str, int pos)
     int len = str->length();
     const QChar *ch = str->unicode() + pos;
     while(pos < len) {
-        //tqDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining());
+        //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining());
         if(::category(*ch) != QChar::Mark_NonSpacing)
             return *ch;
         // assume it's a transparent char, this might not be 100% correct
@@ -1402,7 +1402,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe
             uchar c = ch->cell();
             int pos = i + from;
             int shape = properties[i].shape;
-//            tqDebug("mapping U+%x to shape %d glyph=0x%x", ch->unicode(), shape, getShape(c, shape));
+//            qDebug("mapping U+%x to shape %d glyph=0x%x", ch->unicode(), shape, getShape(c, shape));
             // take care of lam-alef ligatures (lam right of alef)
             ushort map;
             switch (c) {
@@ -1414,7 +1414,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe
                             case 0x23:
                             case 0x25:
                             case 0x27:
-//                                 tqDebug(" lam of lam-alef ligature");
+//                                 qDebug(" lam of lam-alef ligature");
                                 map = arabicUnicodeLamAlefMapping[pch.cell() - 0x22][shape];
                                 goto next;
                             default:
@@ -1429,7 +1429,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe
                 case 0x27: // alef
                     if (prevChar(uc, pos).unicode() == 0x0644) {
                         // have a lam alef ligature
-                        //tqDebug(" alef of lam-alef ligature");
+                        //qDebug(" alef of lam-alef ligature");
                         goto skip;
                     }
                 default:
@@ -1443,7 +1443,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe
         //attributes[gpos].zeroWidth = zeroWidth;
         if (::category(*ch) == QChar::Mark_NonSpacing) {
             attributes[gpos].mark = TRUE;
-//             tqDebug("glyph %d (char %d) is mark!", gpos, i);
+//             qDebug("glyph %d (char %d) is mark!", gpos, i);
         } else {
             attributes[gpos].mark = FALSE;
             clusterStart = data - shapeBuffer;
@@ -1451,7 +1451,7 @@ static void shapedString(const QString *uc, int from, int len, QChar *shapeBuffe
         attributes[gpos].clusterStart = !attributes[gpos].mark;
         attributes[gpos].combiningClass = combiningClass(*ch);
         attributes[gpos].justification = properties[i].justification;
-//         tqDebug("data[%d] = %x (from %x)", gpos, (uint)data->unicode(), ch->unicode());
+//         qDebug("data[%d] = %x (from %x)", gpos, (uint)data->unicode(), ch->unicode());
         data++;
     skip:
         ch++;