diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/Composition.h | 6 | ||||
| -rw-r--r-- | src/base/LayoutEngine.h | 18 | ||||
| -rw-r--r-- | src/base/RefreshStatus.h | 6 | ||||
| -rw-r--r-- | src/base/Segment.cpp | 4 | ||||
| -rw-r--r-- | src/base/Segment.h | 10 | ||||
| -rw-r--r-- | src/base/SegmentNotationHelper.cpp | 2 | ||||
| -rw-r--r-- | src/base/ViewElement.h | 8 |
7 files changed, 27 insertions, 27 deletions
diff --git a/src/base/Composition.h b/src/base/Composition.h index b2f80a3..3514a86 100644 --- a/src/base/Composition.h +++ b/src/base/Composition.h @@ -799,8 +799,8 @@ public: return m_refreshStatusArray.getNewRefreshStatusId(); } - RefreshtqStatus& getRefreshtqStatus(unsigned int id) { - return m_refreshStatusArray.getRefreshtqStatus(id); + RefreshStatus& getRefreshStatus(unsigned int id) { + return m_refreshStatusArray.getRefreshStatus(id); } /// Set all refresh statuses to true @@ -989,7 +989,7 @@ protected: bool m_playMetronome; bool m_recordMetronome; - RefreshStatusArray<RefreshtqStatus> m_refreshStatusArray; + RefreshStatusArray<RefreshStatus> m_refreshStatusArray; // User defined markers in the composition // diff --git a/src/base/LayoutEngine.h b/src/base/LayoutEngine.h index 2116013..179d119 100644 --- a/src/base/LayoutEngine.h +++ b/src/base/LayoutEngine.h @@ -31,7 +31,7 @@ class TimeSignature; /** - * Base classes for tqlayout engines. The intention is that + * Base classes for layout 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 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. * * If startTime == endTime, act on the whole staff; otherwise only @@ -71,10 +71,10 @@ public: timeT endTime = 0) = 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). * * 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 gettqStatus() const { return m_status; } + unsigned int getStatus() const { return m_status; } protected: unsigned int m_status; @@ -97,9 +97,9 @@ public: virtual ~HorizontalLayoutEngine(); /** - * Sets a page width for the tqlayout. + * Sets a page width for the layout. * - * A tqlayout implementation does not have to use this. Some might + * A layout 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 f64a72c..4c39a18 100644 --- a/src/base/RefreshStatus.h +++ b/src/base/RefreshStatus.h @@ -26,10 +26,10 @@ namespace Rosegarden { -class RefreshtqStatus +class RefreshStatus { public: - RefreshtqStatus() : m_needsRefresh(true) {} + RefreshStatus() : 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& getRefreshtqStatus(unsigned int id) { return m_refreshStatuses[id]; } + RS& getRefreshStatus(unsigned int id) { return m_refreshStatuses[id]; } void updateRefreshStatuses(); protected: diff --git a/src/base/Segment.cpp b/src/base/Segment.cpp index c8e3018..2f65acd 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.getRefreshtqStatus(i).push(startTime, endTime); + m_refreshStatusArray.getRefreshStatus(i).push(startTime, endTime); } @@ -1269,7 +1269,7 @@ SegmentHelper::~SegmentHelper() { } void -SegmentRefreshtqStatus::push(timeT from, timeT to) +SegmentRefreshStatus::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 ac6e092..be2981b 100644 --- a/src/base/Segment.h +++ b/src/base/Segment.h @@ -37,10 +37,10 @@ namespace Rosegarden { -class SegmentRefreshtqStatus : public RefreshtqStatus +class SegmentRefreshStatus : public RefreshStatus { public: - SegmentRefreshtqStatus() : m_from(0), m_to(0) {} + SegmentRefreshStatus() : m_from(0), m_to(0) {} void push(timeT from, timeT to); @@ -616,8 +616,8 @@ public: return m_refreshStatusArray.getNewRefreshStatusId(); } - SegmentRefreshtqStatus &getRefreshtqStatus(unsigned int id) { - return m_refreshStatusArray.getRefreshtqStatus(id); + SegmentRefreshStatus &getRefreshStatus(unsigned int id) { + return m_refreshStatusArray.getRefreshStatus(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<SegmentRefreshtqStatus> m_refreshStatusArray; + RefreshStatusArray<SegmentRefreshStatus> 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 33dfe70..a6c8ab8 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 tqinvalidate 'to' + // because it will invalidate 'to' // if (checkLastRest) makeRestViable(lastEvent); diff --git a/src/base/ViewElement.h b/src/base/ViewElement.h index 58d312d..8cc3d09 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 - * tqlayout. This is not the coordinate of the associated canvas + * layout. 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 - * tqlayout. This is not the coordinate of the associated canvas + * layout. 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 tqlayout engine + * Sets the X coordinate which was computed by the layout engine * @see getLayoutX() */ virtual void setLayoutX(double x) { m_layoutX = x; } /** - * Sets the Y coordinate which was computed by the tqlayout engine + * Sets the Y coordinate which was computed by the layout engine * @see getLayoutY() */ virtual void setLayoutY(double y) { m_layoutY = y; } |