summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/notation
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/notation')
-rw-r--r--src/gui/editors/notation/NotationGroup.cpp2
-rw-r--r--src/gui/editors/notation/NotationGroup.h2
-rw-r--r--src/gui/editors/notation/NotationHLayout.cpp2
-rw-r--r--src/gui/editors/notation/NotationSelector.cpp14
-rw-r--r--src/gui/editors/notation/NotationStaff.cpp2
-rw-r--r--src/gui/editors/notation/NotationStrings.cpp2
-rw-r--r--src/gui/editors/notation/NotationView.cpp22
-rw-r--r--src/gui/editors/notation/NoteFontMap.cpp2
-rw-r--r--src/gui/editors/notation/NoteInserter.cpp4
-rw-r--r--src/gui/editors/notation/NotePixmapFactory.cpp4
-rw-r--r--src/gui/editors/notation/RestInserter.cpp4
-rw-r--r--src/gui/editors/notation/SystemFont.cpp2
12 files changed, 31 insertions, 31 deletions
diff --git a/src/gui/editors/notation/NotationGroup.cpp b/src/gui/editors/notation/NotationGroup.cpp
index caa7256..78525d9 100644
--- a/src/gui/editors/notation/NotationGroup.cpp
+++ b/src/gui/editors/notation/NotationGroup.cpp
@@ -185,7 +185,7 @@ NotationGroup::sample(const NELIterator &i, bool goingForwards)
}
bool
-NotationGroup::tqcontains(const NELIterator &i) const
+NotationGroup::contains(const NELIterator &i) const
{
NELIterator j(getInitialElement()),
k( getFinalElement());
diff --git a/src/gui/editors/notation/NotationGroup.h b/src/gui/editors/notation/NotationGroup.h
index ed1b7c2..9906747 100644
--- a/src/gui/editors/notation/NotationGroup.h
+++ b/src/gui/editors/notation/NotationGroup.h
@@ -92,7 +92,7 @@ public:
*/
void applyTuplingLine(NotationStaff &);
- virtual bool tqcontains(const NELIterator &) const;
+ virtual bool contains(const NELIterator &) const;
virtual bool sample(const NELIterator &i, bool goingForwards);
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index e00928c..be40dca 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -1653,7 +1653,7 @@ NotationHLayout::getSpacingDuration(Staff &staff,
if (d > 0 && (*i)->event()->getDuration() == 0) return d; // grace note
NotationElementList::iterator j(i), e(staff.getViewElementList()->end());
- while (j != e && (chord.tqcontains(j) || (*j)->getViewDuration() == 0))
+ while (j != e && (chord.contains(j) || (*j)->getViewDuration() == 0))
++j;
if (j != e) {
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index acd5604..6c6b04f 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -375,7 +375,7 @@ void NotationSelector::handleMouseRelease(timeT, int, TQMouseEvent *e)
// if the event was already part of the selection, we want to
// remove it
- if (m_selectionToMerge->tqcontains(m_clickedElement->event())) {
+ if (m_selectionToMerge->contains(m_clickedElement->event())) {
m_selectionToMerge->removeEvent(m_clickedElement->event());
} else {
m_selectionToMerge->addEvent(m_clickedElement->event());
@@ -431,7 +431,7 @@ void NotationSelector::drag(int x, int y, bool final)
return ;
EventSelection *selection = m_nParentView->getCurrentSelection();
- if (!selection || !selection->tqcontains(m_clickedElement->event())) {
+ if (!selection || !selection->contains(m_clickedElement->event())) {
selection = new EventSelection(m_selectedStaff->getSegment());
selection->addEvent(m_clickedElement->event());
}
@@ -614,7 +614,7 @@ void NotationSelector::dragFine(int x, int y, bool final)
EventSelection *selection = m_nParentView->getCurrentSelection();
if (!selection)
selection = new EventSelection(m_selectedStaff->getSegment());
- if (!selection->tqcontains(m_clickedElement->event()))
+ if (!selection->contains(m_clickedElement->event()))
selection->addEvent(m_clickedElement->event());
m_nParentView->setCurrentSelection(selection);
@@ -870,11 +870,11 @@ EventSelection* NotationSelector::getSelection()
x += nbw;
}
- if (!rect.tqcontains(x, int((*it)->y()), true)) {
+ if (!rect.contains(x, int((*it)->y()), true)) {
// #988217 (Notation: Special column of pixels
// prevents sweep selection) -- for notes, test
// again with centred x-coord
- if (!el.isNote() || !rect.tqcontains(x + nbw/2, int((*it)->y()), true)) {
+ if (!el.isNote() || !rect.contains(x + nbw/2, int((*it)->y()), true)) {
continue;
}
}
@@ -925,11 +925,11 @@ EventSelection* NotationSelector::getSelection()
// check if the element's rect
// is actually included in the selection rect.
//
- if (!rect.tqcontains(x, int((*it)->y()), true)) {
+ if (!rect.contains(x, int((*it)->y()), true)) {
// #988217 (Notation: Special column of pixels
// prevents sweep selection) -- for notes, test again
// with centred x-coord
- if (!el.isNote() || !rect.tqcontains(x + nbw/2, int((*it)->y()), true)) {
+ if (!el.isNote() || !rect.contains(x + nbw/2, int((*it)->y()), true)) {
continue;
}
}
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 6d68063..729eddb 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -1819,7 +1819,7 @@ NotationStaff::isSelected(NotationElementList::iterator it)
{
const EventSelection *selection =
m_notationView->getCurrentSelection();
- return selection && selection->tqcontains((*it)->event());
+ return selection && selection->contains((*it)->event());
}
void
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index 0c73bbc..e4cae98 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -182,7 +182,7 @@ Note
NotationStrings::getNoteForName(TQString name)
{
std::string origName(qstrtostr(name));
- int pos = name.tqfind('-');
+ int pos = name.find('-');
int dots = 0;
if (pos > 0 && pos < 6 && pos < int(name.length()) - 1) {
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 64b49ec..707e85c 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -3147,7 +3147,7 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
i != s->getSegmentEvents().end(); ++i) {
if (oldSelection && oldSelection->getSegment() == s->getSegment()
- && oldSelection->tqcontains(*i))
+ && oldSelection->contains(*i))
continue;
foundNewEvent = true;
@@ -3829,12 +3829,12 @@ void NotationView::setMenuStates()
NOTATION_DEBUG << "NotationView::setMenuStates: Have selection; it's " << m_currentEventSelection << " covering range from " << m_currentEventSelection->getStartTime() << " to " << m_currentEventSelection->getEndTime() << " (" << m_currentEventSelection->getSegmentEvents().size() << " events)" << endl;
stateChanged("have_selection", KXMLGUIClient::StateNoReverse);
- if (m_currentEventSelection->tqcontains
+ if (m_currentEventSelection->contains
(Note::EventType)) {
stateChanged("have_notes_in_selection",
KXMLGUIClient::StateNoReverse);
}
- if (m_currentEventSelection->tqcontains
+ if (m_currentEventSelection->contains
(Note::EventRestType)) {
stateChanged("have_rests_in_selection",
KXMLGUIClient::StateNoReverse);
@@ -3955,7 +3955,7 @@ void NotationView::slotNoteAction()
const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
NoteActionDataMap::Iterator noteAct =
- m_noteActionDataMap->tqfind(sigSender->name());
+ m_noteActionDataMap->find(sigSender->name());
if (noteAct != m_noteActionDataMap->end()) {
m_lastNoteAction = sigSender->name();
@@ -3987,7 +3987,7 @@ void NotationView::slotAddMark()
if (!m_currentEventSelection)
return ;
- MarkActionDataMap::Iterator i = m_markActionDataMap->tqfind(s->name());
+ MarkActionDataMap::Iterator i = m_markActionDataMap->find(s->name());
if (i != m_markActionDataMap->end()) {
addCommandToHistory(new AddMarkCommand
@@ -4000,7 +4000,7 @@ void NotationView::slotNoteChangeAction()
const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
NoteChangeActionDataMap::Iterator noteAct =
- m_noteChangeActionDataMap->tqfind(sigSender->name());
+ m_noteChangeActionDataMap->find(sigSender->name());
if (noteAct != m_noteChangeActionDataMap->end()) {
slotSetNoteDurations((**noteAct).noteType, (**noteAct).notationOnly);
@@ -4032,7 +4032,7 @@ void NotationView::initActionDataMaps()
(NotationStrings::getReferenceName(Note(type, dots), rest == 1));
TQString shortName(refName);
- shortName.tqreplace(TQRegExp("-"), "_");
+ shortName.replace(TQRegExp("-"), "_");
TQString titleName
(NotationStrings::getNoteName(Note(type, dots)));
@@ -4041,7 +4041,7 @@ void NotationView::initActionDataMaps()
titleName.right(titleName.length() - 1);
if (rest) {
- titleName.tqreplace(TQRegExp(i18n("note")), i18n("rest"));
+ titleName.replace(TQRegExp(i18n("note")), i18n("rest"));
}
int keycode = keys[type - Note::Shortest];
@@ -4068,7 +4068,7 @@ void NotationView::initActionDataMaps()
TQString shortName(TQString("change_%1%2")
.tqarg(notationOnly ? "notation_" : "").tqarg(refName));
- shortName.tqreplace(TQRegExp("-"), "_");
+ shortName.replace(TQRegExp("-"), "_");
TQString titleName
(NotationStrings::getNoteName(Note(type, 0)));
@@ -5658,7 +5658,7 @@ void NotationView::slotSwitchFromRestToNote()
Note note(restInserter->getCurrentNote());
TQString actionName = NotationStrings::getReferenceName(note, false);
- actionName = actionName.tqreplace("-", "_");
+ actionName = actionName.replace("-", "_");
KRadioAction *action = dynamic_cast<KRadioAction *>
(actionCollection()->action(actionName));
@@ -5693,7 +5693,7 @@ void NotationView::slotSwitchFromNoteToRest()
Note note(noteInserter->getCurrentNote());
TQString actionName = NotationStrings::getReferenceName(note, true);
- actionName = actionName.tqreplace("-", "_");
+ actionName = actionName.replace("-", "_");
KRadioAction *action = dynamic_cast<KRadioAction *>
(actionCollection()->action(actionName));
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index 3a77411..9036f20 100644
--- a/src/gui/editors/notation/NoteFontMap.cpp
+++ b/src/gui/editors/notation/NoteFontMap.cpp
@@ -65,7 +65,7 @@ NoteFontMap::NoteFontMap(std::string name) :
if (!mapFileMixedInfo.isReadable()) {
TQString lowerName = strtoqstr(name).lower();
- lowerName.tqreplace(TQRegExp(" "), "_");
+ lowerName.replace(TQRegExp(" "), "_");
TQString mapFileLowerName = TQString("%1/mappings/%2.xml")
.tqarg(m_fontDirectory)
.tqarg(lowerName);
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 3179534..2939f89 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -661,7 +661,7 @@ void NoteInserter::slotToggleDot()
m_noteDots = (m_noteDots) ? 0 : 1;
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note));
- actionName.tqreplace(TQRegExp("-"), "_");
+ actionName.replace(TQRegExp("-"), "_");
KAction *action = m_parentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
@@ -689,7 +689,7 @@ void NoteInserter::slotRestsSelected()
{
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note, true));
- actionName.tqreplace(TQRegExp("-"), "_");
+ actionName.replace(TQRegExp("-"), "_");
KAction *action = m_parentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index 365478a..e5f306b 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -2300,7 +2300,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
if (!text.isEmpty()) {
// String too long : cut it and replace last character by dots
int len = textLine.length();
- if (len > 1) textLine.tqreplace(len - 1, 1, i18n("..."));
+ if (len > 1) textLine.replace(len - 1, 1, i18n("..."));
}
} else {
textLine = getOneLine(text, width - charWidth / 2);
@@ -2344,7 +2344,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
if ((l == numberOfTextLines) && !text.isEmpty()) {
// String too long : cut it and replace last character by dots
int len = textLine.length();
- if (len > 1) textLine.tqreplace(len - 1, 1, i18n("..."));
+ if (len > 1) textLine.replace(len - 1, 1, i18n("..."));
}
m_p->drawText(charWidth / 4, lowerTextY, textLine);
diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp
index 448b40a..9889253 100644
--- a/src/gui/editors/notation/RestInserter.cpp
+++ b/src/gui/editors/notation/RestInserter.cpp
@@ -127,7 +127,7 @@ void RestInserter::slotToggleDot()
m_noteDots = (m_noteDots) ? 0 : 1;
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note, true));
- actionName.tqreplace(TQRegExp("-"), "_");
+ actionName.replace(TQRegExp("-"), "_");
KAction *action = m_parentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
@@ -140,7 +140,7 @@ void RestInserter::slotNotesSelected()
{
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note));
- actionName.tqreplace(TQRegExp(" "), "_");
+ actionName.replace(TQRegExp(" "), "_");
m_parentView->actionCollection()->action(actionName)->activate();
}
diff --git a/src/gui/editors/notation/SystemFont.cpp b/src/gui/editors/notation/SystemFont.cpp
index 77d3341..bf98e58 100644
--- a/src/gui/editors/notation/SystemFont.cpp
+++ b/src/gui/editors/notation/SystemFont.cpp
@@ -152,7 +152,7 @@ qfont:
if (family == name.lower())
return new SystemFontQt(qfont);
else {
- int bracket = family.tqfind(" [");
+ int bracket = family.find(" [");
if (bracket > 1)
family = family.left(bracket);
if (family == name.lower())
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-02 04:54:08 +0000