Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

7 files changed, 27 insertions, 27 deletions

diff --git a/src/base/Composition.h b/src/base/Composition.h
index 3514a86..b2f80a3 100644
--- a/src/base/Composition.h
+++ b/src/base/Composition.h
@@ -799,8 +799,8 @@ public:
         return m_refreshStatusArray.getNewRefreshStatusId();
     }
     
-    RefreshStatus& getRefreshStatus(unsigned int id) {
-        return m_refreshStatusArray.getRefreshStatus(id);
+    RefreshtqStatus& getRefreshtqStatus(unsigned int id) {
+        return m_refreshStatusArray.getRefreshtqStatus(id);
     }
 
     /// Set all refresh statuses to true
@@ -989,7 +989,7 @@ protected:
     bool                              m_playMetronome;
     bool                              m_recordMetronome;
 
-    RefreshStatusArray<RefreshStatus> m_refreshStatusArray;
+    RefreshStatusArray<RefreshtqStatus> m_refreshStatusArray;
 
     // User defined markers in the composition
     //
diff --git a/src/base/LayoutEngine.h b/src/base/LayoutEngine.h
index 179d119..2116013 100644
--- a/src/base/LayoutEngine.h
+++ b/src/base/LayoutEngine.h
@@ -31,7 +31,7 @@ class TimeSignature;
 
 
 /**
- * Base classes for layout engines.  The intention is that
+ * Base classes for tqlayout engines.  The intention is that
  * different sorts of renderers (piano-roll, score etc) can be
  * implemented by simply plugging different implementations
  * of Staff and LayoutEngine into a single view class.
@@ -58,9 +58,9 @@ public:
                             timeT endTime = 0) = 0;
 
     /**
-     * Precomputes layout data for a single staff, updating any
+     * Precomputes tqlayout data for a single staff, updating any
      * internal data stores associated with that staff and updating
-     * any layout-related properties in the events on the staff's
+     * any tqlayout-related properties in the events on the staff's
      * segment.
      * 
      * If startTime == endTime, act on the whole staff; otherwise only
@@ -71,10 +71,10 @@ public:
                            timeT endTime = 0) = 0;
 
     /**
-     * Computes any layout data that may depend on the results of
+     * Computes any tqlayout data that may depend on the results of
      * scanning more than one staff.  This may mean doing most of
-     * the layout (likely for horizontal layout) or nothing at all
-     * (likely for vertical layout).
+     * the tqlayout (likely for horizontal tqlayout) or nothing at all
+     * (likely for vertical tqlayout).
      * 
      * If startTime == endTime, act on the whole staff; otherwise only
      * the given section.
@@ -82,7 +82,7 @@ public:
     virtual void finishLayout(timeT startTime = 0,
                               timeT endTime = 0) = 0;
 
-    unsigned int getStatus() const { return m_status; }
+    unsigned int gettqStatus() const { return m_status; }
 
 protected:
     unsigned int m_status;
@@ -97,9 +97,9 @@ public:
     virtual ~HorizontalLayoutEngine();
 
     /**
-     * Sets a page width for the layout.
+     * Sets a page width for the tqlayout.
      *
-     * A layout implementation does not have to use this.  Some might
+     * A tqlayout implementation does not have to use this.  Some might
      * use it (for example) to ensure that bar lines fall precisely at
      * the right-hand margin of each page.  The computed x-coordinates
      * will still require to be wrapped into lines by the staff or
diff --git a/src/base/RefreshStatus.h b/src/base/RefreshStatus.h
index 4c39a18..f64a72c 100644
--- a/src/base/RefreshStatus.h
+++ b/src/base/RefreshStatus.h
@@ -26,10 +26,10 @@
 namespace Rosegarden 
 {
 
-class RefreshStatus
+class RefreshtqStatus
 {
 public:
-    RefreshStatus() : m_needsRefresh(true) {}
+    RefreshtqStatus() : m_needsRefresh(true) {}
 
     bool needsRefresh() { return m_needsRefresh; }
     void setNeedsRefresh(bool s) { m_needsRefresh = s; }
@@ -44,7 +44,7 @@ class RefreshStatusArray
 public:
     unsigned int getNewRefreshStatusId();
     size_t size() { return m_refreshStatuses.size(); }
-    RS& getRefreshStatus(unsigned int id) { return m_refreshStatuses[id]; }
+    RS& getRefreshtqStatus(unsigned int id) { return m_refreshStatuses[id]; }
     void updateRefreshStatuses();
 
 protected:
diff --git a/src/base/Segment.cpp b/src/base/Segment.cpp
index 2f65acd..c8e3018 100644
--- a/src/base/Segment.cpp
+++ b/src/base/Segment.cpp
@@ -352,7 +352,7 @@ void
 Segment::updateRefreshStatuses(timeT startTime, timeT endTime)
 {
     for(unsigned int i = 0; i < m_refreshStatusArray.size(); ++i)
-        m_refreshStatusArray.getRefreshStatus(i).push(startTime, endTime);
+        m_refreshStatusArray.getRefreshtqStatus(i).push(startTime, endTime);
 }
 
 
@@ -1269,7 +1269,7 @@ SegmentHelper::~SegmentHelper() { }
 
 
 void 
-SegmentRefreshStatus::push(timeT from, timeT to)
+SegmentRefreshtqStatus::push(timeT from, timeT to)
 {
     if (!needsRefresh()) { // don't do anything subtle - just erase the old data
 
diff --git a/src/base/Segment.h b/src/base/Segment.h
index be2981b..ac6e092 100644
--- a/src/base/Segment.h
+++ b/src/base/Segment.h
@@ -37,10 +37,10 @@
 namespace Rosegarden 
 {
 
-class SegmentRefreshStatus : public RefreshStatus
+class SegmentRefreshtqStatus : public RefreshtqStatus
 {
 public:
-    SegmentRefreshStatus() : m_from(0), m_to(0) {}
+    SegmentRefreshtqStatus() : m_from(0), m_to(0) {}
 
     void push(timeT from, timeT to);
 
@@ -616,8 +616,8 @@ public:
         return m_refreshStatusArray.getNewRefreshStatusId();
     }
 
-    SegmentRefreshStatus &getRefreshStatus(unsigned int id) {
-        return m_refreshStatusArray.getRefreshStatus(id);
+    SegmentRefreshtqStatus &getRefreshtqStatus(unsigned int id) {
+        return m_refreshStatusArray.getRefreshtqStatus(id);
     }
 
     void updateRefreshStatuses(timeT startTime, timeT endTime);
@@ -657,7 +657,7 @@ private:
     int m_highestPlayable;      // suggestion for highest playable note (notation)
     int m_lowestPlayable;       // suggestion for lowest playable note (notation)
 
-    RefreshStatusArray<SegmentRefreshStatus> m_refreshStatusArray;
+    RefreshStatusArray<SegmentRefreshtqStatus> m_refreshStatusArray;
 
     struct ClefKeyCmp {
         bool operator()(const Event *e1, const Event *e2) const;
diff --git a/src/base/SegmentNotationHelper.cpp b/src/base/SegmentNotationHelper.cpp
index a6c8ab8..33dfe70 100644
--- a/src/base/SegmentNotationHelper.cpp
+++ b/src/base/SegmentNotationHelper.cpp
@@ -1767,7 +1767,7 @@ SegmentNotationHelper::removeRests(timeT time, timeT &duration, bool testOnly)
     segment().erase(from, to);
 
     // we must defer calling makeRestViable() until after erase,
-    // because it will invalidate 'to'
+    // because it will tqinvalidate 'to'
     //
     if (checkLastRest) makeRestViable(lastEvent);
 
diff --git a/src/base/ViewElement.h b/src/base/ViewElement.h
index 8cc3d09..58d312d 100644
--- a/src/base/ViewElement.h
+++ b/src/base/ViewElement.h
@@ -53,7 +53,7 @@ public:
 
     /**
      * Returns the X coordinate of the element, as computed by the
-     * layout. This is not the coordinate of the associated canvas
+     * tqlayout. This is not the coordinate of the associated canvas
      * item.
      *
      * @see getCanvasX()
@@ -62,7 +62,7 @@ public:
 
     /**
      * Returns the Y coordinate of the element, as computed by the
-     * layout. This is not the coordinate of the associated canvas
+     * tqlayout. This is not the coordinate of the associated canvas
      * item.
      *
      * @see getCanvasY()
@@ -70,13 +70,13 @@ public:
     virtual double getLayoutY() const   { return m_layoutY; }
 
     /**
-     * Sets the X coordinate which was computed by the layout engine
+     * Sets the X coordinate which was computed by the tqlayout engine
      * @see getLayoutX()
      */
     virtual void   setLayoutX(double x) { m_layoutX = x; }
 
     /**
-     * Sets the Y coordinate which was computed by the layout engine
+     * Sets the Y coordinate which was computed by the tqlayout engine
      * @see getLayoutY()
      */
     virtual void   setLayoutY(double y) { m_layoutY = y; }