diff options
Diffstat (limited to 'src/gui/editors/notation/NotationSelector.cpp')
-rw-r--r-- | src/gui/editors/notation/NotationSelector.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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; } } |