diff options
Diffstat (limited to 'src/gui/editors/notation/NotationStaff.h')
| -rw-r--r-- | src/gui/editors/notation/NotationStaff.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/editors/notation/NotationStaff.h b/src/gui/editors/notation/NotationStaff.h index f58e77d..bb056c0 100644 --- a/src/gui/editors/notation/NotationStaff.h +++ b/src/gui/editors/notation/NotationStaff.h @@ -136,14 +136,14 @@ public: /** * Assign suitable coordinates to the elements on the staff, - * based entirely on the layout X and Y coordinates they were - * given by the horizontal and vertical layout processes. + * based entirely on the tqlayout X and Y coordinates they were + * given by the horizontal and vertical tqlayout processes. * * This is necessary because the sprites that are being positioned - * may have been created either after the layout process completed + * may have been created either after the tqlayout process completed * (by renderElements) or before (by the previous renderElements * call, if the sprites are unchanged but have moved) -- so - * neither the layout nor renderElements can authoritatively set + * neither the tqlayout nor renderElements can authoritatively set * their final positions. * * This method also updates the selected-ness of any elements it @@ -197,7 +197,7 @@ public: * elements). Pass movedOnly as true to indicate that elements * have not changed but only been repositioned, for example as a * consequence of a modification on another staff that caused a - * relayout. + * retqlayout. */ virtual void markChanged(timeT from = 0, timeT to = 0, @@ -270,7 +270,7 @@ public: Accidentals::NoAccidental) const; /** - * Find the NotationElement whose layout x-coord is closest to x, + * Find the NotationElement whose tqlayout x-coord is closest to x, * without regard to its y-coord. * * If notesAndRestsOnly is true, will return the closest note @@ -289,7 +289,7 @@ public: int proximityThreshold = 10); /** - * Find the NotationElement "under" the given layout x-coord, + * Find the NotationElement "under" the given tqlayout x-coord, * without regard to its y-coord. * * Also returns the clef and key in force at the given coordinates. @@ -396,7 +396,7 @@ protected: * Returns true if the item at the given iterator appears to have * moved horizontally without the spacing around it changing. * - * In practice, calculates the offset between the intended layout + * In practice, calculates the offset between the intended tqlayout * and current canvas coordinates of the item at the given * iterator, and returns true if this offset is equal to those of * all other following iterators at the same time as well as the @@ -412,7 +412,7 @@ protected: /** * Prepare a painter to draw an object of logical width w at - * layout-x coord x, starting at offset dx into the object, by + * tqlayout-x coord x, starting at offset dx into the object, by * setting the painter's clipping so as to crop the object at the * right edge of the row if it would otherwise overrun. The * return value is the amount of the object visible on this row @@ -473,8 +473,8 @@ protected: TQPainter *m_printPainter; - enum BarStatus { UnRendered = 0, Rendered, Positioned }; - typedef std::map<int, BarStatus> BarStatusMap; + enum BartqStatus { UnRendered = 0, Rendered, Positioned }; + typedef std::map<int, BartqStatus> BarStatusMap; BarStatusMap m_status; std::pair<int, int> m_lastRenderCheck; bool m_ready; |