Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 19 insertions, 19 deletions

diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index 20b7469..e00928c 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -324,7 +324,7 @@ NotationHLayout::scanStaff(Staff &staff, timeT startTime, timeT endTime)
 
         setBarBasicData(staff, barNo, from, barCorrect, timeSignature, newTimeSig);
         BarDataList::iterator bdli(barList.find(barNo));
-        bdli->second.tqlayoutData.needsLayout = true;
+        bdli->second.layoutData.needsLayout = true;
 
         ChunkList &chunks = bdli->second.chunks;
         chunks.clear();
@@ -655,10 +655,10 @@ NotationHLayout::scanChord(NotationElementList *notes,
         extraWidth += e;
     }
 
-    float tqlayoutExtra = 0;
+    float layoutExtra = 0;
     if (chord.hasNoteHeadShifted()) {
         if (chord.hasStemUp()) {
-            tqlayoutExtra += npf->getNoteBodyWidth();
+            layoutExtra += npf->getNoteBodyWidth();
         } else {
             extraWidth = std::max(extraWidth, float(npf->getNoteBodyWidth()));
         }
@@ -686,13 +686,13 @@ NotationHLayout::scanChord(NotationElementList *notes,
 
     if (grace) {
         chunks.push_back(Chunk(d, chord.getSubOrdering(),
-                               extraWidth + tqlayoutExtra
+                               extraWidth + layoutExtra
                                + getLayoutWidth(**myLongest, npf, key)
                                - npf->getNoteBodyWidth(), // tighten up
                                0));
     } else {
         chunks.push_back(Chunk(d, 0, extraWidth,
-                               std::max(tqlayoutExtra +
+                               std::max(layoutExtra +
                                         getLayoutWidth(**myLongest, npf, key),
                                         lyricWidth)));
         lyricWidth = 0;
@@ -847,7 +847,7 @@ NotationHLayout::preSquishBar(int barNo)
             bdli->second.sizeData.reconciledWidth =
                 bdli->second.sizeData.idealWidth;
 
-            bdli->second.tqlayoutData.needsLayout = true;
+            bdli->second.layoutData.needsLayout = true;
         }
     }
 }
@@ -987,7 +987,7 @@ NotationHLayout::reconcileBarsLinear()
                 double diff = maxWidth - bd.reconciledWidth;
                 if (diff < -0.1 || diff > 0.1) {
                     NOTATION_DEBUG << "(So needsLayout becomes true)" << endl;
-                    bdli->second.tqlayoutData.needsLayout = true;
+                    bdli->second.layoutData.needsLayout = true;
                 }
                 bd.reconciledWidth = maxWidth;
             }
@@ -1181,7 +1181,7 @@ NotationHLayout::reconcileBarsPage()
                     BarData::SizeData &bd(bdli->second.sizeData);
                     double diff = maxWidth - bd.reconciledWidth;
                     if (diff < -0.1 || diff > 0.1) {
-                        bdli->second.tqlayoutData.needsLayout = true;
+                        bdli->second.layoutData.needsLayout = true;
                     }
                     bd.reconciledWidth = maxWidth;
                 }
@@ -1247,7 +1247,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
 
     bool isFullLayout = (startTime == endTime);
 
-    // these two are for partial tqlayouts:
+    // these two are for partial layouts:
     //    bool haveSimpleOffset = false;
     //    double simpleOffset = 0;
 
@@ -1303,9 +1303,9 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
             NOTATION_DEBUG << "Start is to" << endl;
         }
 
-        if (!bdi->second.tqlayoutData.needsLayout) {
+        if (!bdi->second.layoutData.needsLayout) {
 
-            double offset = barX - bdi->second.tqlayoutData.x;
+            double offset = barX - bdi->second.layoutData.x;
 
             NOTATION_DEBUG << "NotationHLayout::tqlayout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
 
@@ -1314,10 +1314,10 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
                 continue;
             }
 
-            bdi->second.tqlayoutData.x += offset;
+            bdi->second.layoutData.x += offset;
 
             if (bdi->second.basicData.newTimeSig)  
-                bdi->second.tqlayoutData.timeSigX += (int)offset;
+                bdi->second.layoutData.timeSigX += (int)offset;
 
             for (NotationElementList::iterator it = from;
                     it != to && it != notes->end(); ++it) {
@@ -1333,7 +1333,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
             continue;
         }
 
-        bdi->second.tqlayoutData.x = barX;
+        bdi->second.layoutData.x = barX;
         //	x = barX + getPostBarMargin();
 
         bool timeSigToPlace = false;
@@ -1446,9 +1446,9 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
                 }
 
 //                NOTATION_DEBUG << "Placing timesig at " << (x - fixed) << endl;
-//                bdi->second.tqlayoutData.timeSigX = (int)(x - fixed);
+//                bdi->second.layoutData.timeSigX = (int)(x - fixed);
                 NOTATION_DEBUG << "Placing timesig at " << sigx << " (would previously have been " << int(x-fixed) << "?)" << endl;
-                bdi->second.tqlayoutData.timeSigX = (int)sigx;
+                bdi->second.layoutData.timeSigX = (int)sigx;
                 double shift = getFixedItemSpacing() +
                                m_npf->getTimeSigWidth(timeSignature);
                 offset += shift;
@@ -1571,7 +1571,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
             // no other events in this bar, so we never managed to place it
             x = barX + offset;
             NOTATION_DEBUG << "Placing timesig reluctantly at " << x << endl;
-            bdi->second.tqlayoutData.timeSigX = (int)(x);
+            bdi->second.layoutData.timeSigX = (int)(x);
             timeSigToPlace = false;
         }
 
@@ -1583,7 +1583,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
         }
         m_groupsExtant.clear();
 
-        bdi->second.tqlayoutData.needsLayout = false;
+        bdi->second.layoutData.needsLayout = false;
     }
 }
 
@@ -2024,7 +2024,7 @@ bool NotationHLayout::getTimeSignaturePosition(Staff &staff,
     BarDataList::iterator bdli(bdl.find(i));
     if (bdli != bdl.end()) {
         timeSig = bdli->second.basicData.timeSignature;
-        timeSigX = (double)(bdli->second.tqlayoutData.timeSigX);
+        timeSigX = (double)(bdli->second.layoutData.timeSigX);
         return bdli->second.basicData.newTimeSig;
     } else
         return 0;