summaryrefslogtreecommitdiffstats
path: root/src/commands
diff options
context:
space:
mode:
Diffstat (limited to 'src/commands')
-rw-r--r--src/commands/edit/EraseCommand.cpp8
-rw-r--r--src/commands/edit/EraseCommand.h4
-rw-r--r--src/commands/edit/PasteEventsCommand.cpp10
-rw-r--r--src/commands/edit/PasteEventsCommand.h4
-rw-r--r--src/commands/matrix/MatrixEraseCommand.cpp6
-rw-r--r--src/commands/matrix/MatrixEraseCommand.h4
-rw-r--r--src/commands/notation/AddIndicationCommand.h2
-rw-r--r--src/commands/notation/ClefInsertionCommand.cpp2
-rw-r--r--src/commands/notation/ClefInsertionCommand.h2
-rw-r--r--src/commands/notation/EraseEventCommand.cpp8
-rw-r--r--src/commands/notation/EraseEventCommand.h4
-rw-r--r--src/commands/notation/InterpretCommand.h2
12 files changed, 28 insertions, 28 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;
diff --git a/src/commands/matrix/MatrixEraseCommand.cpp b/src/commands/matrix/MatrixEraseCommand.cpp
index 3285e84..c35259e 100644
--- a/src/commands/matrix/MatrixEraseCommand.cpp
+++ b/src/commands/matrix/MatrixEraseCommand.cpp
@@ -44,14 +44,14 @@ MatrixEraseCommand::MatrixEraseCommand(Segment &segment,
event->getAbsoluteTime() + event->getDuration(),
true),
m_event(event),
- m_retqlayoutEndTime(getEndTime())
+ m_relayoutEndTime(getEndTime())
{
// nothing
}
-timeT MatrixEraseCommand::getRetqlayoutEndTime()
+timeT MatrixEraseCommand::getRelayoutEndTime()
{
- return m_retqlayoutEndTime;
+ return m_relayoutEndTime;
}
void MatrixEraseCommand::modifySegment()
diff --git a/src/commands/matrix/MatrixEraseCommand.h b/src/commands/matrix/MatrixEraseCommand.h
index 9e126a4..244c0f9 100644
--- a/src/commands/matrix/MatrixEraseCommand.h
+++ b/src/commands/matrix/MatrixEraseCommand.h
@@ -45,13 +45,13 @@ public:
MatrixEraseCommand(Segment &segment,
Event *event);
- virtual timeT getRetqlayoutEndTime();
+ virtual timeT getRelayoutEndTime();
protected:
virtual void modifySegment();
Event *m_event; // only used on 1st execute (cf bruteForceRedo)
- timeT m_retqlayoutEndTime;
+ timeT m_relayoutEndTime;
};
//------------------------------
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
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-11 01:21:13 +0000