diff options
Diffstat (limited to 'src/commands/edit')
-rw-r--r-- | src/commands/edit/EraseCommand.cpp | 8 | ||||
-rw-r--r-- | src/commands/edit/EraseCommand.h | 4 | ||||
-rw-r--r-- | src/commands/edit/PasteEventsCommand.cpp | 10 | ||||
-rw-r--r-- | src/commands/edit/PasteEventsCommand.h | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/commands/edit/EraseCommand.cpp b/src/commands/edit/EraseCommand.cpp index 3a3df26..246eb5f 100644 --- a/src/commands/edit/EraseCommand.cpp +++ b/src/commands/edit/EraseCommand.cpp @@ -38,7 +38,7 @@ namespace Rosegarden EraseCommand::EraseCommand(EventSelection &selection) : BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection), - m_retqlayoutEndTime(getEndTime()) + m_relayoutEndTime(getEndTime()) { // nothing else } @@ -56,7 +56,7 @@ EraseCommand::modifySegment() if ((*i)->isa(Clef::EventType) || (*i)->isa(Key ::EventType)) { - m_retqlayoutEndTime = getSegment().getEndTime(); + m_relayoutEndTime = getSegment().getEndTime(); } // We used to do this by calling SegmentNotationHelper::deleteEvent @@ -78,9 +78,9 @@ EraseCommand::modifySegment() } timeT -EraseCommand::getRetqlayoutEndTime() +EraseCommand::getRelayoutEndTime() { - return m_retqlayoutEndTime; + return m_relayoutEndTime; } } diff --git a/src/commands/edit/EraseCommand.h b/src/commands/edit/EraseCommand.h index e54139b..a662640 100644 --- a/src/commands/edit/EraseCommand.h +++ b/src/commands/edit/EraseCommand.h @@ -49,14 +49,14 @@ public: static TQString getGlobalName() { return i18n("&Erase"); } - virtual timeT getRetqlayoutEndTime(); + virtual timeT getRelayoutEndTime(); protected: virtual void modifySegment(); private: EventSelection *m_selection;// only used on 1st execute (cf bruteForceRedo) - timeT m_retqlayoutEndTime; + timeT m_relayoutEndTime; }; diff --git a/src/commands/edit/PasteEventsCommand.cpp b/src/commands/edit/PasteEventsCommand.cpp index 9b84ee7..6726dc7 100644 --- a/src/commands/edit/PasteEventsCommand.cpp +++ b/src/commands/edit/PasteEventsCommand.cpp @@ -47,7 +47,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment, PasteType pasteType) : BasicCommand(getGlobalName(), segment, pasteTime, getEffectiveEndTime(segment, clipboard, pasteTime)), - m_retqlayoutEndTime(getEndTime()), + m_relayoutEndTime(getEndTime()), m_clipboard(new Clipboard(*clipboard)), m_pasteType(pasteType), m_pastedEvents(segment) @@ -62,7 +62,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment, for (Segment::iterator i = s->begin(); i != s->end(); ++i) { if ((*i)->isa(Clef::EventType) || (*i)->isa(Key::EventType)) { - m_retqlayoutEndTime = s->getEndTime(); + m_relayoutEndTime = s->getEndTime(); break; } } @@ -76,7 +76,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment, timeT pasteEndTime, PasteType pasteType) : BasicCommand(getGlobalName(), segment, pasteTime, pasteEndTime), - m_retqlayoutEndTime(getEndTime()), + m_relayoutEndTime(getEndTime()), m_clipboard(new Clipboard(*clipboard)), m_pasteType(pasteType), m_pastedEvents(segment) @@ -138,9 +138,9 @@ PasteEventsCommand::getEffectiveEndTime(Segment &segment, } timeT -PasteEventsCommand::getRetqlayoutEndTime() +PasteEventsCommand::getRelayoutEndTime() { - return m_retqlayoutEndTime; + return m_relayoutEndTime; } bool diff --git a/src/commands/edit/PasteEventsCommand.h b/src/commands/edit/PasteEventsCommand.h index 2817d84..090298b 100644 --- a/src/commands/edit/PasteEventsCommand.h +++ b/src/commands/edit/PasteEventsCommand.h @@ -92,14 +92,14 @@ public: /// Determine whether this paste will succeed (without executing it yet) bool isPossible(); - virtual timeT getRetqlayoutEndTime(); + virtual timeT getRelayoutEndTime(); protected: virtual void modifySegment(); timeT getEffectiveEndTime(Segment &, Clipboard *, timeT); - timeT m_retqlayoutEndTime; + timeT m_relayoutEndTime; Clipboard *m_clipboard; PasteType m_pasteType; EventSelection m_pastedEvents; |