Rename obsolete tq methods to standard names

5 files changed, 49 insertions, 49 deletions

diff --git a/src/gui/editors/matrix/MatrixHLayout.cpp b/src/gui/editors/matrix/MatrixHLayout.cpp
index f4615fa..99b89c2 100644
--- a/src/gui/editors/matrix/MatrixHLayout.cpp
+++ b/src/gui/editors/matrix/MatrixHLayout.cpp
@@ -61,7 +61,7 @@ void MatrixHLayout::scanStaff(Staff &staffBase,
 {
     Profiler profiler("MatrixHLayout::scanStaff", true);
 
-    // The Matrix tqlayout is not currently designed to be able to lay
+    // The Matrix layout is not currently designed to be able to lay
     // out more than one staff, because we have no requirement to show
     // more than one at once in the Matrix view.  To make it work for
     // multiple staffs should be straightforward; we just need to bear
@@ -88,7 +88,7 @@ void MatrixHLayout::scanStaff(Staff &staffBase,
     }
 
     // Do this in two parts: bar lines separately from elements.
-    // (We don't need to do all that stuff notationhtqlayout has to do,
+    // (We don't need to do all that stuff notationhlayout has to do,
     // scanning the notes bar-by-bar; we can just place the bar lines
     // in the theoretically-correct places and do the same with the
     // notes quite independently.)
diff --git a/src/gui/editors/matrix/MatrixHLayout.h b/src/gui/editors/matrix/MatrixHLayout.h
index 291d618..76f1b31 100644
--- a/src/gui/editors/matrix/MatrixHLayout.h
+++ b/src/gui/editors/matrix/MatrixHLayout.h
@@ -62,7 +62,7 @@ public:
                             timeT = 0);
 
     /**
-     * Returns the total length of all elements once tqlayout is done.
+     * Returns the total length of all elements once layout is done.
      * This is the x-coord of the end of the last element on the
      * longest staff
      */
@@ -84,9 +84,9 @@ public:
     virtual double getBarPosition(int barNo) const;
 
     /**
-     * Precomputes tqlayout data for a single staff, updating any
+     * Precomputes layout data for a single staff, updating any
      * internal data stores associated with that staff and updating
-     * any tqlayout-related properties in the events on the staff's
+     * any layout-related properties in the events on the staff's
      * segment.
      */
     virtual void scanStaff(Staff&,
@@ -94,10 +94,10 @@ public:
                            timeT = 0);
 
     /**
-     * Computes any tqlayout data that may depend on the results of
+     * Computes any layout data that may depend on the results of
      * scanning more than one staff.  This may mean doing most of
-     * the tqlayout (likely for horizontal tqlayout) or nothing at all
-     * (likely for vertical tqlayout).
+     * the layout (likely for horizontal layout) or nothing at all
+     * (likely for vertical layout).
      */
     virtual void finishLayout(timeT = 0,
                               timeT = 0);
@@ -118,7 +118,7 @@ protected:
 
     // pair of has-time-sig and time-sig
     typedef std::pair<bool, TimeSignature> TimeSigData;
-    // pair of tqlayout-x and time-signature if there is one
+    // pair of layout-x and time-signature if there is one
     typedef std::pair<double, TimeSigData> BarData;
     typedef FastVector<BarData> BarDataList;
     BarDataList m_barData;
@@ -133,7 +133,7 @@ protected:
  */
 class ZoomableMatrixHLayoutRulerScale : public RulerScale, public HZoomable {
 public:
-    ZoomableMatrixHLayoutRulerScale(MatrixHLayout& tqlayout) : RulerScale(tqlayout.getComposition()), m_referenceHLayout(tqlayout) {};
+    ZoomableMatrixHLayoutRulerScale(MatrixHLayout& layout) : RulerScale(layout.getComposition()), m_referenceHLayout(layout) {};
     
     virtual double getBarPosition(int n)   const { return m_referenceHLayout.getBarPosition(n) * getHScaleFactor(); }
     virtual double getXForTime(timeT time) const { return m_referenceHLayout.getXForTime(time) * getHScaleFactor(); }
diff --git a/src/gui/editors/matrix/MatrixVLayout.h b/src/gui/editors/matrix/MatrixVLayout.h
index 538e598..a33e0d1 100644
--- a/src/gui/editors/matrix/MatrixVLayout.h
+++ b/src/gui/editors/matrix/MatrixVLayout.h
@@ -58,9 +58,9 @@ public:
                             timeT = 0);
 
     /**
-     * Precomputes tqlayout data for a single staff, updating any
+     * Precomputes layout data for a single staff, updating any
      * internal data stores associated with that staff and updating
-     * any tqlayout-related properties in the events on the staff's
+     * any layout-related properties in the events on the staff's
      * segment.
      */
     virtual void scanStaff(Staff &staff,
@@ -68,10 +68,10 @@ public:
                            timeT = 0);
 
     /**
-     * Computes any tqlayout data that may depend on the results of
+     * Computes any layout data that may depend on the results of
      * scanning more than one staff.  This may mean doing most of
-     * the tqlayout (likely for horizontal tqlayout) or nothing at all
-     * (likely for vertical tqlayout).
+     * the layout (likely for horizontal layout) or nothing at all
+     * (likely for vertical layout).
      */
     virtual void finishLayout(timeT = 0,
                               timeT = 0);
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 9b056d0..a63ca0a 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -140,10 +140,10 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
                        TQWidget *parent,
                        bool drumMode)
         : EditView(doc, segments, 3, parent, "matrixview"),
-        m_htqlayout(&doc->getComposition()),
-        m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_htqlayout)),
-        m_vtqlayout(),
-        m_snapGrid(new SnapGrid(&m_htqlayout)),
+        m_hlayout(&doc->getComposition()),
+        m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_hlayout)),
+        m_vlayout(),
+        m_snapGrid(new SnapGrid(&m_hlayout)),
         m_lastEndMarkerTime(0),
         m_hoveredOverAbsoluteTime(0),
         m_hoveredOverNoteName(0),
@@ -430,11 +430,11 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
     (doc, TQT_SIGNAL(pointerPositionChanged(timeT)),
      TQT_TQOBJECT(this), TQT_SLOT(slotSetPointerPosition(timeT)));
 
-    MATRIX_DEBUG << "MatrixView : applying tqlayout\n";
+    MATRIX_DEBUG << "MatrixView : applying layout\n";
 
     bool layoutApplied = applyLayout();
     if (!layoutApplied)
-        KMessageBox::sorry(0, i18n("Couldn't apply piano roll tqlayout"));
+        KMessageBox::sorry(0, i18n("Couldn't apply piano roll layout"));
     else {
         MATRIX_DEBUG << "MatrixView : rendering elements\n";
         for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@@ -446,13 +446,13 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
     }
 
     StandardRuler *topStandardRuler = new StandardRuler(getDocument(),
-                                &m_htqlayout, int(xorigin), 25,
+                                &m_hlayout, int(xorigin), 25,
                                 false, getCentralWidget());
     topStandardRuler->setSnapGrid(m_snapGrid);
     setTopStandardRuler(topStandardRuler);
 
     StandardRuler *bottomStandardRuler = new StandardRuler(getDocument(),
-                                   &m_htqlayout, 0, 25,
+                                   &m_hlayout, 0, 25,
                                    true, getBottomWidget());
     bottomStandardRuler->setSnapGrid(m_snapGrid);
     setBottomStandardRuler(bottomStandardRuler);
@@ -1032,20 +1032,20 @@ bool MatrixView::applyLayout(int staffNo,
 {
     Profiler profiler("MatrixView::applyLayout", true);
 
-    m_htqlayout.reset();
-    m_vtqlayout.reset();
+    m_hlayout.reset();
+    m_vlayout.reset();
 
     for (unsigned int i = 0; i < m_staffs.size(); ++i) {
 
         if (staffNo >= 0 && (int)i != staffNo)
             continue;
 
-        m_htqlayout.scanStaff(*m_staffs[i], startTime, endTime);
-        m_vtqlayout.scanStaff(*m_staffs[i], startTime, endTime);
+        m_hlayout.scanStaff(*m_staffs[i], startTime, endTime);
+        m_vlayout.scanStaff(*m_staffs[i], startTime, endTime);
     }
 
-    m_htqlayout.finishLayout();
-    m_vtqlayout.finishLayout();
+    m_hlayout.finishLayout();
+    m_vlayout.finishLayout();
 
     if (m_staffs[0]->getSegment().getEndMarkerTime() != m_lastEndMarkerTime ||
             m_lastEndMarkerTime == 0 ||
@@ -1552,7 +1552,7 @@ MatrixView::slotSetPointerPosition(timeT time, bool scroll)
     Composition &comp = getDocument()->getComposition();
     int barNo = comp.getBarNumber(time);
 
-    if (barNo >= m_htqlayout.getLastVisibleBarOnStaff(*m_staffs[0])) {
+    if (barNo >= m_hlayout.getLastVisibleBarOnStaff(*m_staffs[0])) {
 
         Segment &seg = m_staffs[0]->getSegment();
 
@@ -1561,20 +1561,20 @@ MatrixView::slotSetPointerPosition(timeT time, bool scroll)
                 seg.getStartTime() +
                 ((time - seg.getStartTime()) %
                  (seg.getEndMarkerTime() - seg.getStartTime()));
-            m_staffs[0]->setPointerPosition(m_htqlayout, time);
+            m_staffs[0]->setPointerPosition(m_hlayout, time);
         } else {
             m_staffs[0]->hidePointer();
             scroll = false;
         }
-    } else if (barNo < m_htqlayout.getFirstVisibleBarOnStaff(*m_staffs[0])) {
+    } else if (barNo < m_hlayout.getFirstVisibleBarOnStaff(*m_staffs[0])) {
         m_staffs[0]->hidePointer();
         scroll = false;
     } else {
-        m_staffs[0]->setPointerPosition(m_htqlayout, time);
+        m_staffs[0]->setPointerPosition(m_hlayout, time);
     }
 
     if (scroll && !getCanvasView()->isAutoScrolling())
-        getCanvasView()->slotScrollHoriz(static_cast<int>(getXbyWorldMatrix(m_htqlayout.getXForTime(time))));
+        getCanvasView()->slotScrollHoriz(static_cast<int>(getXbyWorldMatrix(m_hlayout.getXForTime(time))));
 
     updateView();
 }
@@ -1585,11 +1585,11 @@ MatrixView::slotSetInsertCursorPosition(timeT time, bool scroll)
     //!!! For now.  Probably unlike slotSetPointerPosition this one
     // should snap to the nearest event or grid line.
 
-    m_staffs[0]->setInsertCursorPosition(m_htqlayout, time);
+    m_staffs[0]->setInsertCursorPosition(m_hlayout, time);
 
     if (scroll && !getCanvasView()->isAutoScrolling()) {
         getCanvasView()->slotScrollHoriz
-            (static_cast<int>(getXbyWorldMatrix(m_htqlayout.getXForTime(time))));
+            (static_cast<int>(getXbyWorldMatrix(m_hlayout.getXForTime(time))));
     }
 
     updateView();
@@ -2052,7 +2052,7 @@ MatrixView::slotSetSnap(timeT t)
     }
 
     for (unsigned int i = 0; i < m_staffs.size(); ++i)
-        m_staffs[i]->sizeStaff(m_htqlayout);
+        m_staffs[i]->sizeStaff(m_hlayout);
 
     m_segments[0]->setSnapGridSize(t);
 
@@ -2314,7 +2314,7 @@ MatrixView::slotZoomOut()
 void
 MatrixView::scrollToTime(timeT t)
 {
-    double layoutCoord = m_htqlayout.getXForTime(t);
+    double layoutCoord = m_hlayout.getXForTime(t);
     getCanvasView()->slotScrollHoriz(int(layoutCoord));
 }
 
@@ -2366,7 +2366,7 @@ MatrixView::addPropertyViewRuler(const PropertyName &property)
 
     int height = 20;
 
-    PropertyViewRuler *newRuler = new PropertyViewRuler(&m_htqlayout,
+    PropertyViewRuler *newRuler = new PropertyViewRuler(&m_hlayout,
                                   m_segments[0],
                                   property,
                                   xorigin,
@@ -2409,7 +2409,7 @@ MatrixView::removePropertyViewRuler(unsigned int number)
 RulerScale*
 MatrixView::getHLayout()
 {
-    return &m_htqlayout;
+    return &m_hlayout;
 }
 
 Staff*
@@ -2429,14 +2429,14 @@ timeT
 MatrixView::getInsertionTime()
 {
     MatrixStaff *staff = m_staffs[0];
-    return staff->getInsertCursorTime(m_htqlayout);
+    return staff->getInsertCursorTime(m_hlayout);
 }
 
 void
 MatrixView::slotStepBackward()
 {
     timeT time(getInsertionTime());
-    slotSetInsertCursorPosition(SnapGrid(&m_htqlayout).snapTime
+    slotSetInsertCursorPosition(SnapGrid(&m_hlayout).snapTime
                                 (time - 1,
                                  SnapGrid::SnapLeft));
 }
@@ -2445,7 +2445,7 @@ void
 MatrixView::slotStepForward()
 {
     timeT time(getInsertionTime());
-    slotSetInsertCursorPosition(SnapGrid(&m_htqlayout).snapTime
+    slotSetInsertCursorPosition(SnapGrid(&m_hlayout).snapTime
                                 (time + 1,
                                  SnapGrid::SnapRight));
 }
@@ -2553,7 +2553,7 @@ MatrixView::readjustCanvasSize()
 
         MatrixStaff &staff = *m_staffs[i];
 
-        staff.sizeStaff(m_htqlayout);
+        staff.sizeStaff(m_hlayout);
 
         //         if (staff.getTotalWidth() + staff.getX() > maxWidth) {
         //             maxWidth = staff.getTotalWidth() + staff.getX() + 1;
@@ -2745,10 +2745,10 @@ int MatrixView::computePostLayoutWidth()
 {
     Segment *segment = m_segments[0];
     Composition *composition = segment->getComposition();
-    int endX = int(m_htqlayout.getXForTime
+    int endX = int(m_hlayout.getXForTime
                    (composition->getBarEndForTime
                     (segment->getEndMarkerTime())));
-    int startX = int(m_htqlayout.getXForTime
+    int startX = int(m_hlayout.getXForTime
                      (composition->getBarStartForTime
                       (segment->getStartTime())));
 
@@ -3050,7 +3050,7 @@ MatrixView::slotPercussionSetChanged(Instrument * newInstr)
     readjustCanvasSize();
     bool layoutApplied = applyLayout();
     if (!layoutApplied)
-        KMessageBox::sorry(0, i18n("Couldn't apply piano roll tqlayout"));
+        KMessageBox::sorry(0, i18n("Couldn't apply piano roll layout"));
     else {
         MATRIX_DEBUG << "MatrixView : rendering elements\n";
         m_staffs[0]->positionAllElements();
diff --git a/src/gui/editors/matrix/MatrixView.h b/src/gui/editors/matrix/MatrixView.h
index 2082a65..45c43fb 100644
--- a/src/gui/editors/matrix/MatrixView.h
+++ b/src/gui/editors/matrix/MatrixView.h
@@ -594,8 +594,8 @@ protected:
 
     std::vector<MatrixStaff*> m_staffs;
 
-    MatrixHLayout             m_htqlayout;
-    MatrixVLayout             m_vtqlayout;
+    MatrixHLayout             m_hlayout;
+    MatrixVLayout             m_vlayout;
     SnapGrid     *m_snapGrid;
 
     timeT         m_lastEndMarkerTime;