Undo prior accidental commit

1 files changed, 15 insertions, 15 deletions

diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp
index 842c390..7d2b77d 100644
--- a/src/kernel/qscriptengine_x11.cpp
+++ b/src/kernel/qscriptengine_x11.cpp
@@ -1124,7 +1124,7 @@ static const unsigned short split_matras[]  = {
 static inline void splitMatra(unsigned short *reordered, int matra, int &len, int &base)
 {
     unsigned short matra_uc = reordered[matra];
-    //tqDebug("matra=%d, reordered[matra]=%x", matra, reordered[matra]);
+    //qDebug("matra=%d, reordered[matra]=%x", matra, reordered[matra]);
 
     const unsigned short *split = split_matras;
     while (split[0] < matra_uc)
@@ -1189,9 +1189,9 @@ static const QOpenType::Features indic_features[] = {
 
 // #define INDIC_DEBUG
 #ifdef INDIC_DEBUG
-#define IDEBUG tqDebug
+#define IDEBUG qDebug
 #else
-#define IDEBUG if(0) tqDebug
+#define IDEBUG if(0) qDebug
 #endif
 
 #ifdef INDIC_DEBUG
@@ -1665,7 +1665,7 @@ static bool indic_shape_syllable(QOpenType *openType, QShaperItem *item, bool in
         {
             IDEBUG("OT properties:");
             for (int i = 0; i < len; ++i)
-                tqDebug("    i: %s", ::propertiesToString(properties[i]).toLatin1().data());
+                qDebug("    i: %s", ::propertiesToString(properties[i]).toLatin1().data());
         }
 #endif
 
@@ -1678,14 +1678,14 @@ static bool indic_shape_syllable(QOpenType *openType, QShaperItem *item, bool in
 
         // move the left matra back to it's correct position in malayalam and tamil
         if ((script == QFont::Malayalam || script == QFont::Tamil) && (form(reordered[0]) == Matra)) {
-//             tqDebug("reordering matra, len=%d", newLen);
+//             qDebug("reordering matra, len=%d", newLen);
             // need to find the base in the shaped string and move the matra there
             int basePos = 0;
             while (basePos < newLen && (int)otl_glyphs[basePos].cluster <= base)
                 basePos++;
             --basePos;
             if (basePos < newLen && basePos > 1) {
-//                 tqDebug("moving prebase matra to position %d in syllable newlen=%d", basePos, newLen);
+//                 qDebug("moving prebase matra to position %d in syllable newlen=%d", basePos, newLen);
                 OTL_GlyphItemRec m = otl_glyphs[0];
                 --basePos;
                 for (i = 0; i < basePos; ++i)
@@ -2092,7 +2092,7 @@ static int tibetan_nextSyllableBoundary(const QString &s, int start, int end, bo
     int pos = 0;
     TibetanForm state = tibetan_form(*uc);
 
-//     tqDebug("state[%d]=%d (uc=%4x)", pos, state, uc[pos].unicode());
+//     qDebug("state[%d]=%d (uc=%4x)", pos, state, uc[pos].unicode());
     pos++;
 
     if (state != TibetanHeadConsonant) {
@@ -2473,9 +2473,9 @@ static const signed char khmerStateTable[][CC_COUNT] =
 
 //  #define KHMER_DEBUG
 #ifdef KHMER_DEBUG
-#define KHDEBUG tqDebug
+#define KHDEBUG qDebug
 #else
-#define KHDEBUG if(0) tqDebug
+#define KHDEBUG if(0) qDebug
 #endif
 
 //  Given an input string of characters and a location in which to start looking
@@ -2551,9 +2551,9 @@ static bool khmer_shape_syllable(QOpenType *openType, QShaperItem *item)
     memset(properties, 0, 16*sizeof(unsigned char));
 
 #ifdef KHMER_DEBUG
-    tqDebug("original:");
+    qDebug("original:");
     for (int i = from; i < syllableEnd; i++) {
-        tqDebug("    %d: %4x", i, string[i].unicode());
+        qDebug("    %d: %4x", i, string[i].unicode());
     }
 #endif
 
@@ -3001,9 +3001,9 @@ static const signed char mymrStateTable[][Mymr_CC_COUNT] =
 
 // #define MYANMAR_DEBUG
 #ifdef MYANMAR_DEBUG
-#define MMDEBUG tqDebug
+#define MMDEBUG qDebug
 #else
-#define MMDEBUG if(0) tqDebug
+#define MMDEBUG if(0) qDebug
 #endif
 
 //  Given an input string of characters and a location in which to start looking
@@ -3082,9 +3082,9 @@ static bool myanmar_shape_syllable(QOpenType *openType, QShaperItem *item, bool
 
     const QChar *uc = item->string->unicode() + item->from;
 #ifdef MYANMAR_DEBUG
-    tqDebug("original:");
+    qDebug("original:");
     for (int i = 0; i < item->length; i++) {
-        tqDebug("    %d: %4x", i, uc[i].unicode());
+        qDebug("    %d: %4x", i, uc[i].unicode());
     }
 #endif
     int vowel_e = -1;