rename the following methods:

tqparent parent
tqmask mask

1 files changed, 36 insertions, 36 deletions

diff --git a/tqtinterface/qt4/src/kernel/tqscriptengine.cpp b/tqtinterface/qt4/src/kernel/tqscriptengine.cpp
index 0bb29fc..2156fe8 100644
--- a/tqtinterface/qt4/src/kernel/tqscriptengine.cpp
+++ b/tqtinterface/qt4/src/kernel/tqscriptengine.cpp
@@ -564,8 +564,8 @@ enum ArabicGroup {
     // NonJoining
     ArabicNone,
     ArabicSpace,
-    // Transtqparent
-    Transtqparent,
+    // Transparent
+    Transparent,
     // Causing
     Center,
     Kashida,
@@ -641,8 +641,8 @@ static const unsigned char arabic_group[0x150] = {
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
 
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, ArabicNone, ArabicNone,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
 
@@ -659,12 +659,12 @@ static const unsigned char arabic_group[0x150] = {
     // 0x640
     Kashida, Feh, Qaf, Kaf,
     Lam, Meem, Noon, Heh,
-    Waw, Yeh, Yeh, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
+    Waw, Yeh, Yeh, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
 
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, ArabicNone, ArabicNone, ArabicNone,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
 
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
@@ -672,7 +672,7 @@ static const unsigned char arabic_group[0x150] = {
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, Beh, Qaf,
 
-    Transtqparent, Alef, Alef, Alef,
+    Transparent, Alef, Alef, Alef,
     ArabicNone, Alef, Waw, Waw,
     Yeh, Beh, Beh, Beh,
     Beh, Beh, Beh, Beh,
@@ -705,14 +705,14 @@ static const unsigned char arabic_group[0x150] = {
     Yeh, YehWithTail, Yeh, Waw,
 
     Yeh, Yeh, YehBarre, YehBarre,
-    ArabicNone, TehMarbuta, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, ArabicNone, ArabicNone, Transtqparent,
+    ArabicNone, TehMarbuta, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, ArabicNone, ArabicNone, Transparent,
 
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, ArabicNone, ArabicNone, Transtqparent,
-    Transtqparent, ArabicNone, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Dal, Reh,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, ArabicNone, ArabicNone, Transparent,
+    Transparent, ArabicNone, Transparent, Transparent,
+    Transparent, Transparent, Dal, Reh,
 
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
@@ -725,7 +725,7 @@ static const unsigned char arabic_group[0x150] = {
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
     ArabicNone, ArabicNone, ArabicNone, ArabicNone,
 
-    Alaph, Transtqparent, Beth, Gamal,
+    Alaph, Transparent, Beth, Gamal,
     Gamal, Dalath, Dalath, He,
     SyriacWaw, Zain, Heth, Teth,
     Teth, Yudh, YudhHe, Kaph,
@@ -735,14 +735,14 @@ static const unsigned char arabic_group[0x150] = {
     Sadhe, Qaph, Dalath, Shin,
     Taw, Beth, Gamal, Dalath,
 
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
 
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, Transtqparent,
-    Transtqparent, Transtqparent, Transtqparent, ArabicNone,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, Transparent,
+    Transparent, Transparent, Transparent, ArabicNone,
     ArabicNone, Zain, Kaph, Fe,
 };
 
@@ -763,15 +763,15 @@ static inline ArabicGroup arabicGroup(unsigned short uc)
    Arabic shaping obeys a number of rules according to the joining classes (see Unicode book, section on
    arabic).
 
-   Each tqunicode char has a joining class (right, dual (left&right), center (joincausing) or transtqparent).
-   transtqparent joining is not encoded in TQChar::joining(), but applies to all combining marks and format marks.
+   Each tqunicode char has a joining class (right, dual (left&right), center (joincausing) or transparent).
+   transparent joining is not encoded in TQChar::joining(), but applies to all combining marks and format marks.
 
    Right join-causing: dual + center
    Left join-causing: dual + right + center
 
    Rules are as follows (for a string already in visual order, as we have it here):
 
-   R1 Transtqparent characters do not affect joining behaviour.
+   R1 Transparent characters do not affect joining behaviour.
    R2 A right joining character, that has a right join-causing char on the right will get form XRight
    (R3 A left joining character, that has a left join-causing char on the left will get form XLeft)
    Note: the above rule is meaningless, as there are no pure left joining characters defined in Unicode
@@ -785,7 +785,7 @@ static inline ArabicGroup arabicGroup(unsigned short uc)
 
    Additionally we have to do the minimal ligature support for lam-alef ligatures:
 
-   L1 Transtqparent characters do not affect ligature behaviour.
+   L1 Transparent characters do not affect ligature behaviour.
    L2 Any sequence of Alef(XRight) + Lam(XMedial) will form the ligature Alef.Lam(XLeft)
    L3 Any sequence of Alef(XRight) + Lam(XLeft) will form the ligature Alef.Lam(XIsolated)
 
@@ -807,7 +807,7 @@ enum Joining {
     JCausing,
     JDual,
     JRight,
-    JTranstqparent
+    JTransparent
 };
 
 
@@ -815,8 +815,8 @@ static const Joining joining_for_group[ArabicGroupsEnd] = {
     // NonJoining
     JNone, // ArabicNone
     JNone, // ArabicSpace
-    // Transtqparent
-    JTranstqparent, // Transtqparent
+    // Transparent
+    JTransparent, // Transparent
     // Causing
     JCausing, // Center
     JCausing, // Kashida
@@ -919,7 +919,7 @@ static void getArabicProperties(const unsigned short *chars, int len, TQArabicPr
         group = arabicGroup(chars[i]);
         j = joining_for_group[group];
 
-        if (j == JTranstqparent) {
+        if (j == JTransparent) {
             properties[i].tqshape = XIsolated;
             continue;
         }
@@ -959,8 +959,8 @@ static void getArabicProperties(const unsigned short *chars, int len, TQArabicPr
 
         switch(group) {
         case ArabicNone:
-        case Transtqparent:
-        // ### Center should probably be treated as transtqparent when it comes to justification.
+        case Transparent:
+        // ### Center should probably be treated as transparent when it comes to justification.
         case Center:
             break;
         case ArabicSpace:
@@ -1351,7 +1351,7 @@ static inline const TQChar nextChar(const TQString *str, int pos)
         //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining());
         if(::category(*ch) != TQChar::Mark_NonSpacing)
             return *ch;
-        // assume it's a transtqparent char, this might not be 100% correct
+        // assume it's a transparent char, this might not be 100% correct
         pos++;
         ch++;
     }