diff options
Diffstat (limited to 'src/commands')
| -rw-r--r-- | src/commands/edit/CopyCommand.cpp | 2 | ||||
| -rw-r--r-- | src/commands/edit/PasteEventsCommand.h | 2 | ||||
| -rw-r--r-- | src/commands/edit/SetLyricsCommand.cpp | 4 | ||||
| -rw-r--r-- | src/commands/notation/AddFingeringMarkCommand.cpp | 4 | ||||
| -rw-r--r-- | src/commands/notation/InterpretCommand.cpp | 2 | ||||
| -rw-r--r-- | src/commands/notation/TieNotesCommand.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/commands/edit/CopyCommand.cpp b/src/commands/edit/CopyCommand.cpp index 34534db..3214e03 100644 --- a/src/commands/edit/CopyCommand.cpp +++ b/src/commands/edit/CopyCommand.cpp @@ -57,7 +57,7 @@ CopyCommand::CopyCommand(SegmentSelection &selection, for (SegmentSelection::iterator i = selection.begin(); i != selection.end(); ++i) { TQString newLabel = strtoqstr((*i)->getLabel()); - if (newLabel.tqcontains(i18n("(copied)"))) { + if (newLabel.contains(i18n("(copied)"))) { m_sourceClipboard->newSegment(*i); } else { m_sourceClipboard->newSegment(*i)-> diff --git a/src/commands/edit/PasteEventsCommand.h b/src/commands/edit/PasteEventsCommand.h index 090298b..66aea6d 100644 --- a/src/commands/edit/PasteEventsCommand.h +++ b/src/commands/edit/PasteEventsCommand.h @@ -60,7 +60,7 @@ public: static PasteTypeMap getPasteTypes(); // type, descrip /** - * Construct a Paste command from a clipboard that already tqcontains + * Construct a Paste command from a clipboard that already contains * the events to be pasted. */ PasteEventsCommand(Segment &segment, diff --git a/src/commands/edit/SetLyricsCommand.cpp b/src/commands/edit/SetLyricsCommand.cpp index f10d746..cfee2bf 100644 --- a/src/commands/edit/SetLyricsCommand.cpp +++ b/src/commands/edit/SetLyricsCommand.cpp @@ -106,7 +106,7 @@ SetLyricsCommand::execute() std::pair<timeT, timeT> barRange = comp->getBarRange(barNo++); TQString syllables = *bsi; - syllables.tqreplace(TQRegExp("\\[\\d+\\] "), " "); + syllables.replace(TQRegExp("\\[\\d+\\] "), " "); TQStringList syllableList = TQStringList::split(" ", syllables); // no empties i = m_segment->findTime(barRange.first); @@ -131,7 +131,7 @@ SetLyricsCommand::execute() } TQString syllable = *ssi; - syllable.tqreplace(TQRegExp("~"), " "); + syllable.replace(TQRegExp("~"), " "); syllable = syllable.simplifyWhiteSpace(); if (syllable == "") continue; diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp index 49ec03c..4715951 100644 --- a/src/commands/notation/AddFingeringMarkCommand.cpp +++ b/src/commands/notation/AddFingeringMarkCommand.cpp @@ -84,7 +84,7 @@ AddFingeringMarkCommand::modifySegment() for (Chord::iterator ci = chord.begin(); ci != chord.end(); ++ci) { - if (!m_selection->tqcontains(**ci)) + if (!m_selection->contains(**ci)) continue; if (attempt < 2 && @@ -104,7 +104,7 @@ AddFingeringMarkCommand::modifySegment() break; for (Chord::iterator ci = chord.begin(); ci != chord.end(); ++ci) { - if (m_selection->tqcontains(**ci)) { + if (m_selection->contains(**ci)) { Marks::removeMark (***ci, Marks::getFingeringMark(***ci)); diff --git a/src/commands/notation/InterpretCommand.cpp b/src/commands/notation/InterpretCommand.cpp index 1652b2f..6d1b18b 100644 --- a/src/commands/notation/InterpretCommand.cpp +++ b/src/commands/notation/InterpretCommand.cpp @@ -154,7 +154,7 @@ InterpretCommand::applyTextDynamics() } if (t >= startTime && - (*i)->isa(Note::EventType) && m_selection->tqcontains(*i)) { + (*i)->isa(Note::EventType) && m_selection->contains(*i)) { (*i)->set <Int>(VELOCITY, velocity); } diff --git a/src/commands/notation/TieNotesCommand.cpp b/src/commands/notation/TieNotesCommand.cpp index e65865d..ff7f3ab 100644 --- a/src/commands/notation/TieNotesCommand.cpp +++ b/src/commands/notation/TieNotesCommand.cpp @@ -59,7 +59,7 @@ TieNotesCommand::modifySegment() Segment::iterator sj; while ((sj = helper.getNextAdjacentNote(si, true, false)) != segment.end()) { - if (!m_selection->tqcontains(*sj)) + if (!m_selection->contains(*sj)) break; (*si)->set<Bool>(TIED_FORWARD, true); (*si)->unset(TIE_IS_ABOVE); |