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, 20 insertions, 20 deletions

diff --git a/src/gui/general/LinedStaff.cpp b/src/gui/general/LinedStaff.cpp
index 5ca0c90..ffaa28c 100644
--- a/src/gui/general/LinedStaff.cpp
+++ b/src/gui/general/LinedStaff.cpp
@@ -443,8 +443,8 @@ LinedStaff::getBarExtents(double x, int y) const
 
     for (int i = 1; i < m_barLines.size(); ++i) {
 
-        double tqlayoutX = m_barLines[i]->getLayoutX();
-        int barRow = getRowForLayoutX(tqlayoutX);
+        double layoutX = m_barLines[i]->getLayoutX();
+        int barRow = getRowForLayoutX(layoutX);
 
         if (m_pageMode != LinearMode && (barRow < row))
             continue;
@@ -667,41 +667,41 @@ LinedStaff::deleteBars()
 }
 
 void
-LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
+LinedStaff::insertBar(double layoutX, double width, bool isCorrect,
                       const TimeSignature &timeSig,
                       int barNo, bool showBarNo)
 {
-    //    RG_DEBUG << "insertBar: " << tqlayoutX << ", " << width
+    //    RG_DEBUG << "insertBar: " << layoutX << ", " << width
     //			 << ", " << isCorrect << endl;
 
     int barThickness = m_lineThickness * 5 / 4;
 
     // hack to ensure the bar line appears on the correct row in
-    // notation page tqlayouts, with a conditional to prevent us from
+    // notation page layouts, with a conditional to prevent us from
     // moving the bar and beat lines in the matrix
     if (!showBeatLines()) {
         if (width > 0.01) { // not final bar in staff
-            tqlayoutX += 1;
+            layoutX += 1;
         } else {
-            tqlayoutX -= 1;
+            layoutX -= 1;
         }
     }
 
-    int row = getRowForLayoutX(tqlayoutX);
-    double x = getCanvasXForLayoutX(tqlayoutX);
+    int row = getRowForLayoutX(layoutX);
+    double x = getCanvasXForLayoutX(layoutX);
     int y = getCanvasYForTopLine(row);
 
     bool firstBarInRow = false, lastBarInRow = false;
 
     if (m_pageMode != LinearMode &&
-            (getRowForLayoutX(tqlayoutX) >
-             getRowForLayoutX(tqlayoutX - getMargin() - 2)))
+            (getRowForLayoutX(layoutX) >
+             getRowForLayoutX(layoutX - getMargin() - 2)))
         firstBarInRow = true;
 
     if (m_pageMode != LinearMode &&
             width > 0.01 &&  // width == 0 for final bar in staff
-            (getRowForLayoutX(tqlayoutX) <
-             getRowForLayoutX(tqlayoutX + width + getMargin() + 2)))
+            (getRowForLayoutX(layoutX) <
+             getRowForLayoutX(layoutX + width + getMargin() + 2)))
         lastBarInRow = true;
 
     BarStyle style = getBarStyle(barNo);
@@ -710,7 +710,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
         style = RepeatStartBar;
 
     if (firstBarInRow)
-        insertRepeatedClefAndKey(tqlayoutX, barNo);
+        insertRepeatedClefAndKey(layoutX, barNo);
 
     // If we're supposed to be hiding bar lines, we do just that --
     // create them as normal, then hide them.  We can't simply not
@@ -725,7 +725,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
         inset = getBarInset(barNo, firstBarInRow);
     }
 
-    BarLine *line = new BarLine(m_canvas, tqlayoutX,
+    BarLine *line = new BarLine(m_canvas, layoutX,
                                 getBarLineHeight(), barThickness, getLineSpacing(),
                                 (int)inset, style);
 
@@ -758,7 +758,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
         if (style == RepeatBothBar)
             style = RepeatEndBar;
 
-        BarLine *eline = new BarLine(m_canvas, tqlayoutX,
+        BarLine *eline = new BarLine(m_canvas, layoutX,
                                      getBarLineHeight(), barThickness, getLineSpacing(),
                                      0, style);
         eline->moveBy(xe, y);
@@ -834,7 +834,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
             rect->setZ( -1);
             rect->show(); // show beat lines even if the bar lines are hidden
 
-            LineRec beatLine(tqlayoutX + gridLine * dx, rect);
+            LineRec beatLine(layoutX + gridLine * dx, rect);
             m_beatLines.push_back(beatLine);
         }
     }
@@ -854,7 +854,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
         else
             rect->show();
 
-        LineRec connectingLine(tqlayoutX, rect);
+        LineRec connectingLine(layoutX, rect);
         m_barConnectingLines.push_back(connectingLine);
     }
 }
@@ -1148,9 +1148,9 @@ LinedStaff::setPointerPosition(HorizontalLayoutEngine &tqlayout,
 }
 
 void
-LinedStaff::setPointerPosition(double tqlayoutX)
+LinedStaff::setPointerPosition(double layoutX)
 {
-    LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(tqlayoutX, 0);
+    LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(layoutX, 0);
     setPointerPosition(coords.first, coords.second);
 }