1 files changed, 16 insertions, 16 deletions

diff --git a/src/gui/general/LinedStaff.cpp b/src/gui/general/LinedStaff.cpp
index ffaa28c..9156efe 100644
--- a/src/gui/general/LinedStaff.cpp
+++ b/src/gui/general/LinedStaff.cpp
@@ -572,7 +572,7 @@ LinedStaff::getCanvasXForLeftOfRow(int row) const
 }
 
 void
-LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
+LinedStaff::sizeStaff(HorizontalLayoutEngine &layout)
 {
     Profiler profiler("LinedStaff::sizeStaff", true);
 
@@ -582,19 +582,19 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
 
     //    RG_DEBUG << "LinedStaff::sizeStaff" << endl;
 
-    int lastBar = tqlayout.getLastVisibleBarOnStaff(*this);
+    int lastBar = layout.getLastVisibleBarOnStaff(*this);
 
     double xleft = 0, xright = 0;
     bool haveXLeft = false;
 
-    xright = tqlayout.getBarPosition(lastBar) - 1;
+    xright = layout.getBarPosition(lastBar) - 1;
 
     TimeSignature currentTimeSignature;
 
-    for (int barNo = tqlayout.getFirstVisibleBarOnStaff(*this);
+    for (int barNo = layout.getFirstVisibleBarOnStaff(*this);
             barNo <= lastBar; ++barNo) {
 
-        double x = tqlayout.getBarPosition(barNo);
+        double x = layout.getBarPosition(barNo);
 
         if (!haveXLeft) {
             xleft = x;
@@ -603,7 +603,7 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
 
         double timeSigX = 0;
         TimeSignature timeSig;
-        bool isNew = tqlayout.getTimeSignaturePosition(*this, barNo, timeSig, timeSigX);
+        bool isNew = layout.getTimeSignaturePosition(*this, barNo, timeSig, timeSigX);
 
         if (isNew && barNo < lastBar) {
             currentTimeSignature = timeSig;
@@ -619,8 +619,8 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
 
         insertBar(x,
                   ((barNo == lastBar) ? 0 :
-                   (tqlayout.getBarPosition(barNo + 1) - x)),
-                  tqlayout.isBarCorrectOnStaff(*this, barNo - 1),
+                   (layout.getBarPosition(barNo + 1) - x)),
+                  layout.isBarCorrectOnStaff(*this, barNo - 1),
                   currentTimeSignature,
                   barNo,
                   showBarNo);
@@ -745,7 +745,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect,
     else
         line->show();
 
-    // The bar lines have to be in order of tqlayout-x (there's no
+    // The bar lines have to be in order of layout-x (there's no
     // such interesting stipulation for beat or connecting lines)
     BarLineList::iterator insertPoint = lower_bound
                                         (m_barLines.begin(), m_barLines.end(), line, compareBars);
@@ -782,7 +782,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect,
         TQFont font;
         font.setPixelSize(m_resolution * 3 / 2);
         TQFontMetrics metrics(font);
-        TQString text = TQString("%1").tqarg(barNo + 1);
+        TQString text = TQString("%1").arg(barNo + 1);
 
         TQCanvasItem *barNoText = new TQCanvasText(text, font, m_canvas);
         barNoText->setX(x);
@@ -1110,10 +1110,10 @@ LinedStaff::getLayoutXOfInsertCursor() const
 }
 
 timeT
-LinedStaff::getInsertCursorTime(HorizontalLayoutEngine &tqlayout) const
+LinedStaff::getInsertCursorTime(HorizontalLayoutEngine &layout) const
 {
     if (m_insertCursorTimeValid) return m_insertCursorTime;
-    return tqlayout.getTimeForX(getLayoutXOfInsertCursor());
+    return layout.getTimeForX(getLayoutXOfInsertCursor());
 }
 
 void
@@ -1141,10 +1141,10 @@ LinedStaff::setPointerPosition(double canvasX, int canvasY)
 }
 
 void
-LinedStaff::setPointerPosition(HorizontalLayoutEngine &tqlayout,
+LinedStaff::setPointerPosition(HorizontalLayoutEngine &layout,
                                timeT time)
 {
-    setPointerPosition(tqlayout.getXForTime(time));
+    setPointerPosition(layout.getXForTime(time));
 }
 
 void
@@ -1176,10 +1176,10 @@ LinedStaff::setInsertCursorPosition(double canvasX, int canvasY)
 }
 
 void
-LinedStaff::setInsertCursorPosition(HorizontalLayoutEngine &tqlayout,
+LinedStaff::setInsertCursorPosition(HorizontalLayoutEngine &layout,
                                     timeT time)
 {
-    double x = tqlayout.getXForTime(time);
+    double x = layout.getXForTime(time);
     LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(x, 0);
     setInsertCursorPosition(coords.first, coords.second);
     m_insertCursorTime = time;