diff options
Diffstat (limited to 'src/commands/notation')
-rw-r--r-- | src/commands/notation/AddIndicationCommand.h | 2 | ||||
-rw-r--r-- | src/commands/notation/ClefInsertionCommand.cpp | 2 | ||||
-rw-r--r-- | src/commands/notation/ClefInsertionCommand.h | 2 | ||||
-rw-r--r-- | src/commands/notation/EraseEventCommand.cpp | 8 | ||||
-rw-r--r-- | src/commands/notation/EraseEventCommand.h | 4 | ||||
-rw-r--r-- | src/commands/notation/InterpretCommand.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/commands/notation/AddIndicationCommand.h b/src/commands/notation/AddIndicationCommand.h index 1b31760..396a488 100644 --- a/src/commands/notation/AddIndicationCommand.h +++ b/src/commands/notation/AddIndicationCommand.h @@ -55,7 +55,7 @@ public: Event *getLastInsertedEvent() { return m_lastInsertedEvent; } - virtual timeT getRetqlayoutEndTime() { + virtual timeT getRelayoutEndTime() { return getStartTime() + m_indicationDuration; } diff --git a/src/commands/notation/ClefInsertionCommand.cpp b/src/commands/notation/ClefInsertionCommand.cpp index 8752e8b..701b873 100644 --- a/src/commands/notation/ClefInsertionCommand.cpp +++ b/src/commands/notation/ClefInsertionCommand.cpp @@ -78,7 +78,7 @@ ClefInsertionCommand::getGlobalName(Clef *) } timeT -ClefInsertionCommand::getRetqlayoutEndTime() +ClefInsertionCommand::getRelayoutEndTime() { // Inserting a clef can change the y-coord of every subsequent note return getSegment().getEndTime(); diff --git a/src/commands/notation/ClefInsertionCommand.h b/src/commands/notation/ClefInsertionCommand.h index e3c91a5..9cacdfb 100644 --- a/src/commands/notation/ClefInsertionCommand.h +++ b/src/commands/notation/ClefInsertionCommand.h @@ -52,7 +52,7 @@ public: virtual ~ClefInsertionCommand(); static TQString getGlobalName(Clef *clef = 0); - virtual timeT getRetqlayoutEndTime(); + virtual timeT getRelayoutEndTime(); Event *getLastInsertedEvent() { return m_lastInsertedEvent; } diff --git a/src/commands/notation/EraseEventCommand.cpp b/src/commands/notation/EraseEventCommand.cpp index a3479dd..e599079 100644 --- a/src/commands/notation/EraseEventCommand.cpp +++ b/src/commands/notation/EraseEventCommand.cpp @@ -47,7 +47,7 @@ EraseEventCommand::EraseEventCommand(Segment &segment, true), m_collapseRest(collapseRest), m_event(event), - m_retqlayoutEndTime(getEndTime()) + m_relayoutEndTime(getEndTime()) { // nothing } @@ -67,9 +67,9 @@ EraseEventCommand::makeName(std::string e) } timeT -EraseEventCommand::getRetqlayoutEndTime() +EraseEventCommand::getRelayoutEndTime() { - return m_retqlayoutEndTime; + return m_relayoutEndTime; } void @@ -80,7 +80,7 @@ EraseEventCommand::modifySegment() if (m_event->isa(Clef::EventType) || m_event->isa(Key ::EventType)) { - m_retqlayoutEndTime = helper.segment().getEndTime(); + m_relayoutEndTime = helper.segment().getEndTime(); } else if (m_event->isa(Indication::EventType)) { diff --git a/src/commands/notation/EraseEventCommand.h b/src/commands/notation/EraseEventCommand.h index 4584e5f..07043fa 100644 --- a/src/commands/notation/EraseEventCommand.h +++ b/src/commands/notation/EraseEventCommand.h @@ -48,7 +48,7 @@ public: bool collapseRest); virtual ~EraseEventCommand(); - virtual timeT getRetqlayoutEndTime(); + virtual timeT getRelayoutEndTime(); protected: virtual void modifySegment(); @@ -56,7 +56,7 @@ protected: bool m_collapseRest; Event *m_event; // only used on 1st execute (cf bruteForceRedo) - timeT m_retqlayoutEndTime; + timeT m_relayoutEndTime; std::string makeName(std::string); }; diff --git a/src/commands/notation/InterpretCommand.h b/src/commands/notation/InterpretCommand.h index 445bc5c..a50a0f7 100644 --- a/src/commands/notation/InterpretCommand.h +++ b/src/commands/notation/InterpretCommand.h @@ -48,7 +48,7 @@ class Event; class InterpretCommand : public BasicSelectionCommand { public: - // bit tqmasks: pass an OR of these to the constructor + // bit masks: pass an OR of these to the constructor static const int NoInterpretation; static const int GuessDirections; // allegro, rit, pause &c: kinda bogus static const int ApplyTextDynamics; // mp, ff |